C++: QLDoc terminology: object -> mem allocation

jbj · jbj · commit 999051d20e12 · 2020-03-23T20:32:47.000+01: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
@@ -323,7 +323,7 @@ class Instruction extends Construction::TInstruction {
 
   /**
    * Holds if this is an instruction with a memory result that represents a
-   * conflation of more than one object.
+   * conflation of more than one memory allocation.
    *
    * This happens in practice when dereferencing a pointer that cannot be
    * tracked back to a single local allocation. Such memory is instead modeled
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
@@ -323,7 +323,7 @@ class Instruction extends Construction::TInstruction {
 
   /**
    * Holds if this is an instruction with a memory result that represents a
-   * conflation of more than one object.
+   * conflation of more than one memory allocation.
    *
    * This happens in practice when dereferencing a pointer that cannot be
    * tracked back to a single local allocation. Such memory is instead modeled
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
@@ -323,7 +323,7 @@ class Instruction extends Construction::TInstruction {
 
   /**
    * Holds if this is an instruction with a memory result that represents a
-   * conflation of more than one object.
+   * conflation of more than one memory allocation.
    *
    * This happens in practice when dereferencing a pointer that cannot be
    * tracked back to a single local allocation. Such memory is instead modeled
diff --git a/csharp/ql/src/semmle/code/csharp/ir/implementation/raw/Instruction.qll b/csharp/ql/src/semmle/code/csharp/ir/implementation/raw/Instruction.qll
@@ -323,7 +323,7 @@ class Instruction extends Construction::TInstruction {
 
   /**
    * Holds if this is an instruction with a memory result that represents a
-   * conflation of more than one object.
+   * conflation of more than one memory allocation.
    *
    * This happens in practice when dereferencing a pointer that cannot be
    * tracked back to a single local allocation. Such memory is instead modeled
diff --git a/csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/Instruction.qll b/csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/Instruction.qll
@@ -323,7 +323,7 @@ class Instruction extends Construction::TInstruction {
 
   /**
    * Holds if this is an instruction with a memory result that represents a
-   * conflation of more than one object.
+   * conflation of more than one memory allocation.
    *
    * This happens in practice when dereferencing a pointer that cannot be
    * tracked back to a single local allocation. Such memory is instead modeled

Original file line number	Diff line number	Diff line change
`@@ -323,7 +323,7 @@ class Instruction extends Construction::TInstruction {`
`323`	`323`
`324`	`324`	`/**`
`325`	`325`	`* Holds if this is an instruction with a memory result that represents a`
`326`		`- * conflation of more than one object.`
	`326`	`+ * conflation of more than one memory allocation.`
`327`	`327`	`*`
`328`	`328`	`* This happens in practice when dereferencing a pointer that cannot be`
`329`	`329`	`* tracked back to a single local allocation. Such memory is instead modeled`