Merge pull request #134 from jbj/getOperandMemoryAccess-this

semmle-qlci · web-flow · commit 10329fa188ad · 2018-09-06T09:18:57.000+01:00
Approved by dave-bartolomeo
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
@@ -602,7 +602,7 @@ class ReturnValueInstruction extends ReturnInstruction {
   }
 
   override final MemoryAccessKind getOperandMemoryAccess(OperandTag tag) {
-    tag instanceof ReturnValueOperand and
+    exists(this.getOperand(tag.(ReturnValueOperand))) and
     result instanceof IndirectMemoryAccess
   }
 }
@@ -629,7 +629,7 @@ class LoadInstruction extends CopyInstruction {
   }
 
   override final MemoryAccessKind getOperandMemoryAccess(OperandTag tag) {
-    tag instanceof CopySourceOperand and
+    exists(this.getOperand(tag.(CopySourceOperand))) and
     result instanceof IndirectMemoryAccess
   }
 
@@ -1015,7 +1015,7 @@ class ThrowValueInstruction extends ThrowInstruction {
   }
 
   override final MemoryAccessKind getOperandMemoryAccess(OperandTag tag) {
-    tag instanceof ExceptionOperand and
+    exists(this.getOperand(tag.(ExceptionOperand))) and
     result instanceof IndirectMemoryAccess
   }
 
@@ -1114,7 +1114,7 @@ class UnmodeledUseInstruction extends Instruction {
   }
 
   override final MemoryAccessKind getOperandMemoryAccess(OperandTag tag) {
-    tag instanceof UnmodeledUseOperand and
+    exists(this.getOperand(tag.(UnmodeledUseOperand))) and
     result instanceof UnmodeledMemoryAccess
   }
 }
@@ -1125,7 +1125,7 @@ class PhiInstruction extends Instruction {
   }
 
   override final MemoryAccessKind getOperandMemoryAccess(OperandTag tag) {
-    tag instanceof PhiOperand and
+    exists(this.getOperand(tag.(PhiOperand))) and
     result instanceof PhiMemoryAccess
   }
 
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
@@ -602,7 +602,7 @@ class ReturnValueInstruction extends ReturnInstruction {
   }
 
   override final MemoryAccessKind getOperandMemoryAccess(OperandTag tag) {
-    tag instanceof ReturnValueOperand and
+    exists(this.getOperand(tag.(ReturnValueOperand))) and
     result instanceof IndirectMemoryAccess
   }
 }
@@ -629,7 +629,7 @@ class LoadInstruction extends CopyInstruction {
   }
 
   override final MemoryAccessKind getOperandMemoryAccess(OperandTag tag) {
-    tag instanceof CopySourceOperand and
+    exists(this.getOperand(tag.(CopySourceOperand))) and
     result instanceof IndirectMemoryAccess
   }
 
@@ -1015,7 +1015,7 @@ class ThrowValueInstruction extends ThrowInstruction {
   }
 
   override final MemoryAccessKind getOperandMemoryAccess(OperandTag tag) {
-    tag instanceof ExceptionOperand and
+    exists(this.getOperand(tag.(ExceptionOperand))) and
     result instanceof IndirectMemoryAccess
   }
 
@@ -1114,7 +1114,7 @@ class UnmodeledUseInstruction extends Instruction {
   }
 
   override final MemoryAccessKind getOperandMemoryAccess(OperandTag tag) {
-    tag instanceof UnmodeledUseOperand and
+    exists(this.getOperand(tag.(UnmodeledUseOperand))) and
     result instanceof UnmodeledMemoryAccess
   }
 }
@@ -1125,7 +1125,7 @@ class PhiInstruction extends Instruction {
   }
 
   override final MemoryAccessKind getOperandMemoryAccess(OperandTag tag) {
-    tag instanceof PhiOperand and
+    exists(this.getOperand(tag.(PhiOperand))) and
     result instanceof PhiMemoryAccess
   }
 
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
@@ -602,7 +602,7 @@ class ReturnValueInstruction extends ReturnInstruction {
   }
 
   override final MemoryAccessKind getOperandMemoryAccess(OperandTag tag) {
-    tag instanceof ReturnValueOperand and
+    exists(this.getOperand(tag.(ReturnValueOperand))) and
     result instanceof IndirectMemoryAccess
   }
 }
@@ -629,7 +629,7 @@ class LoadInstruction extends CopyInstruction {
   }
 
   override final MemoryAccessKind getOperandMemoryAccess(OperandTag tag) {
-    tag instanceof CopySourceOperand and
+    exists(this.getOperand(tag.(CopySourceOperand))) and
     result instanceof IndirectMemoryAccess
   }
 
@@ -1015,7 +1015,7 @@ class ThrowValueInstruction extends ThrowInstruction {
   }
 
   override final MemoryAccessKind getOperandMemoryAccess(OperandTag tag) {
-    tag instanceof ExceptionOperand and
+    exists(this.getOperand(tag.(ExceptionOperand))) and
     result instanceof IndirectMemoryAccess
   }
 
@@ -1114,7 +1114,7 @@ class UnmodeledUseInstruction extends Instruction {
   }
 
   override final MemoryAccessKind getOperandMemoryAccess(OperandTag tag) {
-    tag instanceof UnmodeledUseOperand and
+    exists(this.getOperand(tag.(UnmodeledUseOperand))) and
     result instanceof UnmodeledMemoryAccess
   }
 }
@@ -1125,7 +1125,7 @@ class PhiInstruction extends Instruction {
   }
 
   override final MemoryAccessKind getOperandMemoryAccess(OperandTag tag) {
-    tag instanceof PhiOperand and
+    exists(this.getOperand(tag.(PhiOperand))) and
     result instanceof PhiMemoryAccess
   }
 

Original file line number	Diff line number	Diff line change
`@@ -602,7 +602,7 @@ class ReturnValueInstruction extends ReturnInstruction {`
`602`	`602`	`}`
`603`	`603`
`604`	`604`	`override final MemoryAccessKind getOperandMemoryAccess(OperandTag tag) {`
`605`		`- tag instanceof ReturnValueOperand and`
	`605`	`+ exists(this.getOperand(tag.(ReturnValueOperand))) and`
`606`	`606`	`result instanceof IndirectMemoryAccess`
`607`	`607`	`}`
`608`	`608`	`}`
`@@ -629,7 +629,7 @@ class LoadInstruction extends CopyInstruction {`
`629`	`629`	`}`
`630`	`630`
`631`	`631`	`override final MemoryAccessKind getOperandMemoryAccess(OperandTag tag) {`
`632`		`- tag instanceof CopySourceOperand and`
	`632`	`+ exists(this.getOperand(tag.(CopySourceOperand))) and`
`633`	`633`	`result instanceof IndirectMemoryAccess`
`634`	`634`	`}`
`635`	`635`
`@@ -1015,7 +1015,7 @@ class ThrowValueInstruction extends ThrowInstruction {`
`1015`	`1015`	`}`
`1016`	`1016`
`1017`	`1017`	`override final MemoryAccessKind getOperandMemoryAccess(OperandTag tag) {`
`1018`		`- tag instanceof ExceptionOperand and`
	`1018`	`+ exists(this.getOperand(tag.(ExceptionOperand))) and`
`1019`	`1019`	`result instanceof IndirectMemoryAccess`
`1020`	`1020`	`}`
`1021`	`1021`
`@@ -1114,7 +1114,7 @@ class UnmodeledUseInstruction extends Instruction {`
`1114`	`1114`	`}`
`1115`	`1115`
`1116`	`1116`	`override final MemoryAccessKind getOperandMemoryAccess(OperandTag tag) {`
`1117`		`- tag instanceof UnmodeledUseOperand and`
	`1117`	`+ exists(this.getOperand(tag.(UnmodeledUseOperand))) and`
`1118`	`1118`	`result instanceof UnmodeledMemoryAccess`
`1119`	`1119`	`}`
`1120`	`1120`	`}`
`@@ -1125,7 +1125,7 @@ class PhiInstruction extends Instruction {`
`1125`	`1125`	`}`
`1126`	`1126`
`1127`	`1127`	`override final MemoryAccessKind getOperandMemoryAccess(OperandTag tag) {`
`1128`		`- tag instanceof PhiOperand and`
	`1128`	`+ exists(this.getOperand(tag.(PhiOperand))) and`
`1129`	`1129`	`result instanceof PhiMemoryAccess`
`1130`	`1130`	`}`
`1131`	`1131`