C++: Check that there is only one overlap

MathiasVP · MathiasVP · commit 121c5e436d75 · 2020-02-14T11:13:53.000+01:00
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/gvn/internal/ValueNumberingInternal.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/gvn/internal/ValueNumberingInternal.qll
@@ -61,12 +61,14 @@ newtype TValueNumber =
  */
 class CongruentCopyInstruction extends CopyInstruction {
   CongruentCopyInstruction() {
+    strictcount(this.getSourceValueOperand().getDefinitionOverlap()) = 1 and
     this.getSourceValueOperand().getDefinitionOverlap() instanceof MustExactlyOverlap
   }
 }
 
 class LoadTotalOverlapInstruction extends LoadInstruction {
   LoadTotalOverlapInstruction() {
+    strictcount(this.getSourceValueOperand().getDefinitionOverlap()) = 1 and
     this.getSourceValueOperand().getDefinitionOverlap() instanceof MustTotallyOverlap
   }
 }
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/raw/gvn/internal/ValueNumberingInternal.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/raw/gvn/internal/ValueNumberingInternal.qll
@@ -61,12 +61,14 @@ newtype TValueNumber =
  */
 class CongruentCopyInstruction extends CopyInstruction {
   CongruentCopyInstruction() {
+    strictcount(this.getSourceValueOperand().getDefinitionOverlap()) = 1 and
     this.getSourceValueOperand().getDefinitionOverlap() instanceof MustExactlyOverlap
   }
 }
 
 class LoadTotalOverlapInstruction extends LoadInstruction {
   LoadTotalOverlapInstruction() {
+    strictcount(this.getSourceValueOperand().getDefinitionOverlap()) = 1 and
     this.getSourceValueOperand().getDefinitionOverlap() instanceof MustTotallyOverlap
   }
 }
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/gvn/internal/ValueNumberingInternal.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/gvn/internal/ValueNumberingInternal.qll
@@ -61,12 +61,14 @@ newtype TValueNumber =
  */
 class CongruentCopyInstruction extends CopyInstruction {
   CongruentCopyInstruction() {
+    strictcount(this.getSourceValueOperand().getDefinitionOverlap()) = 1 and
     this.getSourceValueOperand().getDefinitionOverlap() instanceof MustExactlyOverlap
   }
 }
 
 class LoadTotalOverlapInstruction extends LoadInstruction {
   LoadTotalOverlapInstruction() {
+    strictcount(this.getSourceValueOperand().getDefinitionOverlap()) = 1 and
     this.getSourceValueOperand().getDefinitionOverlap() instanceof MustTotallyOverlap
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -61,12 +61,14 @@ newtype TValueNumber =`
`61`	`61`	`*/`
`62`	`62`	`class CongruentCopyInstruction extends CopyInstruction {`
`63`	`63`	`CongruentCopyInstruction() {`
	`64`	`+ strictcount(this.getSourceValueOperand().getDefinitionOverlap()) = 1 and`
`64`	`65`	`this.getSourceValueOperand().getDefinitionOverlap() instanceof MustExactlyOverlap`
`65`	`66`	`}`
`66`	`67`	`}`
`67`	`68`
`68`	`69`	`class LoadTotalOverlapInstruction extends LoadInstruction {`
`69`	`70`	`LoadTotalOverlapInstruction() {`
	`71`	`+ strictcount(this.getSourceValueOperand().getDefinitionOverlap()) = 1 and`
`70`	`72`	`this.getSourceValueOperand().getDefinitionOverlap() instanceof MustTotallyOverlap`
`71`	`73`	`}`
`72`	`74`	`}`