C#: sync IR

Robert Marsh · Robert Marsh · commit b8bbce0eb6a4 · 2019-10-17T11:00:04.000-07:00
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
@@ -120,6 +120,13 @@ module InstructionSanity {
     )
   }
 
+  query predicate sideEffectWithoutPrimary(SideEffectInstruction instr, string message, IRFunction func, string funcText) {
+    not exists(instr.getPrimaryInstruction()) and
+    message = "Side effect instruction missing primary instruction in function $@" and
+    func = instr.getEnclosingIRFunction() and
+    funcText = Language::getIdentityString(func.getFunction())
+  }
+
   /**
    * Holds if an instruction, other than `ExitFunction`, has no successors.
    */
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
@@ -120,6 +120,13 @@ module InstructionSanity {
     )
   }
 
+  query predicate sideEffectWithoutPrimary(SideEffectInstruction instr, string message, IRFunction func, string funcText) {
+    not exists(instr.getPrimaryInstruction()) and
+    message = "Side effect instruction missing primary instruction in function $@" and
+    func = instr.getEnclosingIRFunction() and
+    funcText = Language::getIdentityString(func.getFunction())
+  }
+
   /**
    * Holds if an instruction, other than `ExitFunction`, has no successors.
    */
diff --git a/csharp/ql/test/library-tests/ir/ir/raw_ir_sanity.expected b/csharp/ql/test/library-tests/ir/ir/raw_ir_sanity.expected
@@ -3,6 +3,7 @@ unexpectedOperand
 duplicateOperand
 missingPhiOperand
 missingOperandType
+sideEffectWithoutPrimary
 instructionWithoutSuccessor
 ambiguousSuccessors
 unexplainedLoop
diff --git a/csharp/ql/test/library-tests/ir/ir/unaliased_ssa_sanity.expected b/csharp/ql/test/library-tests/ir/ir/unaliased_ssa_sanity.expected
@@ -3,6 +3,7 @@ unexpectedOperand
 duplicateOperand
 missingPhiOperand
 missingOperandType
+sideEffectWithoutPrimary
 instructionWithoutSuccessor
 ambiguousSuccessors
 unexplainedLoop

Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,13 @@ module InstructionSanity {`
`120`	`120`	`)`
`121`	`121`	`}`
`122`	`122`
	`123`	`+ query predicate sideEffectWithoutPrimary(SideEffectInstruction instr, string message, IRFunction func, string funcText) {`
	`124`	`+ not exists(instr.getPrimaryInstruction()) and`
	`125`	`+ message = "Side effect instruction missing primary instruction in function $@" and`
	`126`	`+ func = instr.getEnclosingIRFunction() and`
	`127`	`+ funcText = Language::getIdentityString(func.getFunction())`
	`128`	`+ }`
	`129`	`+`
`123`	`130`	`/**`
`124`	`131`	* Holds if an instruction, other than `ExitFunction`, has no successors.
`125`	`132`	`*/`