C++: add arithmetic/bitwise instruction classes

Robert Marsh · Robert Marsh · commit 173ade133677 · 2019-02-21T17:09:08.000-08:00
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/Opcode.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/Opcode.qll
@@ -85,6 +85,18 @@ abstract class PointerArithmeticOpcode extends BinaryOpcode {}
 
 abstract class PointerOffsetOpcode extends PointerArithmeticOpcode {}
 
+abstract class ArithmeticOpcode extends Opcode {}
+
+abstract class BinaryArithmeticOpcode extends BinaryOpcode, ArithmeticOpcode {}
+
+abstract class UnaryArithmeticOpcode extends UnaryOpcode, ArithmeticOpcode {}
+
+abstract class BitwiseOpcode extends Opcode {}
+
+abstract class BinaryBitwiseOpcode extends BinaryOpcode, BitwiseOpcode {}
+
+abstract class UnaryBitwiseOpcode extends UnaryOpcode, BitwiseOpcode {}
+
 abstract class CompareOpcode extends BinaryOpcode {}
 
 abstract class RelationalOpcode extends CompareOpcode {}
@@ -143,18 +155,18 @@ module Opcode {
   class CopyValue extends UnaryOpcode, CopyOpcode, TCopyValue { override final string toString() { result = "CopyValue" } }
   class Load extends CopyOpcode, OpcodeWithLoad, TLoad { override final string toString() { result = "Load" } }
   class Store extends CopyOpcode, MemoryAccessOpcode, TStore { override final string toString() { result = "Store" } }
-  class Add extends BinaryOpcode, TAdd { override final string toString() { result = "Add" } }
-  class Sub extends BinaryOpcode, TSub { override final string toString() { result = "Sub" } }
-  class Mul extends BinaryOpcode, TMul { override final string toString() { result = "Mul" } }
-  class Div extends BinaryOpcode, TDiv { override final string toString() { result = "Div" } }
-  class Rem extends BinaryOpcode, TRem { override final string toString() { result = "Rem" } }
-  class Negate extends UnaryOpcode, TNegate { override final string toString() { result = "Negate" } }
-  class ShiftLeft extends BinaryOpcode, TShiftLeft { override final string toString() { result = "ShiftLeft" } }
-  class ShiftRight extends BinaryOpcode, TShiftRight { override final string toString() { result = "ShiftRight" } }
-  class BitAnd extends BinaryOpcode, TBitAnd { override final string toString() { result = "BitAnd" } }
-  class BitOr extends BinaryOpcode, TBitOr { override final string toString() { result = "BitOr" } }
-  class BitXor extends BinaryOpcode, TBitXor { override final string toString() { result = "BitXor" } }
-  class BitComplement extends UnaryOpcode, TBitComplement { override final string toString() { result = "BitComplement" } }
+  class Add extends BinaryArithmeticOpcode, TAdd { override final string toString() { result = "Add" } }
+  class Sub extends BinaryArithmeticOpcode, TSub { override final string toString() { result = "Sub" } }
+  class Mul extends BinaryArithmeticOpcode, TMul { override final string toString() { result = "Mul" } }
+  class Div extends BinaryArithmeticOpcode, TDiv { override final string toString() { result = "Div" } }
+  class Rem extends BinaryArithmeticOpcode, TRem { override final string toString() { result = "Rem" } }
+  class Negate extends UnaryArithmeticOpcode, TNegate { override final string toString() { result = "Negate" } }
+  class ShiftLeft extends BinaryBitwiseOpcode, TShiftLeft { override final string toString() { result = "ShiftLeft" } }
+  class ShiftRight extends BinaryBitwiseOpcode, TShiftRight { override final string toString() { result = "ShiftRight" } }
+  class BitAnd extends BinaryBitwiseOpcode, TBitAnd { override final string toString() { result = "BitAnd" } }
+  class BitOr extends BinaryBitwiseOpcode, TBitOr { override final string toString() { result = "BitOr" } }
+  class BitXor extends BinaryBitwiseOpcode, TBitXor { override final string toString() { result = "BitXor" } }
+  class BitComplement extends UnaryBitwiseOpcode, TBitComplement { override final string toString() { result = "BitComplement" } }
   class LogicalNot extends UnaryOpcode, TLogicalNot { override final string toString() { result = "LogicalNot" } }
   class CompareEQ extends CompareOpcode, TCompareEQ { override final string toString() { result = "CompareEQ" } }
   class CompareNE extends CompareOpcode, TCompareNE { override final string toString() { result = "CompareNE" } }
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
@@ -898,67 +898,87 @@ class BinaryInstruction extends Instruction {
   }
 }
 
-class AddInstruction extends BinaryInstruction {
+class ArithmeticInstruction extends Instruction {
+  ArithmeticInstruction() {
+    getOpcode() instanceof ArithmeticOpcode
+  }
+}
+
+class BinaryArithmeticInstruction extends ArithmeticInstruction, BinaryInstruction {}
+
+class UnaryArithmeticInstruction extends ArithmeticInstruction, UnaryInstruction {}
+
+class AddInstruction extends BinaryArithmeticInstruction {
   AddInstruction() {
     getOpcode() instanceof Opcode::Add
   }
 }
 
-class SubInstruction extends BinaryInstruction {
+class SubInstruction extends BinaryArithmeticInstruction {
   SubInstruction() {
     getOpcode() instanceof Opcode::Sub
   }
 }
 
-class MulInstruction extends BinaryInstruction {
+class MulInstruction extends BinaryArithmeticInstruction {
   MulInstruction() {
     getOpcode() instanceof Opcode::Mul
   }
 }
 
-class DivInstruction extends BinaryInstruction {
+class DivInstruction extends BinaryArithmeticInstruction {
   DivInstruction() {
     getOpcode() instanceof Opcode::Div
   }
 }
 
-class RemInstruction extends BinaryInstruction {
+class RemInstruction extends BinaryArithmeticInstruction {
   RemInstruction() {
     getOpcode() instanceof Opcode::Rem
   }
 }
 
-class NegateInstruction extends UnaryInstruction {
+class NegateInstruction extends UnaryArithmeticInstruction {
   NegateInstruction() {
     getOpcode() instanceof Opcode::Negate
   }
 }
 
-class BitAndInstruction extends BinaryInstruction {
+class BitwiseInstruction extends Instruction {
+  BitwiseInstruction() {
+    getOpcode() instanceof BitwiseOpcode
+  }
+}
+
+class BinaryBitwiseInstruction extends BitwiseInstruction, BinaryInstruction {}
+
+class UnaryBitwiseInstruction extends BitwiseInstruction, UnaryInstruction {}
+
+class BitAndInstruction extends BinaryBitwiseInstruction {
   BitAndInstruction() {
     getOpcode() instanceof Opcode::BitAnd
   }
 }
 
-class BitOrInstruction extends BinaryInstruction {
+class BitOrInstruction extends BinaryBitwiseInstruction {
   BitOrInstruction() {
     getOpcode() instanceof Opcode::BitOr
   }
 }
 
-class BitXorInstruction extends BinaryInstruction {
+class BitXorInstruction extends BinaryBitwiseInstruction {
   BitXorInstruction() {
     getOpcode() instanceof Opcode::BitXor
   }
 }
 
-class ShiftLeftInstruction extends BinaryInstruction {
+class ShiftLeftInstruction extends BinaryBitwiseInstruction {
   ShiftLeftInstruction() {
     getOpcode() instanceof Opcode::ShiftLeft
   }
 }
 
-class ShiftRightInstruction extends BinaryInstruction {
+class ShiftRightInstruction extends BinaryBitwiseInstruction {
   ShiftRightInstruction() {
     getOpcode() instanceof Opcode::ShiftRight
   }
@@ -1097,7 +1117,7 @@ class ConvertToDerivedInstruction extends InheritanceConversionInstruction {
   }
 }
 
-class BitComplementInstruction extends UnaryInstruction {
+class BitComplementInstruction extends UnaryBitwiseInstruction {
   BitComplementInstruction() {
     getOpcode() instanceof Opcode::BitComplement
   }
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
@@ -898,67 +898,87 @@ class BinaryInstruction extends Instruction {
   }
 }
 
-class AddInstruction extends BinaryInstruction {
+class ArithmeticInstruction extends Instruction {
+  ArithmeticInstruction() {
+    getOpcode() instanceof ArithmeticOpcode
+  }
+}
+
+class BinaryArithmeticInstruction extends ArithmeticInstruction, BinaryInstruction {}
+
+class UnaryArithmeticInstruction extends ArithmeticInstruction, UnaryInstruction {}
+
+class AddInstruction extends BinaryArithmeticInstruction {
   AddInstruction() {
     getOpcode() instanceof Opcode::Add
   }
 }
 
-class SubInstruction extends BinaryInstruction {
+class SubInstruction extends BinaryArithmeticInstruction {
   SubInstruction() {
     getOpcode() instanceof Opcode::Sub
   }
 }
 
-class MulInstruction extends BinaryInstruction {
+class MulInstruction extends BinaryArithmeticInstruction {
   MulInstruction() {
     getOpcode() instanceof Opcode::Mul
   }
 }
 
-class DivInstruction extends BinaryInstruction {
+class DivInstruction extends BinaryArithmeticInstruction {
   DivInstruction() {
     getOpcode() instanceof Opcode::Div
   }
 }
 
-class RemInstruction extends BinaryInstruction {
+class RemInstruction extends BinaryArithmeticInstruction {
   RemInstruction() {
     getOpcode() instanceof Opcode::Rem
   }
 }
 
-class NegateInstruction extends UnaryInstruction {
+class NegateInstruction extends UnaryArithmeticInstruction {
   NegateInstruction() {
     getOpcode() instanceof Opcode::Negate
   }
 }
 
-class BitAndInstruction extends BinaryInstruction {
+class BitwiseInstruction extends Instruction {
+  BitwiseInstruction() {
+    getOpcode() instanceof BitwiseOpcode
+  }
+}
+
+class BinaryBitwiseInstruction extends BitwiseInstruction, BinaryInstruction {}
+
+class UnaryBitwiseInstruction extends BitwiseInstruction, UnaryInstruction {}
+
+class BitAndInstruction extends BinaryBitwiseInstruction {
   BitAndInstruction() {
     getOpcode() instanceof Opcode::BitAnd
   }
 }
 
-class BitOrInstruction extends BinaryInstruction {
+class BitOrInstruction extends BinaryBitwiseInstruction {
   BitOrInstruction() {
     getOpcode() instanceof Opcode::BitOr
   }
 }
 
-class BitXorInstruction extends BinaryInstruction {
+class BitXorInstruction extends BinaryBitwiseInstruction {
   BitXorInstruction() {
     getOpcode() instanceof Opcode::BitXor
   }
 }
 
-class ShiftLeftInstruction extends BinaryInstruction {
+class ShiftLeftInstruction extends BinaryBitwiseInstruction {
   ShiftLeftInstruction() {
     getOpcode() instanceof Opcode::ShiftLeft
   }
 }
 
-class ShiftRightInstruction extends BinaryInstruction {
+class ShiftRightInstruction extends BinaryBitwiseInstruction {
   ShiftRightInstruction() {
     getOpcode() instanceof Opcode::ShiftRight
   }
@@ -1097,7 +1117,7 @@ class ConvertToDerivedInstruction extends InheritanceConversionInstruction {
   }
 }
 
-class BitComplementInstruction extends UnaryInstruction {
+class BitComplementInstruction extends UnaryBitwiseInstruction {
   BitComplementInstruction() {
     getOpcode() instanceof Opcode::BitComplement
   }
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
@@ -898,67 +898,87 @@ class BinaryInstruction extends Instruction {
   }
 }
 
-class AddInstruction extends BinaryInstruction {
+class ArithmeticInstruction extends Instruction {
+  ArithmeticInstruction() {
+    getOpcode() instanceof ArithmeticOpcode
+  }
+}
+
+class BinaryArithmeticInstruction extends ArithmeticInstruction, BinaryInstruction {}
+
+class UnaryArithmeticInstruction extends ArithmeticInstruction, UnaryInstruction {}
+
+class AddInstruction extends BinaryArithmeticInstruction {
   AddInstruction() {
     getOpcode() instanceof Opcode::Add
   }
 }
 
-class SubInstruction extends BinaryInstruction {
+class SubInstruction extends BinaryArithmeticInstruction {
   SubInstruction() {
     getOpcode() instanceof Opcode::Sub
   }
 }
 
-class MulInstruction extends BinaryInstruction {
+class MulInstruction extends BinaryArithmeticInstruction {
   MulInstruction() {
     getOpcode() instanceof Opcode::Mul
   }
 }
 
-class DivInstruction extends BinaryInstruction {
+class DivInstruction extends BinaryArithmeticInstruction {
   DivInstruction() {
     getOpcode() instanceof Opcode::Div
   }
 }
 
-class RemInstruction extends BinaryInstruction {
+class RemInstruction extends BinaryArithmeticInstruction {
   RemInstruction() {
     getOpcode() instanceof Opcode::Rem
   }
 }
 
-class NegateInstruction extends UnaryInstruction {
+class NegateInstruction extends UnaryArithmeticInstruction {
   NegateInstruction() {
     getOpcode() instanceof Opcode::Negate
   }
 }
 
-class BitAndInstruction extends BinaryInstruction {
+class BitwiseInstruction extends Instruction {
+  BitwiseInstruction() {
+    getOpcode() instanceof BitwiseOpcode
+  }
+}
+
+class BinaryBitwiseInstruction extends BitwiseInstruction, BinaryInstruction {}
+
+class UnaryBitwiseInstruction extends BitwiseInstruction, UnaryInstruction {}
+
+class BitAndInstruction extends BinaryBitwiseInstruction {
   BitAndInstruction() {
     getOpcode() instanceof Opcode::BitAnd
   }
 }
 
-class BitOrInstruction extends BinaryInstruction {
+class BitOrInstruction extends BinaryBitwiseInstruction {
   BitOrInstruction() {
     getOpcode() instanceof Opcode::BitOr
   }
 }
 
-class BitXorInstruction extends BinaryInstruction {
+class BitXorInstruction extends BinaryBitwiseInstruction {
   BitXorInstruction() {
     getOpcode() instanceof Opcode::BitXor
   }
 }
 
-class ShiftLeftInstruction extends BinaryInstruction {
+class ShiftLeftInstruction extends BinaryBitwiseInstruction {
   ShiftLeftInstruction() {
     getOpcode() instanceof Opcode::ShiftLeft
   }
 }
 
-class ShiftRightInstruction extends BinaryInstruction {
+class ShiftRightInstruction extends BinaryBitwiseInstruction {
   ShiftRightInstruction() {
     getOpcode() instanceof Opcode::ShiftRight
   }
@@ -1097,7 +1117,7 @@ class ConvertToDerivedInstruction extends InheritanceConversionInstruction {
   }
 }
 
-class BitComplementInstruction extends UnaryInstruction {
+class BitComplementInstruction extends UnaryBitwiseInstruction {
   BitComplementInstruction() {
     getOpcode() instanceof Opcode::BitComplement
   }

Original file line number	Diff line number	Diff line change
`@@ -898,67 +898,87 @@ class BinaryInstruction extends Instruction {`
`898`	`898`	`}`
`899`	`899`	`}`
`900`	`900`
`901`		`-class AddInstruction extends BinaryInstruction {`
	`901`	`+class ArithmeticInstruction extends Instruction {`
	`902`	`+ ArithmeticInstruction() {`
	`903`	`+ getOpcode() instanceof ArithmeticOpcode`
	`904`	`+ }`
	`905`	`+}`
	`906`	`+`
	`907`	`+class BinaryArithmeticInstruction extends ArithmeticInstruction, BinaryInstruction {}`
	`908`	`+`
	`909`	`+class UnaryArithmeticInstruction extends ArithmeticInstruction, UnaryInstruction {}`
	`910`	`+`
	`911`	`+class AddInstruction extends BinaryArithmeticInstruction {`
`902`	`912`	`AddInstruction() {`
`903`	`913`	`getOpcode() instanceof Opcode::Add`
`904`	`914`	`}`
`905`	`915`	`}`
`906`	`916`
`907`		`-class SubInstruction extends BinaryInstruction {`
	`917`	`+class SubInstruction extends BinaryArithmeticInstruction {`
`908`	`918`	`SubInstruction() {`
`909`	`919`	`getOpcode() instanceof Opcode::Sub`
`910`	`920`	`}`
`911`	`921`	`}`
`912`	`922`
`913`		`-class MulInstruction extends BinaryInstruction {`
	`923`	`+class MulInstruction extends BinaryArithmeticInstruction {`
`914`	`924`	`MulInstruction() {`
`915`	`925`	`getOpcode() instanceof Opcode::Mul`
`916`	`926`	`}`
`917`	`927`	`}`
`918`	`928`
`919`		`-class DivInstruction extends BinaryInstruction {`
	`929`	`+class DivInstruction extends BinaryArithmeticInstruction {`
`920`	`930`	`DivInstruction() {`
`921`	`931`	`getOpcode() instanceof Opcode::Div`
`922`	`932`	`}`
`923`	`933`	`}`
`924`	`934`
`925`		`-class RemInstruction extends BinaryInstruction {`
	`935`	`+class RemInstruction extends BinaryArithmeticInstruction {`
`926`	`936`	`RemInstruction() {`
`927`	`937`	`getOpcode() instanceof Opcode::Rem`
`928`	`938`	`}`
`929`	`939`	`}`
`930`	`940`
`931`		`-class NegateInstruction extends UnaryInstruction {`
	`941`	`+class NegateInstruction extends UnaryArithmeticInstruction {`
`932`	`942`	`NegateInstruction() {`
`933`	`943`	`getOpcode() instanceof Opcode::Negate`
`934`	`944`	`}`
`935`	`945`	`}`
`936`	`946`
`937`		`-class BitAndInstruction extends BinaryInstruction {`
	`947`	`+class BitwiseInstruction extends Instruction {`
	`948`	`+ BitwiseInstruction() {`
	`949`	`+ getOpcode() instanceof BitwiseOpcode`
	`950`	`+ }`
	`951`	`+}`
	`952`	`+`
	`953`	`+class BinaryBitwiseInstruction extends BitwiseInstruction, BinaryInstruction {}`
	`954`	`+`
	`955`	`+class UnaryBitwiseInstruction extends BitwiseInstruction, UnaryInstruction {}`
	`956`	`+`
	`957`	`+class BitAndInstruction extends BinaryBitwiseInstruction {`
`938`	`958`	`BitAndInstruction() {`
`939`	`959`	`getOpcode() instanceof Opcode::BitAnd`
`940`	`960`	`}`
`941`	`961`	`}`
`942`	`962`
`943`		`-class BitOrInstruction extends BinaryInstruction {`
	`963`	`+class BitOrInstruction extends BinaryBitwiseInstruction {`
`944`	`964`	`BitOrInstruction() {`
`945`	`965`	`getOpcode() instanceof Opcode::BitOr`
`946`	`966`	`}`
`947`	`967`	`}`
`948`	`968`
`949`		`-class BitXorInstruction extends BinaryInstruction {`
	`969`	`+class BitXorInstruction extends BinaryBitwiseInstruction {`
`950`	`970`	`BitXorInstruction() {`
`951`	`971`	`getOpcode() instanceof Opcode::BitXor`
`952`	`972`	`}`
`953`	`973`	`}`
`954`	`974`
`955`		`-class ShiftLeftInstruction extends BinaryInstruction {`
	`975`	`+class ShiftLeftInstruction extends BinaryBitwiseInstruction {`
`956`	`976`	`ShiftLeftInstruction() {`
`957`	`977`	`getOpcode() instanceof Opcode::ShiftLeft`
`958`	`978`	`}`
`959`	`979`	`}`
`960`	`980`
`961`		`-class ShiftRightInstruction extends BinaryInstruction {`
	`981`	`+class ShiftRightInstruction extends BinaryBitwiseInstruction {`
`962`	`982`	`ShiftRightInstruction() {`
`963`	`983`	`getOpcode() instanceof Opcode::ShiftRight`
`964`	`984`	`}`
`@@ -1097,7 +1117,7 @@ class ConvertToDerivedInstruction extends InheritanceConversionInstruction {`
`1097`	`1117`	`}`
`1098`	`1118`	`}`
`1099`	`1119`
`1100`		`-class BitComplementInstruction extends UnaryInstruction {`
	`1120`	`+class BitComplementInstruction extends UnaryBitwiseInstruction {`
`1101`	`1121`	`BitComplementInstruction() {`
`1102`	`1122`	`getOpcode() instanceof Opcode::BitComplement`
`1103`	`1123`	`}`