Merge pull request #109 from dave-bartolomeo/dave/Call

jbj · web-flow · commit 24567c57db4d · 2018-08-28T15:28:22.000+02:00
C++: `Invoke` -&gt; `Call`
diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/Instruction.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/Instruction.qll
@@ -36,7 +36,7 @@ module InstructionSanity {
         opcode instanceof Opcode::ReturnValue and tag instanceof ReturnValueOperand or
         opcode instanceof Opcode::ThrowValue and tag instanceof ExceptionOperand or
         opcode instanceof Opcode::UnmodeledUse and tag instanceof UnmodeledUseOperand or
-        opcode instanceof Opcode::Invoke and tag instanceof CallTargetOperand
+        opcode instanceof Opcode::Call and tag instanceof CallTargetOperand
       )
     )
   }
@@ -54,7 +54,7 @@ module InstructionSanity {
   query predicate unexpectedOperand(Instruction instr, OperandTag tag) {
     exists(instr.getOperand(tag)) and
     not expectsOperand(instr, tag) and
-    not (instr instanceof InvokeInstruction and tag instanceof ArgumentOperand) and
+    not (instr instanceof CallInstruction and tag instanceof ArgumentOperand) and
     not (instr instanceof BuiltInInstruction and tag instanceof PositionalArgumentOperand) and
     not (instr instanceof PhiInstruction and tag instanceof PhiOperand)
   }
@@ -987,9 +987,9 @@ class SwitchInstruction extends Instruction {
   }
 }
 
-class InvokeInstruction extends Instruction {
-  InvokeInstruction() {
-    opcode instanceof Opcode::Invoke
+class CallInstruction extends Instruction {
+  CallInstruction() {
+    opcode instanceof Opcode::Call
   }
 
   final Instruction getCallTarget() {
diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/Opcode.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/Opcode.qll
@@ -46,7 +46,7 @@ private newtype TOpcode =
   TStringConstant() or
   TConditionalBranch() or
   TSwitch() or
-  TInvoke() or
+  TCall() or
   TCatchByType() or
   TCatchAny() or
   TThrowValue() or
@@ -138,7 +138,7 @@ module Opcode {
   class StringConstant extends Opcode, TStringConstant { override final string toString() { result = "StringConstant" } }
   class ConditionalBranch extends OpcodeWithCondition, TConditionalBranch { override final string toString() { result = "ConditionalBranch" } }
   class Switch extends OpcodeWithCondition, TSwitch { override final string toString() { result = "Switch" } }
-  class Invoke extends Opcode, TInvoke { override final string toString() { result = "Invoke" } }
+  class Call extends Opcode, TCall { override final string toString() { result = "Call" } }
   class CatchByType extends CatchOpcode, TCatchByType { override final string toString() { result = "CatchByType" } }
   class CatchAny extends CatchOpcode, TCatchAny { override final string toString() { result = "CatchAny" } }
   class ThrowValue extends ThrowOpcode, MemoryAccessOpcode, TThrowValue { override final string toString() { result = "ThrowValue" } }
diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/OperandTag.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/OperandTag.qll
@@ -202,7 +202,7 @@ UnmodeledUseOperand unmodeledUseOperand() {
 }
 
 /**
- * The operand representing the target function of an `Invoke` instruction.
+ * The operand representing the target function of an `Call` instruction.
  */
 class CallTargetOperand extends OperandTag, TCallTargetOperand {
   override final string toString() {
diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/TranslatedExpr.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/TranslatedExpr.qll
@@ -1793,7 +1793,7 @@ abstract class TranslatedCall extends TranslatedExpr {
   override predicate hasInstruction(Opcode opcode, InstructionTag tag,
     Type resultType, boolean isGLValue) {
     tag = CallTag() and
-    opcode instanceof Opcode::Invoke and
+    opcode instanceof Opcode::Call and
     resultType = getCallResultType() and
     isGLValue = false
   }
diff --git a/cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/Instruction.qll b/cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/Instruction.qll
@@ -36,7 +36,7 @@ module InstructionSanity {
         opcode instanceof Opcode::ReturnValue and tag instanceof ReturnValueOperand or
         opcode instanceof Opcode::ThrowValue and tag instanceof ExceptionOperand or
         opcode instanceof Opcode::UnmodeledUse and tag instanceof UnmodeledUseOperand or
-        opcode instanceof Opcode::Invoke and tag instanceof CallTargetOperand
+        opcode instanceof Opcode::Call and tag instanceof CallTargetOperand
       )
     )
   }
@@ -54,7 +54,7 @@ module InstructionSanity {
   query predicate unexpectedOperand(Instruction instr, OperandTag tag) {
     exists(instr.getOperand(tag)) and
     not expectsOperand(instr, tag) and
-    not (instr instanceof InvokeInstruction and tag instanceof ArgumentOperand) and
+    not (instr instanceof CallInstruction and tag instanceof ArgumentOperand) and
     not (instr instanceof BuiltInInstruction and tag instanceof PositionalArgumentOperand) and
     not (instr instanceof PhiInstruction and tag instanceof PhiOperand)
   }
@@ -987,9 +987,9 @@ class SwitchInstruction extends Instruction {
   }
 }
 
-class InvokeInstruction extends Instruction {
-  InvokeInstruction() {
-    opcode instanceof Opcode::Invoke
+class CallInstruction extends Instruction {
+  CallInstruction() {
+    opcode instanceof Opcode::Call
   }
 
   final Instruction getCallTarget() {
diff --git a/cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/OperandTag.qll b/cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/OperandTag.qll
@@ -202,7 +202,7 @@ UnmodeledUseOperand unmodeledUseOperand() {
 }
 
 /**
- * The operand representing the target function of an `Invoke` instruction.
+ * The operand representing the target function of an `Call` instruction.
  */
 class CallTargetOperand extends OperandTag, TCallTargetOperand {
   override final string toString() {
diff --git a/cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/Instruction.qll b/cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/Instruction.qll
@@ -36,7 +36,7 @@ module InstructionSanity {
         opcode instanceof Opcode::ReturnValue and tag instanceof ReturnValueOperand or
         opcode instanceof Opcode::ThrowValue and tag instanceof ExceptionOperand or
         opcode instanceof Opcode::UnmodeledUse and tag instanceof UnmodeledUseOperand or
-        opcode instanceof Opcode::Invoke and tag instanceof CallTargetOperand
+        opcode instanceof Opcode::Call and tag instanceof CallTargetOperand
       )
     )
   }
@@ -54,7 +54,7 @@ module InstructionSanity {
   query predicate unexpectedOperand(Instruction instr, OperandTag tag) {
     exists(instr.getOperand(tag)) and
     not expectsOperand(instr, tag) and
-    not (instr instanceof InvokeInstruction and tag instanceof ArgumentOperand) and
+    not (instr instanceof CallInstruction and tag instanceof ArgumentOperand) and
     not (instr instanceof BuiltInInstruction and tag instanceof PositionalArgumentOperand) and
     not (instr instanceof PhiInstruction and tag instanceof PhiOperand)
   }
@@ -987,9 +987,9 @@ class SwitchInstruction extends Instruction {
   }
 }
 
-class InvokeInstruction extends Instruction {
-  InvokeInstruction() {
-    opcode instanceof Opcode::Invoke
+class CallInstruction extends Instruction {
+  CallInstruction() {
+    opcode instanceof Opcode::Call
   }
 
   final Instruction getCallTarget() {
diff --git a/cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/OperandTag.qll b/cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/OperandTag.qll
@@ -202,7 +202,7 @@ UnmodeledUseOperand unmodeledUseOperand() {
 }
 
 /**
- * The operand representing the target function of an `Invoke` instruction.
+ * The operand representing the target function of an `Call` instruction.
  */
 class CallTargetOperand extends OperandTag, TCallTargetOperand {
   override final string toString() {
diff --git a/cpp/ql/test/library-tests/ir/ir/aliased_ssa_ir.expected b/cpp/ql/test/library-tests/ir/ir/aliased_ssa_ir.expected
diff --git a/cpp/ql/test/library-tests/ir/ir/ir.expected b/cpp/ql/test/library-tests/ir/ir/ir.expected
diff --git a/cpp/ql/test/library-tests/ir/ir/ssa_ir.expected b/cpp/ql/test/library-tests/ir/ir/ssa_ir.expected

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ module InstructionSanity {`
`36`	`36`	`opcode instanceof Opcode::ReturnValue and tag instanceof ReturnValueOperand or`
`37`	`37`	`opcode instanceof Opcode::ThrowValue and tag instanceof ExceptionOperand or`
`38`	`38`	`opcode instanceof Opcode::UnmodeledUse and tag instanceof UnmodeledUseOperand or`
`39`		`- opcode instanceof Opcode::Invoke and tag instanceof CallTargetOperand`
	`39`	`+ opcode instanceof Opcode::Call and tag instanceof CallTargetOperand`
`40`	`40`	`)`
`41`	`41`	`)`
`42`	`42`	`}`
`@@ -54,7 +54,7 @@ module InstructionSanity {`
`54`	`54`	`query predicate unexpectedOperand(Instruction instr, OperandTag tag) {`
`55`	`55`	`exists(instr.getOperand(tag)) and`
`56`	`56`	`not expectsOperand(instr, tag) and`
`57`		`- not (instr instanceof InvokeInstruction and tag instanceof ArgumentOperand) and`
	`57`	`+ not (instr instanceof CallInstruction and tag instanceof ArgumentOperand) and`
`58`	`58`	`not (instr instanceof BuiltInInstruction and tag instanceof PositionalArgumentOperand) and`
`59`	`59`	`not (instr instanceof PhiInstruction and tag instanceof PhiOperand)`
`60`	`60`	`}`
`@@ -987,9 +987,9 @@ class SwitchInstruction extends Instruction {`
`987`	`987`	`}`
`988`	`988`	`}`
`989`	`989`
`990`		`-class InvokeInstruction extends Instruction {`
`991`		`- InvokeInstruction() {`
`992`		`- opcode instanceof Opcode::Invoke`
	`990`	`+class CallInstruction extends Instruction {`
	`991`	`+ CallInstruction() {`
	`992`	`+ opcode instanceof Opcode::Call`
`993`	`993`	`}`
`994`	`994`
`995`	`995`	`final Instruction getCallTarget() {`
Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ UnmodeledUseOperand unmodeledUseOperand() {`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`/**`
`205`		- * The operand representing the target function of an `Invoke` instruction.
	`205`	+ * The operand representing the target function of an `Call` instruction.
`206`	`206`	`*/`
`207`	`207`	`class CallTargetOperand extends OperandTag, TCallTargetOperand {`
`208`	`208`	`override final string toString() {`
Original file line number	Diff line number	Diff line change
`@@ -1793,7 +1793,7 @@ abstract class TranslatedCall extends TranslatedExpr {`
`1793`	`1793`	`override predicate hasInstruction(Opcode opcode, InstructionTag tag,`
`1794`	`1794`	`Type resultType, boolean isGLValue) {`
`1795`	`1795`	`tag = CallTag() and`
`1796`		`- opcode instanceof Opcode::Invoke and`
	`1796`	`+ opcode instanceof Opcode::Call and`
`1797`	`1797`	`resultType = getCallResultType() and`
`1798`	`1798`	`isGLValue = false`
`1799`	`1799`	`}`