hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-05-03 12:45:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #857 from jbj/ir-getInstruction

Browse Source 
C++: Fix TranslatedElement.getInstruction perf
This commit is contained in:
Dave Bartolomeo
2019-02-04 09:24:00 -08:00
committed by GitHub
parent 411c285aa3 35d7fb5322
commit 7345c921d9
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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) {

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

@@ -619,12 +619,18 @@ 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()
}
/**
@@ -632,7 +638,8 @@ abstract class TranslatedElement extends TTranslatedElement {
*/
final IRTempVariable getTempVariable(TempVariableTag tag) {
result.getAST() = getAST() and
result.getTag() = tag
result.getTag() = tag and
hasTempVariable(tag, _)
}
/**