C++/C#: Move ast out of TRawInstruction

Author: Dave Bartolomeo

cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConstruction.qll

@@ -44,8 +44,8 @@ private module Cached {
   class TStageInstruction =
     TRawInstruction or TPhiInstruction or TChiInstruction or TUnreachedInstruction;
 
-  private TRawInstruction rawInstruction(IRFunctionBase irFunc, Opcode opcode, Language::AST ast) {
-    result = TRawInstruction(irFunc, opcode, ast, _, _) and
+  private TRawInstruction rawInstruction(IRFunctionBase irFunc, Opcode opcode) {
+    result = TRawInstruction(irFunc, opcode, _, _) and
     result instanceof OldInstruction
   }
 
@@ -265,7 +265,7 @@ private module Cached {
 
   cached
   Language::AST getInstructionAST(Instruction instr) {
-    instr = rawInstruction(_, _, result)
+    result = getOldInstruction(instr).getAST()
     or
     exists(RawIR::Instruction blockStartInstr |
       instr = phiInstruction(_, blockStartInstr, _) and
@@ -302,7 +302,7 @@ private module Cached {
 
   cached
   Opcode getInstructionOpcode(Instruction instr) {
-    instr = rawInstruction(_, result, _)
+    instr = rawInstruction(_, result)
     or
     instr = phiInstruction(_, _, _) and result instanceof Opcode::Phi
     or
@@ -313,7 +313,7 @@ private module Cached {
 
   cached
   IRFunctionBase getInstructionEnclosingIRFunction(Instruction instr) {
-    instr = rawInstruction(result, _, _)
+    instr = rawInstruction(result, _)
     or
     instr = phiInstruction(result, _, _)
     or

cpp/ql/src/semmle/code/cpp/ir/implementation/internal/TInstruction.qll

@@ -15,10 +15,10 @@ private import Imports::Opcode
 cached
 newtype TInstruction =
   TRawInstruction(
-    IRFunctionBase irFunc, Opcode opcode, Language::AST ast,
-    IRConstruction::Raw::InstructionTag1 tag1, IRConstruction::Raw::InstructionTag2 tag2
+    IRFunctionBase irFunc, Opcode opcode, IRConstruction::Raw::InstructionTag1 tag1,
+    IRConstruction::Raw::InstructionTag2 tag2
   ) {
-    IRConstruction::Raw::hasInstruction(irFunc.getFunction(), opcode, ast, tag1, tag2)
+    IRConstruction::Raw::hasInstruction(irFunc.getFunction(), opcode, tag1, tag2)
   } or
   TUnaliasedSSAPhiInstruction(
     IRFunctionBase irFunc, TRawInstruction blockStartInstr,

cpp/ql/src/semmle/code/cpp/ir/implementation/raw/internal/IRConstruction.qll

@@ -15,11 +15,11 @@ private import TranslatedStmt
 private import TranslatedFunction
 
 TranslatedElement getInstructionTranslatedElement(Instruction instruction) {
-  instruction = TRawInstruction(_, _, _, result, _)
+  instruction = TRawInstruction(_, _, result, _)
 }
 
 InstructionTag getInstructionTag(Instruction instruction) {
-  instruction = TRawInstruction(_, _, _, _, result)
+  instruction = TRawInstruction(_, _, _, result)
 }
 
 pragma[noinline]
@@ -45,10 +45,9 @@ module Raw {
 
   cached
   predicate hasInstruction(
-    Function func, Opcode opcode, Element ast, TranslatedElement element, InstructionTag tag
+    Function func, Opcode opcode, TranslatedElement element, InstructionTag tag
   ) {
     element.hasInstruction(opcode, tag, _) and
-    ast = element.getAST() and
     func = element.getFunction()
   }
 
@@ -370,7 +369,7 @@ private module Cached {
 
   cached
   Locatable getInstructionAST(TStageInstruction instr) {
-    instr = TRawInstruction(_, _, result, _, _)
+    result = getInstructionTranslatedElement(instr).getAST()
   }
 
   cached
@@ -383,12 +382,12 @@ private module Cached {
 
   cached
   Opcode getInstructionOpcode(TStageInstruction instr) {
-    instr = TRawInstruction(_, result, _, _, _)
+    instr = TRawInstruction(_, result, _, _)
   }
 
   cached
   IRFunctionBase getInstructionEnclosingIRFunction(TStageInstruction instr) {
-    instr = TRawInstruction(result, _, _, _, _)
+    instr = TRawInstruction(result, _, _, _)
   }
 
   cached

cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll

@@ -44,8 +44,8 @@ private module Cached {
   class TStageInstruction =
     TRawInstruction or TPhiInstruction or TChiInstruction or TUnreachedInstruction;
 
-  private TRawInstruction rawInstruction(IRFunctionBase irFunc, Opcode opcode, Language::AST ast) {
-    result = TRawInstruction(irFunc, opcode, ast, _, _) and
+  private TRawInstruction rawInstruction(IRFunctionBase irFunc, Opcode opcode) {
+    result = TRawInstruction(irFunc, opcode, _, _) and
     result instanceof OldInstruction
   }
 
@@ -265,7 +265,7 @@ private module Cached {
 
   cached
   Language::AST getInstructionAST(Instruction instr) {
-    instr = rawInstruction(_, _, result)
+    result = getOldInstruction(instr).getAST()
     or
     exists(RawIR::Instruction blockStartInstr |
       instr = phiInstruction(_, blockStartInstr, _) and
@@ -302,7 +302,7 @@ private module Cached {
 
   cached
   Opcode getInstructionOpcode(Instruction instr) {
-    instr = rawInstruction(_, result, _)
+    instr = rawInstruction(_, result)
     or
     instr = phiInstruction(_, _, _) and result instanceof Opcode::Phi
     or
@@ -313,7 +313,7 @@ private module Cached {
 
   cached
   IRFunctionBase getInstructionEnclosingIRFunction(Instruction instr) {
-    instr = rawInstruction(result, _, _)
+    instr = rawInstruction(result, _)
     or
     instr = phiInstruction(result, _, _)
     or

csharp/ql/src/experimental/ir/implementation/internal/TInstruction.qll

@@ -15,10 +15,10 @@ private import Imports::Opcode
 cached
 newtype TInstruction =
   TRawInstruction(
-    IRFunctionBase irFunc, Opcode opcode, Language::AST ast,
-    IRConstruction::Raw::InstructionTag1 tag1, IRConstruction::Raw::InstructionTag2 tag2
+    IRFunctionBase irFunc, Opcode opcode, IRConstruction::Raw::InstructionTag1 tag1,
+    IRConstruction::Raw::InstructionTag2 tag2
   ) {
-    IRConstruction::Raw::hasInstruction(irFunc.getFunction(), opcode, ast, tag1, tag2)
+    IRConstruction::Raw::hasInstruction(irFunc.getFunction(), opcode, tag1, tag2)
   } or
   TUnaliasedSSAPhiInstruction(
     IRFunctionBase irFunc, TRawInstruction blockStartInstr,

csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll

@@ -44,8 +44,8 @@ private module Cached {
   class TStageInstruction =
     TRawInstruction or TPhiInstruction or TChiInstruction or TUnreachedInstruction;
 
-  private TRawInstruction rawInstruction(IRFunctionBase irFunc, Opcode opcode, Language::AST ast) {
-    result = TRawInstruction(irFunc, opcode, ast, _, _) and
+  private TRawInstruction rawInstruction(IRFunctionBase irFunc, Opcode opcode) {
+    result = TRawInstruction(irFunc, opcode, _, _) and
     result instanceof OldInstruction
   }
 
@@ -265,7 +265,7 @@ private module Cached {
 
   cached
   Language::AST getInstructionAST(Instruction instr) {
-    instr = rawInstruction(_, _, result)
+    result = getOldInstruction(instr).getAST()
     or
     exists(RawIR::Instruction blockStartInstr |
       instr = phiInstruction(_, blockStartInstr, _) and
@@ -302,7 +302,7 @@ private module Cached {
 
   cached
   Opcode getInstructionOpcode(Instruction instr) {
-    instr = rawInstruction(_, result, _)
+    instr = rawInstruction(_, result)
     or
     instr = phiInstruction(_, _, _) and result instanceof Opcode::Phi
     or
@@ -313,7 +313,7 @@ private module Cached {
 
   cached
   IRFunctionBase getInstructionEnclosingIRFunction(Instruction instr) {
-    instr = rawInstruction(result, _, _)
+    instr = rawInstruction(result, _)
     or
     instr = phiInstruction(result, _, _)
     or