C++: add isStrict to RelationalInstruction

Robert Marsh · Robert Marsh · commit 4e1a37cd6e9b · 2018-09-20T10:06:16.000-07:00
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
@@ -974,6 +974,7 @@ class RelationalInstruction extends CompareInstruction {
 
   abstract Instruction getGreaterOperand();
   abstract Instruction getLesserOperand();
+  abstract predicate isStrict();
 }
 
 class CompareLTInstruction extends RelationalInstruction {
@@ -988,6 +989,10 @@ class CompareLTInstruction extends RelationalInstruction {
   override Instruction getGreaterOperand() {
     result = getRightOperand()
   }
+
+  override predicate isStrict() {
+    any()
+  }
 }
 
 class CompareGTInstruction extends RelationalInstruction {
@@ -1002,6 +1007,10 @@ class CompareGTInstruction extends RelationalInstruction {
   override Instruction getGreaterOperand() {
     result = getLeftOperand()
   }
+
+  override predicate isStrict() {
+    any()
+  }
 }
 
 class CompareLEInstruction extends RelationalInstruction {
@@ -1016,6 +1025,10 @@ class CompareLEInstruction extends RelationalInstruction {
   override Instruction getGreaterOperand() {
     result = getRightOperand()
   }
+
+  override predicate isStrict() {
+    none()
+  }
 }
 
 class CompareGEInstruction extends RelationalInstruction {
@@ -1030,6 +1043,10 @@ class CompareGEInstruction extends RelationalInstruction {
   override Instruction getGreaterOperand() {
     result = getLeftOperand()
   }
+
+  override predicate isStrict() {
+    none()
+  }
 }
 
 class SwitchInstruction extends Instruction {

Original file line number	Diff line number	Diff line change
`@@ -974,6 +974,7 @@ class RelationalInstruction extends CompareInstruction {`
`974`	`974`
`975`	`975`	`abstract Instruction getGreaterOperand();`
`976`	`976`	`abstract Instruction getLesserOperand();`
	`977`	`+ abstract predicate isStrict();`
`977`	`978`	`}`
`978`	`979`
`979`	`980`	`class CompareLTInstruction extends RelationalInstruction {`
`@@ -988,6 +989,10 @@ class CompareLTInstruction extends RelationalInstruction {`
`988`	`989`	`override Instruction getGreaterOperand() {`
`989`	`990`	`result = getRightOperand()`
`990`	`991`	`}`
	`992`	`+`
	`993`	`+ override predicate isStrict() {`
	`994`	`+ any()`
	`995`	`+ }`
`991`	`996`	`}`
`992`	`997`
`993`	`998`	`class CompareGTInstruction extends RelationalInstruction {`
`@@ -1002,6 +1007,10 @@ class CompareGTInstruction extends RelationalInstruction {`
`1002`	`1007`	`override Instruction getGreaterOperand() {`
`1003`	`1008`	`result = getLeftOperand()`
`1004`	`1009`	`}`
	`1010`	`+`
	`1011`	`+ override predicate isStrict() {`
	`1012`	`+ any()`
	`1013`	`+ }`
`1005`	`1014`	`}`
`1006`	`1015`
`1007`	`1016`	`class CompareLEInstruction extends RelationalInstruction {`
`@@ -1016,6 +1025,10 @@ class CompareLEInstruction extends RelationalInstruction {`
`1016`	`1025`	`override Instruction getGreaterOperand() {`
`1017`	`1026`	`result = getRightOperand()`
`1018`	`1027`	`}`
	`1028`	`+`
	`1029`	`+ override predicate isStrict() {`
	`1030`	`+ none()`
	`1031`	`+ }`
`1019`	`1032`	`}`
`1020`	`1033`
`1021`	`1034`	`class CompareGEInstruction extends RelationalInstruction {`
`@@ -1030,6 +1043,10 @@ class CompareGEInstruction extends RelationalInstruction {`
`1030`	`1043`	`override Instruction getGreaterOperand() {`
`1031`	`1044`	`result = getLeftOperand()`
`1032`	`1045`	`}`
	`1046`	`+`
	`1047`	`+ override predicate isStrict() {`
	`1048`	`+ none()`
	`1049`	`+ }`
`1033`	`1050`	`}`
`1034`	`1051`
`1035`	`1052`	`class SwitchInstruction extends Instruction {`