C++/C#: Sync identical files

MathiasVP · MathiasVP · commit 8b8a8cae5be0 · 2020-02-14T16:11:57.000+01:00
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,14 +61,12 @@ 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,14 +61,12 @@ 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/internal/SSAConstruction.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll
@@ -96,7 +96,7 @@ private module Cached {
   }
 
   cached
-  Instruction getMemoryOperandDefinition(
+  private Instruction getMemoryOperandDefinition0(
     Instruction instruction, MemoryOperandTag tag, Overlap overlap
   ) {
     exists(OldInstruction oldInstruction, OldIR::NonPhiMemoryOperand oldOperand |
@@ -142,6 +142,19 @@ private module Cached {
     overlap instanceof MustExactlyOverlap
   }
 
+  cached
+  Instruction getMemoryOperandDefinition(
+    Instruction instruction, MemoryOperandTag tag, Overlap overlap
+  ) {
+    // getMemoryOperandDefinition0 currently has a bug where it can match with multiple overlaps.
+    // This predicate ensures that the chosen overlap is the most conservative if there's any doubt.
+    result = getMemoryOperandDefinition0(instruction, tag, overlap) and
+    not (
+      overlap instanceof MustExactlyOverlap and
+      exists(MustTotallyOverlap o | exists(getMemoryOperandDefinition0(instruction, tag, o)))
+    )
+  }
+
   /**
    * Holds if `instr` is part of a cycle in the operand graph that doesn't go
    * through a phi instruction and therefore should be impossible.
diff --git a/csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll b/csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll
@@ -96,7 +96,7 @@ private module Cached {
   }
 
   cached
-  Instruction getMemoryOperandDefinition(
+  private Instruction getMemoryOperandDefinition0(
     Instruction instruction, MemoryOperandTag tag, Overlap overlap
   ) {
     exists(OldInstruction oldInstruction, OldIR::NonPhiMemoryOperand oldOperand |
@@ -142,6 +142,19 @@ private module Cached {
     overlap instanceof MustExactlyOverlap
   }
 
+  cached
+  Instruction getMemoryOperandDefinition(
+    Instruction instruction, MemoryOperandTag tag, Overlap overlap
+  ) {
+    // getMemoryOperandDefinition0 currently has a bug where it can match with multiple overlaps.
+    // This predicate ensures that the chosen overlap is the most conservative if there's any doubt.
+    result = getMemoryOperandDefinition0(instruction, tag, overlap) and
+    not (
+      overlap instanceof MustExactlyOverlap and
+      exists(MustTotallyOverlap o | exists(getMemoryOperandDefinition0(instruction, tag, o)))
+    )
+  }
+
   /**
    * Holds if `instr` is part of a cycle in the operand graph that doesn't go
    * through a phi instruction and therefore should be impossible.

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