C++: Add ConvertToBase{Opcode,Instruction} classes

jbj · jbj · commit 7758b43e34fd · 2019-11-10T11:09:54.000+01:00
These should make it easy to match base-class conversions when it's not
important whether the base class is virtual.
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/Opcode.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/Opcode.qll
@@ -110,6 +110,8 @@ abstract class RelationalOpcode extends CompareOpcode { }
 
 abstract class CopyOpcode extends Opcode { }
 
+abstract class ConvertToBaseOpcode extends UnaryOpcode { }
+
 abstract class MemoryAccessOpcode extends Opcode { }
 
 abstract class ReturnOpcode extends Opcode { }
@@ -302,11 +304,11 @@ module Opcode {
     final override string toString() { result = "Convert" }
   }
 
-  class ConvertToNonVirtualBase extends UnaryOpcode, TConvertToNonVirtualBase {
+  class ConvertToNonVirtualBase extends ConvertToBaseOpcode, TConvertToNonVirtualBase {
     final override string toString() { result = "ConvertToNonVirtualBase" }
   }
 
-  class ConvertToVirtualBase extends UnaryOpcode, TConvertToVirtualBase {
+  class ConvertToVirtualBase extends ConvertToBaseOpcode, TConvertToVirtualBase {
     final override string toString() { result = "ConvertToVirtualBase" }
   }
 
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/Instruction.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/Instruction.qll
@@ -980,15 +980,23 @@ class InheritanceConversionInstruction extends UnaryInstruction {
  * Represents an instruction that converts from the address of a derived class
  * to the address of a direct non-virtual base class.
  */
-class ConvertToNonVirtualBaseInstruction extends InheritanceConversionInstruction {
+class ConvertToBaseInstruction extends InheritanceConversionInstruction {
+  ConvertToBaseInstruction() { getOpcode() instanceof ConvertToBaseOpcode }
+}
+
+/**
+ * Represents an instruction that converts from the address of a derived class
+ * to the address of a direct non-virtual base class.
+ */
+class ConvertToNonVirtualBaseInstruction extends ConvertToBaseInstruction {
   ConvertToNonVirtualBaseInstruction() { getOpcode() instanceof Opcode::ConvertToNonVirtualBase }
 }
 
 /**
  * Represents an instruction that converts from the address of a derived class
  * to the address of a virtual base class.
  */
-class ConvertToVirtualBaseInstruction extends InheritanceConversionInstruction {
+class ConvertToVirtualBaseInstruction extends ConvertToBaseInstruction {
   ConvertToVirtualBaseInstruction() { getOpcode() instanceof Opcode::ConvertToVirtualBase }
 }
 
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/raw/Instruction.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/raw/Instruction.qll
@@ -980,15 +980,23 @@ class InheritanceConversionInstruction extends UnaryInstruction {
  * Represents an instruction that converts from the address of a derived class
  * to the address of a direct non-virtual base class.
  */
-class ConvertToNonVirtualBaseInstruction extends InheritanceConversionInstruction {
+class ConvertToBaseInstruction extends InheritanceConversionInstruction {
+  ConvertToBaseInstruction() { getOpcode() instanceof ConvertToBaseOpcode }
+}
+
+/**
+ * Represents an instruction that converts from the address of a derived class
+ * to the address of a direct non-virtual base class.
+ */
+class ConvertToNonVirtualBaseInstruction extends ConvertToBaseInstruction {
   ConvertToNonVirtualBaseInstruction() { getOpcode() instanceof Opcode::ConvertToNonVirtualBase }
 }
 
 /**
  * Represents an instruction that converts from the address of a derived class
  * to the address of a virtual base class.
  */
-class ConvertToVirtualBaseInstruction extends InheritanceConversionInstruction {
+class ConvertToVirtualBaseInstruction extends ConvertToBaseInstruction {
   ConvertToVirtualBaseInstruction() { getOpcode() instanceof Opcode::ConvertToVirtualBase }
 }
 
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/Instruction.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/Instruction.qll
@@ -980,15 +980,23 @@ class InheritanceConversionInstruction extends UnaryInstruction {
  * Represents an instruction that converts from the address of a derived class
  * to the address of a direct non-virtual base class.
  */
-class ConvertToNonVirtualBaseInstruction extends InheritanceConversionInstruction {
+class ConvertToBaseInstruction extends InheritanceConversionInstruction {
+  ConvertToBaseInstruction() { getOpcode() instanceof ConvertToBaseOpcode }
+}
+
+/**
+ * Represents an instruction that converts from the address of a derived class
+ * to the address of a direct non-virtual base class.
+ */
+class ConvertToNonVirtualBaseInstruction extends ConvertToBaseInstruction {
   ConvertToNonVirtualBaseInstruction() { getOpcode() instanceof Opcode::ConvertToNonVirtualBase }
 }
 
 /**
  * Represents an instruction that converts from the address of a derived class
  * to the address of a virtual base class.
  */
-class ConvertToVirtualBaseInstruction extends InheritanceConversionInstruction {
+class ConvertToVirtualBaseInstruction extends ConvertToBaseInstruction {
   ConvertToVirtualBaseInstruction() { getOpcode() instanceof Opcode::ConvertToVirtualBase }
 }
 
diff --git a/csharp/ql/src/semmle/code/csharp/ir/implementation/Opcode.qll b/csharp/ql/src/semmle/code/csharp/ir/implementation/Opcode.qll
@@ -110,6 +110,8 @@ abstract class RelationalOpcode extends CompareOpcode { }
 
 abstract class CopyOpcode extends Opcode { }
 
+abstract class ConvertToBaseOpcode extends UnaryOpcode { }
+
 abstract class MemoryAccessOpcode extends Opcode { }
 
 abstract class ReturnOpcode extends Opcode { }
@@ -302,11 +304,11 @@ module Opcode {
     final override string toString() { result = "Convert" }
   }
 
-  class ConvertToNonVirtualBase extends UnaryOpcode, TConvertToNonVirtualBase {
+  class ConvertToNonVirtualBase extends ConvertToBaseOpcode, TConvertToNonVirtualBase {
     final override string toString() { result = "ConvertToNonVirtualBase" }
   }
 
-  class ConvertToVirtualBase extends UnaryOpcode, TConvertToVirtualBase {
+  class ConvertToVirtualBase extends ConvertToBaseOpcode, TConvertToVirtualBase {
     final override string toString() { result = "ConvertToVirtualBase" }
   }
 
diff --git a/csharp/ql/src/semmle/code/csharp/ir/implementation/raw/Instruction.qll b/csharp/ql/src/semmle/code/csharp/ir/implementation/raw/Instruction.qll
@@ -980,15 +980,23 @@ class InheritanceConversionInstruction extends UnaryInstruction {
  * Represents an instruction that converts from the address of a derived class
  * to the address of a direct non-virtual base class.
  */
-class ConvertToNonVirtualBaseInstruction extends InheritanceConversionInstruction {
+class ConvertToBaseInstruction extends InheritanceConversionInstruction {
+  ConvertToBaseInstruction() { getOpcode() instanceof ConvertToBaseOpcode }
+}
+
+/**
+ * Represents an instruction that converts from the address of a derived class
+ * to the address of a direct non-virtual base class.
+ */
+class ConvertToNonVirtualBaseInstruction extends ConvertToBaseInstruction {
   ConvertToNonVirtualBaseInstruction() { getOpcode() instanceof Opcode::ConvertToNonVirtualBase }
 }
 
 /**
  * Represents an instruction that converts from the address of a derived class
  * to the address of a virtual base class.
  */
-class ConvertToVirtualBaseInstruction extends InheritanceConversionInstruction {
+class ConvertToVirtualBaseInstruction extends ConvertToBaseInstruction {
   ConvertToVirtualBaseInstruction() { getOpcode() instanceof Opcode::ConvertToVirtualBase }
 }
 
diff --git a/csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/Instruction.qll b/csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/Instruction.qll
@@ -980,15 +980,23 @@ class InheritanceConversionInstruction extends UnaryInstruction {
  * Represents an instruction that converts from the address of a derived class
  * to the address of a direct non-virtual base class.
  */
-class ConvertToNonVirtualBaseInstruction extends InheritanceConversionInstruction {
+class ConvertToBaseInstruction extends InheritanceConversionInstruction {
+  ConvertToBaseInstruction() { getOpcode() instanceof ConvertToBaseOpcode }
+}
+
+/**
+ * Represents an instruction that converts from the address of a derived class
+ * to the address of a direct non-virtual base class.
+ */
+class ConvertToNonVirtualBaseInstruction extends ConvertToBaseInstruction {
   ConvertToNonVirtualBaseInstruction() { getOpcode() instanceof Opcode::ConvertToNonVirtualBase }
 }
 
 /**
  * Represents an instruction that converts from the address of a derived class
  * to the address of a virtual base class.
  */
-class ConvertToVirtualBaseInstruction extends InheritanceConversionInstruction {
+class ConvertToVirtualBaseInstruction extends ConvertToBaseInstruction {
   ConvertToVirtualBaseInstruction() { getOpcode() instanceof Opcode::ConvertToVirtualBase }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,8 @@ abstract class RelationalOpcode extends CompareOpcode { }`
`110`	`110`
`111`	`111`	`abstract class CopyOpcode extends Opcode { }`
`112`	`112`
	`113`	`+abstract class ConvertToBaseOpcode extends UnaryOpcode { }`
	`114`	`+`
`113`	`115`	`abstract class MemoryAccessOpcode extends Opcode { }`
`114`	`116`
`115`	`117`	`abstract class ReturnOpcode extends Opcode { }`
`@@ -302,11 +304,11 @@ module Opcode {`
`302`	`304`	`final override string toString() { result = "Convert" }`
`303`	`305`	`}`
`304`	`306`
`305`		`- class ConvertToNonVirtualBase extends UnaryOpcode, TConvertToNonVirtualBase {`
	`307`	`+ class ConvertToNonVirtualBase extends ConvertToBaseOpcode, TConvertToNonVirtualBase {`
`306`	`308`	`final override string toString() { result = "ConvertToNonVirtualBase" }`
`307`	`309`	`}`
`308`	`310`
`309`		`- class ConvertToVirtualBase extends UnaryOpcode, TConvertToVirtualBase {`
	`311`	`+ class ConvertToVirtualBase extends ConvertToBaseOpcode, TConvertToVirtualBase {`
`310`	`312`	`final override string toString() { result = "ConvertToVirtualBase" }`
`311`	`313`	`}`
`312`	`314`