C++: Fix merge conflicts

dave-bartolomeo · dave-bartolomeo · commit 65535449d6ec · 2019-05-02T11:18:09.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
@@ -50,7 +50,7 @@ module InstructionSanity {
   /**
    * Holds if instruction `instr` is missing an expected operand with tag `tag`.
    */
-  query predicate missingOperand(Instruction instr, string message, FunctionIR func, string funcText) {
+  query predicate missingOperand(Instruction instr, string message, IRFunction func, string funcText) {
     exists(OperandTag tag |
       expectsOperand(instr, tag) and
       not exists(NonPhiOperand operand |
@@ -59,7 +59,7 @@ module InstructionSanity {
       ) and
       message = "Instruction '" + instr.getOpcode().toString() + "' is missing an expected operand with tag '" +
         tag.toString() + "' in function '$@'." and
-      func = instr.getEnclosingFunctionIR() and
+      func = instr.getEnclosingIRFunction() and
       funcText = getIdentityString(func.getFunction())
     )
   }
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/Operand.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/Operand.qll
@@ -29,8 +29,8 @@ class Operand extends TOperand {
     result = getUseInstruction().getLocation()
   }
 
-  final FunctionIR getEnclosingFunctionIR() {
-    result = getUseInstruction().getEnclosingFunctionIR()
+  final IRFunction getEnclosingIRFunction() {
+    result = getUseInstruction().getEnclosingIRFunction()
   }
   
   /**
@@ -417,13 +417,13 @@ class SideEffectOperand extends TypedOperand {
 /**
  * An operand of a `PhiInstruction`.
  */
-class PhiOperand extends MemoryOperand, TPhiOperand {
+class PhiInputOperand extends MemoryOperand, TPhiOperand {
   PhiInstruction useInstr;
   Instruction defInstr;
   IRBlock predecessorBlock;
   Overlap overlap;
 
-  PhiOperand() {
+  PhiInputOperand() {
     this = TPhiOperand(useInstr, defInstr, predecessorBlock, overlap)
   }
 
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasedSSA.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasedSSA.qll
@@ -35,8 +35,8 @@ private newtype TMemoryLocation =
     hasOperandMemoryAccess(_, var, type, startBitOffset, endBitOffset)
   }
   or
-  TUnknownMemoryLocation(FunctionIR funcIR) or
-  TUnknownVirtualVariable(FunctionIR funcIR)
+  TUnknownMemoryLocation(IRFunction funcIR) or
+  TUnknownVirtualVariable(IRFunction funcIR)
 
 /**
  * Represents the memory location accessed by a memory operand or memory result. In this implementation, the location is
@@ -99,7 +99,7 @@ class VariableMemoryLocation extends TVariableMemoryLocation, MemoryLocation {
 
   override final VirtualVariable getVirtualVariable() {
     if variableAddressEscapes(var) then
-      result = TUnknownVirtualVariable(var.getEnclosingFunctionIR())
+      result = TUnknownVirtualVariable(var.getEnclosingIRFunction())
     else
       result = TVariableMemoryLocation(var, var.getType(), 0, var.getType().getSize() * 8)
   }
@@ -130,7 +130,7 @@ class VariableVirtualVariable extends VariableMemoryLocation, VirtualVariable {
  * An access to memory that is not known to be confined to a specific `IRVariable`.
  */
 class UnknownMemoryLocation extends TUnknownMemoryLocation, MemoryLocation {
-  FunctionIR funcIR;
+  IRFunction funcIR;
 
   UnknownMemoryLocation() {
     this = TUnknownMemoryLocation(funcIR)
@@ -157,7 +157,7 @@ class UnknownMemoryLocation extends TUnknownMemoryLocation, MemoryLocation {
  * An access to all aliased memory.
  */
 class UnknownVirtualVariable extends TUnknownVirtualVariable, VirtualVariable {
-  FunctionIR funcIR;
+  IRFunction funcIR;
 
   UnknownVirtualVariable() {
     this = TUnknownVirtualVariable(funcIR)
@@ -247,16 +247,16 @@ MemoryLocation getResultMemoryLocation(Instruction instr) {
           )
         )
         else (
-          result = TUnknownMemoryLocation(instr.getEnclosingFunctionIR())
+          result = TUnknownMemoryLocation(instr.getEnclosingIRFunction())
         )
       ) or
       (
         kind instanceof EscapedMemoryAccess and
-        result = TUnknownVirtualVariable(instr.getEnclosingFunctionIR())
+        result = TUnknownVirtualVariable(instr.getEnclosingIRFunction())
       ) or
       (
         kind instanceof EscapedMayMemoryAccess and
-        result = TUnknownMemoryLocation(instr.getEnclosingFunctionIR())
+        result = TUnknownMemoryLocation(instr.getEnclosingIRFunction())
       )
     )
   )
@@ -275,16 +275,16 @@ MemoryLocation getOperandMemoryLocation(MemoryOperand operand) {
           )
         )
         else (
-          result = TUnknownMemoryLocation(operand.getEnclosingFunctionIR())
+          result = TUnknownMemoryLocation(operand.getEnclosingIRFunction())
         )
       ) or
       (
         kind instanceof EscapedMemoryAccess and
-        result = TUnknownVirtualVariable(operand.getEnclosingFunctionIR())
+        result = TUnknownVirtualVariable(operand.getEnclosingIRFunction())
       ) or
       (
         kind instanceof EscapedMayMemoryAccess and
-        result = TUnknownMemoryLocation(operand.getEnclosingFunctionIR())
+        result = TUnknownMemoryLocation(operand.getEnclosingIRFunction())
       )
     )
   )
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConstruction.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConstruction.qll
@@ -16,7 +16,7 @@ cached private module Cached {
   }
 
   cached predicate functionHasIR(Function func) {
-    exists(OldIR::FunctionIR funcIR |
+    exists(OldIR::IRFunction funcIR |
       funcIR.getFunction() = func
     )
   }
@@ -92,7 +92,7 @@ cached private module Cached {
             )
           )
           else (
-            result = instruction.getEnclosingFunctionIR().getUnmodeledDefinitionInstruction() and
+            result = instruction.getEnclosingIRFunction().getUnmodeledDefinitionInstruction() and
             overlap instanceof MustTotallyOverlap
           )
         ) or
@@ -112,7 +112,7 @@ cached private module Cached {
     tag instanceof ChiPartialOperandTag and
     overlap instanceof MustExactlyOverlap
     or
-    exists(FunctionIR f |
+    exists(IRFunction f |
       tag instanceof UnmodeledUseOperandTag and
       result = f.getUnmodeledDefinitionInstruction() and
       instruction = f.getUnmodeledUseInstruction() and
@@ -288,7 +288,7 @@ cached private module Cached {
     result instanceof Opcode::Unreached
   }
 
-  cached FunctionIR getInstructionEnclosingFunctionIR(Instruction instruction) {
+  cached IRFunction getInstructionEnclosingIRFunction(Instruction instruction) {
     exists(OldInstruction oldInstruction |
       instruction = WrappedInstruction(oldInstruction)
       or
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
@@ -50,7 +50,7 @@ module InstructionSanity {
   /**
    * Holds if instruction `instr` is missing an expected operand with tag `tag`.
    */
-  query predicate missingOperand(Instruction instr, string message, FunctionIR func, string funcText) {
+  query predicate missingOperand(Instruction instr, string message, IRFunction func, string funcText) {
     exists(OperandTag tag |
       expectsOperand(instr, tag) and
       not exists(NonPhiOperand operand |
@@ -59,7 +59,7 @@ module InstructionSanity {
       ) and
       message = "Instruction '" + instr.getOpcode().toString() + "' is missing an expected operand with tag '" +
         tag.toString() + "' in function '$@'." and
-      func = instr.getEnclosingFunctionIR() and
+      func = instr.getEnclosingIRFunction() and
       funcText = getIdentityString(func.getFunction())
     )
   }
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/raw/Operand.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/raw/Operand.qll
@@ -29,8 +29,8 @@ class Operand extends TOperand {
     result = getUseInstruction().getLocation()
   }
 
-  final FunctionIR getEnclosingFunctionIR() {
-    result = getUseInstruction().getEnclosingFunctionIR()
+  final IRFunction getEnclosingIRFunction() {
+    result = getUseInstruction().getEnclosingIRFunction()
   }
   
   /**
@@ -417,13 +417,13 @@ class SideEffectOperand extends TypedOperand {
 /**
  * An operand of a `PhiInstruction`.
  */
-class PhiOperand extends MemoryOperand, TPhiOperand {
+class PhiInputOperand extends MemoryOperand, TPhiOperand {
   PhiInstruction useInstr;
   Instruction defInstr;
   IRBlock predecessorBlock;
   Overlap overlap;
 
-  PhiOperand() {
+  PhiInputOperand() {
     this = TPhiOperand(useInstr, defInstr, predecessorBlock, overlap)
   }
 
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
@@ -50,7 +50,7 @@ module InstructionSanity {
   /**
    * Holds if instruction `instr` is missing an expected operand with tag `tag`.
    */
-  query predicate missingOperand(Instruction instr, string message, FunctionIR func, string funcText) {
+  query predicate missingOperand(Instruction instr, string message, IRFunction func, string funcText) {
     exists(OperandTag tag |
       expectsOperand(instr, tag) and
       not exists(NonPhiOperand operand |
@@ -59,7 +59,7 @@ module InstructionSanity {
       ) and
       message = "Instruction '" + instr.getOpcode().toString() + "' is missing an expected operand with tag '" +
         tag.toString() + "' in function '$@'." and
-      func = instr.getEnclosingFunctionIR() and
+      func = instr.getEnclosingIRFunction() and
       funcText = getIdentityString(func.getFunction())
     )
   }
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/Operand.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/Operand.qll
@@ -29,8 +29,8 @@ class Operand extends TOperand {
     result = getUseInstruction().getLocation()
   }
 
-  final FunctionIR getEnclosingFunctionIR() {
-    result = getUseInstruction().getEnclosingFunctionIR()
+  final IRFunction getEnclosingIRFunction() {
+    result = getUseInstruction().getEnclosingIRFunction()
   }
   
   /**
@@ -417,13 +417,13 @@ class SideEffectOperand extends TypedOperand {
 /**
  * An operand of a `PhiInstruction`.
  */
-class PhiOperand extends MemoryOperand, TPhiOperand {
+class PhiInputOperand extends MemoryOperand, TPhiOperand {
   PhiInstruction useInstr;
   Instruction defInstr;
   IRBlock predecessorBlock;
   Overlap overlap;
 
-  PhiOperand() {
+  PhiInputOperand() {
     this = TPhiOperand(useInstr, defInstr, predecessorBlock, overlap)
   }
 
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll
@@ -16,7 +16,7 @@ cached private module Cached {
   }
 
   cached predicate functionHasIR(Function func) {
-    exists(OldIR::FunctionIR funcIR |
+    exists(OldIR::IRFunction funcIR |
       funcIR.getFunction() = func
     )
   }
@@ -92,7 +92,7 @@ cached private module Cached {
             )
           )
           else (
-            result = instruction.getEnclosingFunctionIR().getUnmodeledDefinitionInstruction() and
+            result = instruction.getEnclosingIRFunction().getUnmodeledDefinitionInstruction() and
             overlap instanceof MustTotallyOverlap
           )
         ) or
@@ -112,7 +112,7 @@ cached private module Cached {
     tag instanceof ChiPartialOperandTag and
     overlap instanceof MustExactlyOverlap
     or
-    exists(FunctionIR f |
+    exists(IRFunction f |
       tag instanceof UnmodeledUseOperandTag and
       result = f.getUnmodeledDefinitionInstruction() and
       instruction = f.getUnmodeledUseInstruction() and
@@ -288,7 +288,7 @@ cached private module Cached {
     result instanceof Opcode::Unreached
   }
 
-  cached FunctionIR getInstructionEnclosingFunctionIR(Instruction instruction) {
+  cached IRFunction getInstructionEnclosingIRFunction(Instruction instruction) {
     exists(OldInstruction oldInstruction |
       instruction = WrappedInstruction(oldInstruction)
       or

Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,8 @@ private newtype TMemoryLocation =`
`35`	`35`	`hasOperandMemoryAccess(_, var, type, startBitOffset, endBitOffset)`
`36`	`36`	`}`
`37`	`37`	`or`
`38`		`- TUnknownMemoryLocation(FunctionIR funcIR) or`
`39`		`- TUnknownVirtualVariable(FunctionIR funcIR)`
	`38`	`+ TUnknownMemoryLocation(IRFunction funcIR) or`
	`39`	`+ TUnknownVirtualVariable(IRFunction funcIR)`
`40`	`40`
`41`	`41`	`/**`
`42`	`42`	`* Represents the memory location accessed by a memory operand or memory result. In this implementation, the location is`
`@@ -99,7 +99,7 @@ class VariableMemoryLocation extends TVariableMemoryLocation, MemoryLocation {`
`99`	`99`
`100`	`100`	`override final VirtualVariable getVirtualVariable() {`
`101`	`101`	`if variableAddressEscapes(var) then`
`102`		`- result = TUnknownVirtualVariable(var.getEnclosingFunctionIR())`
	`102`	`+ result = TUnknownVirtualVariable(var.getEnclosingIRFunction())`
`103`	`103`	`else`
`104`	`104`	`result = TVariableMemoryLocation(var, var.getType(), 0, var.getType().getSize() * 8)`
`105`	`105`	`}`
`@@ -130,7 +130,7 @@ class VariableVirtualVariable extends VariableMemoryLocation, VirtualVariable {`
`130`	`130`	* An access to memory that is not known to be confined to a specific `IRVariable`.
`131`	`131`	`*/`
`132`	`132`	`class UnknownMemoryLocation extends TUnknownMemoryLocation, MemoryLocation {`
`133`		`- FunctionIR funcIR;`
	`133`	`+ IRFunction funcIR;`
`134`	`134`
`135`	`135`	`UnknownMemoryLocation() {`
`136`	`136`	`this = TUnknownMemoryLocation(funcIR)`
`@@ -157,7 +157,7 @@ class UnknownMemoryLocation extends TUnknownMemoryLocation, MemoryLocation {`
`157`	`157`	`* An access to all aliased memory.`
`158`	`158`	`*/`
`159`	`159`	`class UnknownVirtualVariable extends TUnknownVirtualVariable, VirtualVariable {`
`160`		`- FunctionIR funcIR;`
	`160`	`+ IRFunction funcIR;`
`161`	`161`
`162`	`162`	`UnknownVirtualVariable() {`
`163`	`163`	`this = TUnknownVirtualVariable(funcIR)`
`@@ -247,16 +247,16 @@ MemoryLocation getResultMemoryLocation(Instruction instr) {`
`247`	`247`	`)`
`248`	`248`	`)`
`249`	`249`	`else (`
`250`		`- result = TUnknownMemoryLocation(instr.getEnclosingFunctionIR())`
	`250`	`+ result = TUnknownMemoryLocation(instr.getEnclosingIRFunction())`
`251`	`251`	`)`
`252`	`252`	`) or`
`253`	`253`	`(`
`254`	`254`	`kind instanceof EscapedMemoryAccess and`
`255`		`- result = TUnknownVirtualVariable(instr.getEnclosingFunctionIR())`
	`255`	`+ result = TUnknownVirtualVariable(instr.getEnclosingIRFunction())`
`256`	`256`	`) or`
`257`	`257`	`(`
`258`	`258`	`kind instanceof EscapedMayMemoryAccess and`
`259`		`- result = TUnknownMemoryLocation(instr.getEnclosingFunctionIR())`
	`259`	`+ result = TUnknownMemoryLocation(instr.getEnclosingIRFunction())`
`260`	`260`	`)`
`261`	`261`	`)`
`262`	`262`	`)`
`@@ -275,16 +275,16 @@ MemoryLocation getOperandMemoryLocation(MemoryOperand operand) {`
`275`	`275`	`)`
`276`	`276`	`)`
`277`	`277`	`else (`
`278`		`- result = TUnknownMemoryLocation(operand.getEnclosingFunctionIR())`
	`278`	`+ result = TUnknownMemoryLocation(operand.getEnclosingIRFunction())`
`279`	`279`	`)`
`280`	`280`	`) or`
`281`	`281`	`(`
`282`	`282`	`kind instanceof EscapedMemoryAccess and`
`283`		`- result = TUnknownVirtualVariable(operand.getEnclosingFunctionIR())`
	`283`	`+ result = TUnknownVirtualVariable(operand.getEnclosingIRFunction())`
`284`	`284`	`) or`
`285`	`285`	`(`
`286`	`286`	`kind instanceof EscapedMayMemoryAccess and`
`287`		`- result = TUnknownMemoryLocation(operand.getEnclosingFunctionIR())`
	`287`	`+ result = TUnknownMemoryLocation(operand.getEnclosingIRFunction())`
`288`	`288`	`)`
`289`	`289`	`)`
`290`	`290`	`)`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ cached private module Cached {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`cached predicate functionHasIR(Function func) {`
`19`		`- exists(OldIR::FunctionIR funcIR \|`
	`19`	`+ exists(OldIR::IRFunction funcIR \|`
`20`	`20`	`funcIR.getFunction() = func`
`21`	`21`	`)`
`22`	`22`	`}`
`@@ -92,7 +92,7 @@ cached private module Cached {`
`92`	`92`	`)`
`93`	`93`	`)`
`94`	`94`	`else (`
`95`		`- result = instruction.getEnclosingFunctionIR().getUnmodeledDefinitionInstruction() and`
	`95`	`+ result = instruction.getEnclosingIRFunction().getUnmodeledDefinitionInstruction() and`
`96`	`96`	`overlap instanceof MustTotallyOverlap`
`97`	`97`	`)`
`98`	`98`	`) or`
`@@ -112,7 +112,7 @@ cached private module Cached {`
`112`	`112`	`tag instanceof ChiPartialOperandTag and`
`113`	`113`	`overlap instanceof MustExactlyOverlap`
`114`	`114`	`or`
`115`		`- exists(FunctionIR f \|`
	`115`	`+ exists(IRFunction f \|`
`116`	`116`	`tag instanceof UnmodeledUseOperandTag and`
`117`	`117`	`result = f.getUnmodeledDefinitionInstruction() and`
`118`	`118`	`instruction = f.getUnmodeledUseInstruction() and`
`@@ -288,7 +288,7 @@ cached private module Cached {`
`288`	`288`	`result instanceof Opcode::Unreached`
`289`	`289`	`}`
`290`	`290`
`291`		`- cached FunctionIR getInstructionEnclosingFunctionIR(Instruction instruction) {`
	`291`	`+ cached IRFunction getInstructionEnclosingIRFunction(Instruction instruction) {`
`292`	`292`	`exists(OldInstruction oldInstruction \|`
`293`	`293`	`instruction = WrappedInstruction(oldInstruction)`
`294`	`294`	`or`