C++: Improve consistency failure message for multiple MemoryLocations on a memory access.

Dave Bartolomeo · Dave Bartolomeo · commit 653ef9d257a4 · 2021-05-07T16:04:01.000-04:00
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
@@ -934,7 +934,10 @@ module SSAConsistency {
       locationCount > 1 and
       func = operand.getEnclosingIRFunction() and
       funcText = Language::getIdentityString(func.getFunction()) and
-      message = "Operand has " + locationCount.toString() + " memory accesses in function '$@'."
+      message =
+        operand.getUse().toString() + " " + "Operand has " + locationCount.toString() +
+          " memory accesses in function '$@': " +
+          strictconcat(Alias::getOperandMemoryLocation(operand).toString(), ", ")
     )
   }
 
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
@@ -934,7 +934,10 @@ module SSAConsistency {
       locationCount > 1 and
       func = operand.getEnclosingIRFunction() and
       funcText = Language::getIdentityString(func.getFunction()) and
-      message = "Operand has " + locationCount.toString() + " memory accesses in function '$@'."
+      message =
+        operand.getUse().toString() + " " + "Operand has " + locationCount.toString() +
+          " memory accesses in function '$@': " +
+          strictconcat(Alias::getOperandMemoryLocation(operand).toString(), ", ")
     )
   }
 
diff --git a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll
@@ -934,7 +934,10 @@ module SSAConsistency {
       locationCount > 1 and
       func = operand.getEnclosingIRFunction() and
       funcText = Language::getIdentityString(func.getFunction()) and
-      message = "Operand has " + locationCount.toString() + " memory accesses in function '$@'."
+      message =
+        operand.getUse().toString() + " " + "Operand has " + locationCount.toString() +
+          " memory accesses in function '$@': " +
+          strictconcat(Alias::getOperandMemoryLocation(operand).toString(), ", ")
     )
   }
 

Original file line number	Diff line number	Diff line change
`@@ -934,7 +934,10 @@ module SSAConsistency {`
`934`	`934`	`locationCount > 1 and`
`935`	`935`	`func = operand.getEnclosingIRFunction() and`
`936`	`936`	`funcText = Language::getIdentityString(func.getFunction()) and`
`937`		`- message = "Operand has " + locationCount.toString() + " memory accesses in function '$@'."`
	`937`	`+ message =`
	`938`	`+ operand.getUse().toString() + " " + "Operand has " + locationCount.toString() +`
	`939`	`+ " memory accesses in function '$@': " +`
	`940`	`+ strictconcat(Alias::getOperandMemoryLocation(operand).toString(), ", ")`
`938`	`941`	`)`
`939`	`942`	`}`
`940`	`943`