C++: Phi instruction toString based on memory locs

Author: rdmarsh2

cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/Instruction.qll

@@ -41,7 +41,7 @@ class Instruction extends Construction::TStageInstruction {
   }
 
   /** Gets a textual representation of this element. */
-  final string toString() { result = this.getOpcode().toString() + ": " + this.getAst().toString() }
+  string toString() { result = this.getOpcode().toString() + ": " + this.getAst().toString() }
 
   /**
    * Gets a string showing the result, opcode, and operands of the instruction, equivalent to what
@@ -2035,6 +2035,11 @@ class PhiInstruction extends Instruction {
     result = this.getAnOperand() and
     result.getPredecessorBlock() = predecessorBlock
   }
+
+  
+  override string toString() {
+    result = "Phi: " + Construction::getPhiLocationString(this)
+  }
 }
 
 /**

cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConstruction.qll

@@ -1001,6 +1001,13 @@ predicate canReuseSsaForMemoryResult(Instruction instruction) {
   // We don't support reusing SSA for any location that could create a `Chi` instruction.
 }
 
+string getPhiLocationString(PhiInstruction phi) {
+  exists(Alias::MemoryLocation loc |
+    phi = getPhi(_, loc) and
+    result = loc.toString()
+  )
+}
+
 /** DEPRECATED: Alias for canReuseSsaForMemoryResult */
 deprecated predicate canReuseSSAForMemoryResult = canReuseSsaForMemoryResult/1;
 

cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/Instruction.qll

@@ -41,7 +41,7 @@ class Instruction extends Construction::TStageInstruction {
   }
 
   /** Gets a textual representation of this element. */
-  final string toString() { result = this.getOpcode().toString() + ": " + this.getAst().toString() }
+  string toString() { result = this.getOpcode().toString() + ": " + this.getAst().toString() }
 
   /**
    * Gets a string showing the result, opcode, and operands of the instruction, equivalent to what
@@ -2035,6 +2035,11 @@ class PhiInstruction extends Instruction {
     result = this.getAnOperand() and
     result.getPredecessorBlock() = predecessorBlock
   }
+
+  
+  override string toString() {
+    result = "Phi: " + Construction::getPhiLocationString(this)
+  }
 }
 
 /**

cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/Instruction.qll

@@ -41,7 +41,7 @@ class Instruction extends Construction::TStageInstruction {
   }
 
   /** Gets a textual representation of this element. */
-  final string toString() { result = this.getOpcode().toString() + ": " + this.getAst().toString() }
+  string toString() { result = this.getOpcode().toString() + ": " + this.getAst().toString() }
 
   /**
    * Gets a string showing the result, opcode, and operands of the instruction, equivalent to what
@@ -2035,6 +2035,11 @@ class PhiInstruction extends Instruction {
     result = this.getAnOperand() and
     result.getPredecessorBlock() = predecessorBlock
   }
+
+  
+  override string toString() {
+    result = "Phi: " + Construction::getPhiLocationString(this)
+  }
 }
 
 /**

cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll

@@ -1001,6 +1001,13 @@ predicate canReuseSsaForMemoryResult(Instruction instruction) {
   // We don't support reusing SSA for any location that could create a `Chi` instruction.
 }
 
+string getPhiLocationString(PhiInstruction phi) {
+  exists(Alias::MemoryLocation loc |
+    phi = getPhi(_, loc) and
+    result = loc.toString()
+  )
+}
+
 /** DEPRECATED: Alias for canReuseSsaForMemoryResult */
 deprecated predicate canReuseSSAForMemoryResult = canReuseSsaForMemoryResult/1;
 

csharp/ql/src/experimental/ir/implementation/raw/Instruction.qll

@@ -41,7 +41,7 @@ class Instruction extends Construction::TStageInstruction {
   }
 
   /** Gets a textual representation of this element. */
-  final string toString() { result = this.getOpcode().toString() + ": " + this.getAst().toString() }
+  string toString() { result = this.getOpcode().toString() + ": " + this.getAst().toString() }
 
   /**
    * Gets a string showing the result, opcode, and operands of the instruction, equivalent to what
@@ -2035,6 +2035,11 @@ class PhiInstruction extends Instruction {
     result = this.getAnOperand() and
     result.getPredecessorBlock() = predecessorBlock
   }
+
+  
+  override string toString() {
+    result = "Phi: " + Construction::getPhiLocationString(this)
+  }
 }
 
 /**

csharp/ql/src/experimental/ir/implementation/unaliased_ssa/Instruction.qll

@@ -41,7 +41,7 @@ class Instruction extends Construction::TStageInstruction {
   }
 
   /** Gets a textual representation of this element. */
-  final string toString() { result = this.getOpcode().toString() + ": " + this.getAst().toString() }
+  string toString() { result = this.getOpcode().toString() + ": " + this.getAst().toString() }
 
   /**
    * Gets a string showing the result, opcode, and operands of the instruction, equivalent to what
@@ -2035,6 +2035,11 @@ class PhiInstruction extends Instruction {
     result = this.getAnOperand() and
     result.getPredecessorBlock() = predecessorBlock
   }
+
+  
+  override string toString() {
+    result = "Phi: " + Construction::getPhiLocationString(this)
+  }
 }
 
 /**

csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll

@@ -1001,6 +1001,13 @@ predicate canReuseSsaForMemoryResult(Instruction instruction) {
   // We don't support reusing SSA for any location that could create a `Chi` instruction.
 }
 
+string getPhiLocationString(PhiInstruction phi) {
+  exists(Alias::MemoryLocation loc |
+    phi = getPhi(_, loc) and
+    result = loc.toString()
+  )
+}
+
 /** DEPRECATED: Alias for canReuseSsaForMemoryResult */
 deprecated predicate canReuseSSAForMemoryResult = canReuseSsaForMemoryResult/1;