C++: Make 'TranslatedBinaryOperation' no longer a single-instruction producing translated element. We need this for the next commit.

Author: MathiasVP

cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/InstructionTag.qll

@@ -97,6 +97,7 @@ newtype TInstructionTag =
     exists(Stmt s | exists(s.getImplicitDestructorCall(index)))
   } or
   CoAwaitBranchTag() or
+  BinaryOperationOperationTag() or
   NotExprConversionTag()
 
 class InstructionTag extends TInstructionTag {
@@ -288,5 +289,7 @@ string getInstructionTagId(TInstructionTag tag) {
   or
   tag = CoAwaitBranchTag() and result = "CoAwaitBranch"
   or
+  tag = BinaryOperationOperationTag() and result = "BinaryOperationOperation"
+  or
   tag = NotExprConversionTag() and result = "NotExprConversion"
 }

cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedExpr.qll

@@ -1853,19 +1853,29 @@ private Opcode spaceShipOpcode(SpaceshipExpr expr) {
 /**
  * IR translation of a simple binary operation.
  */
-class TranslatedBinaryOperation extends TranslatedSingleInstructionExpr {
+class TranslatedBinaryOperation extends TranslatedNonConstantExpr {
   TranslatedBinaryOperation() {
     expr instanceof BinaryArithmeticOperation or
     expr instanceof BinaryBitwiseOperation or
     expr instanceof ComparisonOperation
   }
 
+  final override Instruction getResult() {
+    result = this.getInstruction(BinaryOperationOperationTag())
+  }
+
+  final override predicate hasInstruction(Opcode opcode, InstructionTag tag, CppType resultType) {
+    opcode = this.getOpcode() and
+    tag = BinaryOperationOperationTag() and
+    resultType = this.getResultType()
+  }
+
   override Instruction getFirstInstruction(EdgeKind kind) {
     result = this.getLeftOperand().getFirstInstruction(kind)
   }
 
   override Instruction getALastInstructionInternal() {
-    result = this.getInstruction(OnlyInstructionTag())
+    result = this.getInstruction(BinaryOperationOperationTag())
   }
 
   final override TranslatedElement getChildInternal(int id) {
@@ -1875,7 +1885,7 @@ class TranslatedBinaryOperation extends TranslatedSingleInstructionExpr {
   }
 
   final override Instruction getInstructionRegisterOperand(InstructionTag tag, OperandTag operandTag) {
-    tag = OnlyInstructionTag() and
+    tag = BinaryOperationOperationTag() and
     if this.swapOperandsOnOp()
     then (
       operandTag instanceof RightOperandTag and
@@ -1893,7 +1903,7 @@ class TranslatedBinaryOperation extends TranslatedSingleInstructionExpr {
   }
 
   override Instruction getInstructionSuccessorInternal(InstructionTag tag, EdgeKind kind) {
-    tag = OnlyInstructionTag() and
+    tag = BinaryOperationOperationTag() and
     result = this.getParent().getChildSuccessor(this, kind)
   }
 
@@ -1903,10 +1913,10 @@ class TranslatedBinaryOperation extends TranslatedSingleInstructionExpr {
     or
     kind instanceof GotoEdge and
     child = this.getRightOperand() and
-    result = this.getInstruction(OnlyInstructionTag())
+    result = this.getInstruction(BinaryOperationOperationTag())
   }
 
-  override Opcode getOpcode() {
+  Opcode getOpcode() {
     result = binaryArithmeticOpcode(expr) or
     result = binaryBitwiseOpcode(expr) or
     result = comparisonOpcode(expr) or
@@ -1920,7 +1930,7 @@ class TranslatedBinaryOperation extends TranslatedSingleInstructionExpr {
   }
 
   override int getInstructionElementSize(InstructionTag tag) {
-    tag = OnlyInstructionTag() and
+    tag = BinaryOperationOperationTag() and
     exists(Opcode opcode |
       opcode = this.getOpcode() and
       (