Merge pull request #857 from jbj/ir-getInstruction

C++: Fix TranslatedElement.getInstruction perf

Author: dave-bartolomeo

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

@@ -16,20 +16,12 @@ class InstructionTagType extends TInstructionTag {
 
 private TranslatedElement getInstructionTranslatedElement(
     Instruction instruction) {
-  result = getInstructionTranslatedElementAndTag(instruction, _)
+  instruction = result.getInstruction(_)
 }
 
 private TranslatedElement getInstructionTranslatedElementAndTag(
     Instruction instruction, InstructionTag tag) {
-  result.getAST() = instruction.getAST() and
-  tag = instruction.getTag() and
-  result.hasInstruction(_, tag, _, _)
-}
-
-private TranslatedElement getTempVariableTranslatedElement(
-  IRTempVariable var) {
-  result.getAST() = var.getAST() and
-  result.hasTempVariable(var.getTag(), _)
+  instruction = result.getInstruction(tag)
 }
 
 import Cached
@@ -262,8 +254,10 @@ cached private module Cached {
 import CachedForDebugging
 cached private module CachedForDebugging {
   cached string getTempVariableUniqueId(IRTempVariable var) {
-    result = getTempVariableTranslatedElement(var).getId() + ":" +
-      getTempVariableTagId(var.getTag())
+    exists(TranslatedElement element |
+      var = element.getTempVariable(_) and
+      result = element.getId() + ":" + getTempVariableTagId(var.getTag())
+    )
   }
 
   cached string getInstructionUniqueId(Instruction instruction) {

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

@@ -619,20 +619,27 @@ abstract class TranslatedElement extends TTranslatedElement {
     none()
   }
 
+  pragma[noinline]
+  private predicate hasInstructionWithTagAndAst(InstructionTag tag, Locatable ast) {
+    hasInstruction(_, tag, _, _) and
+    ast = getAST()
+  }
+
   /**
    * Gets the instruction generated by this element with tag `tag`.
    */
   final Instruction getInstruction(InstructionTag tag) {
-    result.getAST() = getAST() and
-    result.getTag() = tag
+    hasInstructionWithTagAndAst(tag, result.getAST()) and
+    tag = result.getTag()
   }
 
   /**
    * Gets the temporary variable generated by this element with tag `tag`.
    */
   final IRTempVariable getTempVariable(TempVariableTag tag) {
     result.getAST() = getAST() and
-    result.getTag() = tag
+    result.getTag() = tag and
+    hasTempVariable(tag, _)
   }
 
   /**