C++: respond to PR comments

Robert Marsh · Robert Marsh · commit ef836c39bb16 · 2019-03-07T13:14:57.000-08:00
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasAnalysis.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasAnalysis.qll
@@ -177,7 +177,6 @@ private predicate operandEscapesNonReturn(Operand operand) {
   operandEscapesDomain(operand)
 }
 
-
 private predicate operandMayReachReturn(Operand operand) {
   // The address is propagated to the result of the instruction, and that result itself is returned
     operandIsPropagated(operand, _) and
@@ -204,15 +203,15 @@ private predicate operandReturned(Operand operand, IntValue bitOffset) {
   exists(IntValue bitOffset1, IntValue bitOffset2 |
     operandIsPropagated(operand, bitOffset1) and
     resultReturned(operand.getUseInstruction(), bitOffset2) and
-    bitOffset = bitOffset1 + bitOffset2
+    bitOffset = Ints::add(bitOffset1, bitOffset2)
   )
   or
   // The operand is used in a function call which returns it, and the return value is then returned
   exists(CallInstruction ci, Instruction init, IntValue bitOffset1, IntValue bitOffset2 |
     isArgumentForParameter(ci, operand, init) and
     resultReturned(init, bitOffset1) and
     resultReturned(ci, bitOffset2) and
-    bitOffset = bitOffset1 + bitOffset2
+    bitOffset = Ints::add(bitOffset1, bitOffset2)
     
   )
   or
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/AliasAnalysis.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/AliasAnalysis.qll
@@ -177,7 +177,6 @@ private predicate operandEscapesNonReturn(Operand operand) {
   operandEscapesDomain(operand)
 }
 
-
 private predicate operandMayReachReturn(Operand operand) {
   // The address is propagated to the result of the instruction, and that result itself is returned
     operandIsPropagated(operand, _) and
@@ -204,15 +203,15 @@ private predicate operandReturned(Operand operand, IntValue bitOffset) {
   exists(IntValue bitOffset1, IntValue bitOffset2 |
     operandIsPropagated(operand, bitOffset1) and
     resultReturned(operand.getUseInstruction(), bitOffset2) and
-    bitOffset = bitOffset1 + bitOffset2
+    bitOffset = Ints::add(bitOffset1, bitOffset2)
   )
   or
   // The operand is used in a function call which returns it, and the return value is then returned
   exists(CallInstruction ci, Instruction init, IntValue bitOffset1, IntValue bitOffset2 |
     isArgumentForParameter(ci, operand, init) and
     resultReturned(init, bitOffset1) and
     resultReturned(ci, bitOffset2) and
-    bitOffset = bitOffset1 + bitOffset2
+    bitOffset = Ints::add(bitOffset1, bitOffset2)
     
   )
   or
