Merge pull request #985 from rdmarsh2/rdmarsh/ir-call-side-effect

jbj · web-flow · commit f12dfda28fe7 · 2019-02-26T10:36:18.000+01:00
C++: fix PrimaryInstruction for call side effects
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/raw/internal/TranslatedCall.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/raw/internal/TranslatedCall.qll
@@ -218,6 +218,12 @@ abstract class TranslatedCall extends TranslatedExpr {
   private predicate hasSideEffect() {
     hasReadSideEffect() or hasWriteSideEffect()
   }
+
+  override Instruction getPrimaryInstructionForSideEffect(InstructionTag tag) {
+      hasSideEffect() and
+      tag = CallSideEffectTag() and
+      result = getResult()
+  }
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -218,6 +218,12 @@ abstract class TranslatedCall extends TranslatedExpr {`
`218`	`218`	`private predicate hasSideEffect() {`
`219`	`219`	`hasReadSideEffect() or hasWriteSideEffect()`
`220`	`220`	`}`
	`221`	`+`
	`222`	`+ override Instruction getPrimaryInstructionForSideEffect(InstructionTag tag) {`
	`223`	`+ hasSideEffect() and`
	`224`	`+ tag = CallSideEffectTag() and`
	`225`	`+ result = getResult()`
	`226`	`+ }`
`221`	`227`	`}`
`222`	`228`
`223`	`229`	`/**`