C++: Fix Operand.getSize()

dave-bartolomeo · dave-bartolomeo · commit c224bbd76775 · 2019-02-11T17:48:59.000-08:00
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/Operand.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/Operand.qll
@@ -21,10 +21,14 @@ class Operand extends TOperand {
     result = "Operand"
   }
 
-  Location getLocation() {
+  final Location getLocation() {
     result = getUseInstruction().getLocation()
   }
 
+  final FunctionIR getEnclosingFunctionIR() {
+    result = getUseInstruction().getEnclosingFunctionIR()
+  }
+  
   /**
    * Gets the `Instruction` that consumes this operand.
    */
@@ -91,7 +95,7 @@ class Operand extends TOperand {
    * a known constant size, this predicate does not hold.
    */
   int getSize() {
-    result = getDefinitionInstruction().getResultSize()
+    result = getType().getSize()
   }
 }
 
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/raw/Operand.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/raw/Operand.qll
@@ -21,10 +21,14 @@ class Operand extends TOperand {
     result = "Operand"
   }
 
-  Location getLocation() {
+  final Location getLocation() {
     result = getUseInstruction().getLocation()
   }
 
+  final FunctionIR getEnclosingFunctionIR() {
+    result = getUseInstruction().getEnclosingFunctionIR()
+  }
+  
   /**
    * Gets the `Instruction` that consumes this operand.
    */
@@ -91,7 +95,7 @@ class Operand extends TOperand {
    * a known constant size, this predicate does not hold.
    */
   int getSize() {
-    result = getDefinitionInstruction().getResultSize()
+    result = getType().getSize()
   }
 }
 
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/Operand.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/Operand.qll
@@ -21,10 +21,14 @@ class Operand extends TOperand {
     result = "Operand"
   }
 
-  Location getLocation() {
+  final Location getLocation() {
     result = getUseInstruction().getLocation()
   }
 
+  final FunctionIR getEnclosingFunctionIR() {
+    result = getUseInstruction().getEnclosingFunctionIR()
+  }
+  
   /**
    * Gets the `Instruction` that consumes this operand.
    */
@@ -91,7 +95,7 @@ class Operand extends TOperand {
    * a known constant size, this predicate does not hold.
    */
   int getSize() {
-    result = getDefinitionInstruction().getResultSize()
+    result = getType().getSize()
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,14 @@ class Operand extends TOperand {`
`21`	`21`	`result = "Operand"`
`22`	`22`	`}`
`23`	`23`
`24`		`- Location getLocation() {`
	`24`	`+ final Location getLocation() {`
`25`	`25`	`result = getUseInstruction().getLocation()`
`26`	`26`	`}`
`27`	`27`
	`28`	`+ final FunctionIR getEnclosingFunctionIR() {`
	`29`	`+ result = getUseInstruction().getEnclosingFunctionIR()`
	`30`	`+ }`
	`31`	`+`
`28`	`32`	`/**`
`29`	`33`	* Gets the `Instruction` that consumes this operand.
`30`	`34`	`*/`
`@@ -91,7 +95,7 @@ class Operand extends TOperand {`
`91`	`95`	`* a known constant size, this predicate does not hold.`
`92`	`96`	`*/`
`93`	`97`	`int getSize() {`
`94`		`- result = getDefinitionInstruction().getResultSize()`
	`98`	`+ result = getType().getSize()`
`95`	`99`	`}`
`96`	`100`	`}`
`97`	`101`