From aa4436fa2221f6ec1c94a19c77a15783bec36e8b Mon Sep 17 00:00:00 2001 From: Dave Bartolomeo Date: Fri, 31 Aug 2018 10:18:05 -0700 Subject: [PATCH] C++: More IR reshuffling Remove redundant "_ir" suffix. Move non-user-importable modules into "implementation" directory. --- cpp/ql/src/semmle/code/cpp/ir/IR.qll | 2 +- cpp/ql/src/semmle/code/cpp/ir/IRSanity.ql | 2 +- cpp/ql/src/semmle/code/cpp/ir/Opcode.qll | 1 - cpp/ql/src/semmle/code/cpp/ir/PrintIR.ql | 2 +- .../semmle/code/cpp/ir/{ => implementation}/EdgeKind.qll | 0 .../code/cpp/ir/{ => implementation}/MemoryAccessKind.qll | 0 .../code/cpp/ir/{internal => implementation}/Opcode.qll | 0 .../code/cpp/ir/{ => implementation}/TempVariableTag.qll | 2 +- .../code/cpp/ir/{ => implementation}/ValueCategory.qll | 0 .../{aliased_ssa_ir => aliased_ssa}/AliasAnalysis.qll | 0 .../cpp/ir/internal/aliased_ssa/AliasAnalysisInternal.qll | 1 + .../{aliased_ssa_ir => aliased_ssa}/FunctionIR.qll | 0 cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/IR.qll | 7 +++++++ .../internal/{aliased_ssa_ir => aliased_ssa}/IRBlock.qll | 2 +- .../IRBlockConstruction.qll | 0 .../{aliased_ssa_ir => aliased_ssa}/IRInternal.qll | 0 .../internal/{aliased_ssa_ir => aliased_ssa}/IRSanity.ql | 0 .../internal/{aliased_ssa_ir => aliased_ssa}/IRSanity.qll | 0 .../{aliased_ssa_ir => aliased_ssa}/IRVariable.qll | 2 +- .../{aliased_ssa_ir => aliased_ssa}/Instruction.qll | 8 ++++---- .../{aliased_ssa_ir => aliased_ssa}/OperandTag.qll | 0 .../internal/{aliased_ssa_ir => aliased_ssa}/PrintIR.ql | 0 .../internal/{aliased_ssa_ir => aliased_ssa}/PrintIR.qll | 0 .../internal/{ssa_ir => aliased_ssa}/SSAConstruction.qll | 2 +- .../ir/internal/aliased_ssa/SSAConstructionInternal.qll | 3 +++ .../{aliased_ssa_ir => aliased_ssa}/SimpleSSA.qll | 0 .../cpp/ir/internal/aliased_ssa/SimpleSSAInternal.qll | 3 +++ .../ir/internal/aliased_ssa_ir/AliasAnalysisInternal.qll | 1 - .../src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IR.qll | 7 ------- .../internal/aliased_ssa_ir/SSAConstructionInternal.qll | 3 --- .../cpp/ir/internal/aliased_ssa_ir/SimpleSSAInternal.qll | 3 --- .../code/cpp/ir/internal/{raw_ir => raw}/FunctionIR.qll | 0 cpp/ql/src/semmle/code/cpp/ir/internal/raw/IR.qll | 7 +++++++ .../code/cpp/ir/internal/{raw_ir => raw}/IRBlock.qll | 2 +- .../ir/internal/{raw_ir => raw}/IRBlockConstruction.qll | 2 +- .../cpp/ir/internal/{raw_ir => raw}/IRConstruction.qll | 2 +- .../code/cpp/ir/internal/{raw_ir => raw}/IRInternal.qll | 0 .../code/cpp/ir/internal/{raw_ir => raw}/IRSanity.ql | 0 .../code/cpp/ir/internal/{raw_ir => raw}/IRSanity.qll | 0 .../code/cpp/ir/internal/{raw_ir => raw}/IRVariable.qll | 2 +- .../code/cpp/ir/internal/{raw_ir => raw}/Instruction.qll | 8 ++++---- .../cpp/ir/internal/{raw_ir => raw}/InstructionTag.qll | 0 .../code/cpp/ir/internal/{raw_ir => raw}/OperandTag.qll | 0 .../code/cpp/ir/internal/{raw_ir => raw}/PrintIR.ql | 0 .../code/cpp/ir/internal/{raw_ir => raw}/PrintIR.qll | 0 .../ir/internal/{raw_ir => raw}/TranslatedCondition.qll | 2 +- .../{raw_ir => raw}/TranslatedDeclarationEntry.qll | 2 +- .../cpp/ir/internal/{raw_ir => raw}/TranslatedElement.qll | 4 ++-- .../cpp/ir/internal/{raw_ir => raw}/TranslatedExpr.qll | 2 +- .../ir/internal/{raw_ir => raw}/TranslatedFunction.qll | 4 ++-- .../internal/{raw_ir => raw}/TranslatedInitialization.qll | 2 +- .../cpp/ir/internal/{raw_ir => raw}/TranslatedStmt.qll | 0 cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IR.qll | 7 ------- .../code/cpp/ir/internal/ssa_ir/AliasAnalysisInternal.qll | 1 - cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IR.qll | 7 ------- .../cpp/ir/internal/ssa_ir/SSAConstructionInternal.qll | 3 --- .../code/cpp/ir/internal/ssa_ir/SimpleSSAInternal.qll | 2 -- .../internal/{ssa_ir => unaliased_ssa}/AliasAnalysis.qll | 0 .../ir/internal/unaliased_ssa/AliasAnalysisInternal.qll | 1 + .../ir/internal/{ssa_ir => unaliased_ssa}/FunctionIR.qll | 0 .../src/semmle/code/cpp/ir/internal/unaliased_ssa/IR.qll | 7 +++++++ .../cpp/ir/internal/{ssa_ir => unaliased_ssa}/IRBlock.qll | 2 +- .../{ssa_ir => unaliased_ssa}/IRBlockConstruction.qll | 0 .../ir/internal/{ssa_ir => unaliased_ssa}/IRInternal.qll | 0 .../cpp/ir/internal/{ssa_ir => unaliased_ssa}/IRSanity.ql | 0 .../ir/internal/{ssa_ir => unaliased_ssa}/IRSanity.qll | 0 .../ir/internal/{ssa_ir => unaliased_ssa}/IRVariable.qll | 2 +- .../ir/internal/{ssa_ir => unaliased_ssa}/Instruction.qll | 8 ++++---- .../ir/internal/{ssa_ir => unaliased_ssa}/OperandTag.qll | 0 .../cpp/ir/internal/{ssa_ir => unaliased_ssa}/PrintIR.ql | 0 .../cpp/ir/internal/{ssa_ir => unaliased_ssa}/PrintIR.qll | 0 .../{aliased_ssa_ir => unaliased_ssa}/SSAConstruction.qll | 2 +- .../ir/internal/unaliased_ssa/SSAConstructionInternal.qll | 3 +++ .../ir/internal/{ssa_ir => unaliased_ssa}/SimpleSSA.qll | 0 .../cpp/ir/internal/unaliased_ssa/SimpleSSAInternal.qll | 2 ++ .../test/library-tests/ir/constant_func/constant_func.ql | 2 +- cpp/ql/test/library-tests/ir/ir/RawIRSanity.qlref | 1 - cpp/ql/test/library-tests/ir/ir/SSAIRSanity.qlref | 1 - ...edSSAIRSanity.expected => aliased_ssa_sanity.expected} | 0 ...{AliasedSSAIRSanity.qlref => aliased_ssa_sanity.qlref} | 0 cpp/ql/test/library-tests/ir/ir/raw_ir.qlref | 2 +- .../ir/ir/{RawIRSanity.expected => raw_sanity.expected} | 0 cpp/ql/test/library-tests/ir/ir/raw_sanity.qlref | 1 + cpp/ql/test/library-tests/ir/ir/ssa_ir.qlref | 1 - .../ir/ir/{ssa_ir.expected => unaliased_ssa_ir.expected} | 0 cpp/ql/test/library-tests/ir/ir/unaliased_ssa_ir.qlref | 1 + ...SSAIRSanity.expected => unaliased_ssa_sanity.expected} | 0 .../test/library-tests/ir/ir/unaliased_ssa_sanity.qlref | 1 + 88 files changed, 73 insertions(+), 74 deletions(-) delete mode 100644 cpp/ql/src/semmle/code/cpp/ir/Opcode.qll rename cpp/ql/src/semmle/code/cpp/ir/{ => implementation}/EdgeKind.qll (100%) rename cpp/ql/src/semmle/code/cpp/ir/{ => implementation}/MemoryAccessKind.qll (100%) rename cpp/ql/src/semmle/code/cpp/ir/{internal => implementation}/Opcode.qll (100%) rename cpp/ql/src/semmle/code/cpp/ir/{ => implementation}/TempVariableTag.qll (64%) rename cpp/ql/src/semmle/code/cpp/ir/{ => implementation}/ValueCategory.qll (100%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{aliased_ssa_ir => aliased_ssa}/AliasAnalysis.qll (100%) create mode 100644 cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/AliasAnalysisInternal.qll rename cpp/ql/src/semmle/code/cpp/ir/internal/{aliased_ssa_ir => aliased_ssa}/FunctionIR.qll (100%) create mode 100644 cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/IR.qll rename cpp/ql/src/semmle/code/cpp/ir/internal/{aliased_ssa_ir => aliased_ssa}/IRBlock.qll (97%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{aliased_ssa_ir => aliased_ssa}/IRBlockConstruction.qll (100%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{aliased_ssa_ir => aliased_ssa}/IRInternal.qll (100%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{aliased_ssa_ir => aliased_ssa}/IRSanity.ql (100%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{aliased_ssa_ir => aliased_ssa}/IRSanity.qll (100%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{aliased_ssa_ir => aliased_ssa}/IRVariable.qll (98%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{aliased_ssa_ir => aliased_ssa}/Instruction.qll (99%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{aliased_ssa_ir => aliased_ssa}/OperandTag.qll (100%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{aliased_ssa_ir => aliased_ssa}/PrintIR.ql (100%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{aliased_ssa_ir => aliased_ssa}/PrintIR.qll (100%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{ssa_ir => aliased_ssa}/SSAConstruction.qll (99%) create mode 100644 cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/SSAConstructionInternal.qll rename cpp/ql/src/semmle/code/cpp/ir/internal/{aliased_ssa_ir => aliased_ssa}/SimpleSSA.qll (100%) create mode 100644 cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/SimpleSSAInternal.qll delete mode 100644 cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/AliasAnalysisInternal.qll delete mode 100644 cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IR.qll delete mode 100644 cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/SSAConstructionInternal.qll delete mode 100644 cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/SimpleSSAInternal.qll rename cpp/ql/src/semmle/code/cpp/ir/internal/{raw_ir => raw}/FunctionIR.qll (100%) create mode 100644 cpp/ql/src/semmle/code/cpp/ir/internal/raw/IR.qll rename cpp/ql/src/semmle/code/cpp/ir/internal/{raw_ir => raw}/IRBlock.qll (97%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{raw_ir => raw}/IRBlockConstruction.qll (97%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{raw_ir => raw}/IRConstruction.qll (99%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{raw_ir => raw}/IRInternal.qll (100%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{raw_ir => raw}/IRSanity.ql (100%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{raw_ir => raw}/IRSanity.qll (100%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{raw_ir => raw}/IRVariable.qll (98%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{raw_ir => raw}/Instruction.qll (99%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{raw_ir => raw}/InstructionTag.qll (100%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{raw_ir => raw}/OperandTag.qll (100%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{raw_ir => raw}/PrintIR.ql (100%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{raw_ir => raw}/PrintIR.qll (100%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{raw_ir => raw}/TranslatedCondition.qll (99%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{raw_ir => raw}/TranslatedDeclarationEntry.qll (99%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{raw_ir => raw}/TranslatedElement.qll (99%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{raw_ir => raw}/TranslatedExpr.qll (99%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{raw_ir => raw}/TranslatedFunction.qll (99%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{raw_ir => raw}/TranslatedInitialization.qll (99%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{raw_ir => raw}/TranslatedStmt.qll (100%) delete mode 100644 cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IR.qll delete mode 100644 cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/AliasAnalysisInternal.qll delete mode 100644 cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IR.qll delete mode 100644 cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/SSAConstructionInternal.qll delete mode 100644 cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/SimpleSSAInternal.qll rename cpp/ql/src/semmle/code/cpp/ir/internal/{ssa_ir => unaliased_ssa}/AliasAnalysis.qll (100%) create mode 100644 cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/AliasAnalysisInternal.qll rename cpp/ql/src/semmle/code/cpp/ir/internal/{ssa_ir => unaliased_ssa}/FunctionIR.qll (100%) create mode 100644 cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/IR.qll rename cpp/ql/src/semmle/code/cpp/ir/internal/{ssa_ir => unaliased_ssa}/IRBlock.qll (97%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{ssa_ir => unaliased_ssa}/IRBlockConstruction.qll (100%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{ssa_ir => unaliased_ssa}/IRInternal.qll (100%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{ssa_ir => unaliased_ssa}/IRSanity.ql (100%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{ssa_ir => unaliased_ssa}/IRSanity.qll (100%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{ssa_ir => unaliased_ssa}/IRVariable.qll (98%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{ssa_ir => unaliased_ssa}/Instruction.qll (99%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{ssa_ir => unaliased_ssa}/OperandTag.qll (100%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{ssa_ir => unaliased_ssa}/PrintIR.ql (100%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{ssa_ir => unaliased_ssa}/PrintIR.qll (100%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{aliased_ssa_ir => unaliased_ssa}/SSAConstruction.qll (99%) create mode 100644 cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/SSAConstructionInternal.qll rename cpp/ql/src/semmle/code/cpp/ir/internal/{ssa_ir => unaliased_ssa}/SimpleSSA.qll (100%) create mode 100644 cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/SimpleSSAInternal.qll delete mode 100644 cpp/ql/test/library-tests/ir/ir/RawIRSanity.qlref delete mode 100644 cpp/ql/test/library-tests/ir/ir/SSAIRSanity.qlref rename cpp/ql/test/library-tests/ir/ir/{AliasedSSAIRSanity.expected => aliased_ssa_sanity.expected} (100%) rename cpp/ql/test/library-tests/ir/ir/{AliasedSSAIRSanity.qlref => aliased_ssa_sanity.qlref} (100%) rename cpp/ql/test/library-tests/ir/ir/{RawIRSanity.expected => raw_sanity.expected} (100%) create mode 100644 cpp/ql/test/library-tests/ir/ir/raw_sanity.qlref delete mode 100644 cpp/ql/test/library-tests/ir/ir/ssa_ir.qlref rename cpp/ql/test/library-tests/ir/ir/{ssa_ir.expected => unaliased_ssa_ir.expected} (100%) create mode 100644 cpp/ql/test/library-tests/ir/ir/unaliased_ssa_ir.qlref rename cpp/ql/test/library-tests/ir/ir/{SSAIRSanity.expected => unaliased_ssa_sanity.expected} (100%) create mode 100644 cpp/ql/test/library-tests/ir/ir/unaliased_ssa_sanity.qlref diff --git a/cpp/ql/src/semmle/code/cpp/ir/IR.qll b/cpp/ql/src/semmle/code/cpp/ir/IR.qll index 1544d3b2984..182ca684ddc 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/IR.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/IR.qll @@ -1,3 +1,3 @@ // Most queries should operate on the aliased SSA IR, so that's what we expose // publically as the "IR". -import internal.aliased_ssa_ir.IR +import internal.aliased_ssa.IR diff --git a/cpp/ql/src/semmle/code/cpp/ir/IRSanity.ql b/cpp/ql/src/semmle/code/cpp/ir/IRSanity.ql index 9bd6f87dbfe..aadb849aac4 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/IRSanity.ql +++ b/cpp/ql/src/semmle/code/cpp/ir/IRSanity.ql @@ -5,4 +5,4 @@ * @id cpp/ir-sanity-check */ -import internal.aliased_ssa_ir.IRSanity +import internal.aliased_ssa.IRSanity diff --git a/cpp/ql/src/semmle/code/cpp/ir/Opcode.qll b/cpp/ql/src/semmle/code/cpp/ir/Opcode.qll deleted file mode 100644 index 3798f1d1791..00000000000 --- a/cpp/ql/src/semmle/code/cpp/ir/Opcode.qll +++ /dev/null @@ -1 +0,0 @@ -import internal.Opcode diff --git a/cpp/ql/src/semmle/code/cpp/ir/PrintIR.ql b/cpp/ql/src/semmle/code/cpp/ir/PrintIR.ql index fe894e25ebe..9325a16d671 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/PrintIR.ql +++ b/cpp/ql/src/semmle/code/cpp/ir/PrintIR.ql @@ -5,4 +5,4 @@ * @kind graph */ -import internal.aliased_ssa_ir.PrintIR +import internal.aliased_ssa.PrintIR diff --git a/cpp/ql/src/semmle/code/cpp/ir/EdgeKind.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/EdgeKind.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/EdgeKind.qll rename to cpp/ql/src/semmle/code/cpp/ir/implementation/EdgeKind.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/MemoryAccessKind.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/MemoryAccessKind.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/MemoryAccessKind.qll rename to cpp/ql/src/semmle/code/cpp/ir/implementation/MemoryAccessKind.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/Opcode.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/Opcode.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/Opcode.qll rename to cpp/ql/src/semmle/code/cpp/ir/implementation/Opcode.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/TempVariableTag.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/TempVariableTag.qll similarity index 64% rename from cpp/ql/src/semmle/code/cpp/ir/TempVariableTag.qll rename to cpp/ql/src/semmle/code/cpp/ir/implementation/TempVariableTag.qll index d40c2c9bcfe..d58482902b4 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/TempVariableTag.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/implementation/TempVariableTag.qll @@ -1,5 +1,5 @@ import cpp -private import internal.TempVariableTag +private import semmle.code.cpp.ir.internal.TempVariableTag class TempVariableTag extends TTempVariableTag { string toString() { diff --git a/cpp/ql/src/semmle/code/cpp/ir/ValueCategory.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/ValueCategory.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/ValueCategory.qll rename to cpp/ql/src/semmle/code/cpp/ir/implementation/ValueCategory.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/AliasAnalysis.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/AliasAnalysis.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/AliasAnalysis.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/AliasAnalysis.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/AliasAnalysisInternal.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/AliasAnalysisInternal.qll new file mode 100644 index 00000000000..1d26dd59dfd --- /dev/null +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/AliasAnalysisInternal.qll @@ -0,0 +1 @@ +import semmle.code.cpp.ir.internal.unaliased_ssa.IR as InputIR diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/FunctionIR.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/FunctionIR.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/FunctionIR.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/FunctionIR.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/IR.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/IR.qll new file mode 100644 index 00000000000..26813be359c --- /dev/null +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/IR.qll @@ -0,0 +1,7 @@ +import FunctionIR +import Instruction +import IRBlock +import IRVariable +import OperandTag +import semmle.code.cpp.ir.implementation.EdgeKind +import semmle.code.cpp.ir.implementation.MemoryAccessKind diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRBlock.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/IRBlock.qll similarity index 97% rename from cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRBlock.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/IRBlock.qll index 594e3ddfb38..8ac4d30cf59 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRBlock.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/IRBlock.qll @@ -1,7 +1,7 @@ private import IRInternal private import IRBlockConstruction import Instruction -import semmle.code.cpp.ir.EdgeKind +import semmle.code.cpp.ir.implementation.EdgeKind class IRBlock extends TIRBlock { final string toString() { diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRBlockConstruction.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/IRBlockConstruction.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRBlockConstruction.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/IRBlockConstruction.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRInternal.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/IRInternal.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRInternal.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/IRInternal.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRSanity.ql b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/IRSanity.ql similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRSanity.ql rename to cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/IRSanity.ql diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRSanity.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/IRSanity.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRSanity.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/IRSanity.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRVariable.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/IRVariable.qll similarity index 98% rename from cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRVariable.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/IRVariable.qll index 2eae3dc7c17..00ca0e78bb8 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRVariable.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/IRVariable.qll @@ -1,7 +1,7 @@ private import IRInternal import FunctionIR import cpp -import semmle.code.cpp.ir.TempVariableTag +import semmle.code.cpp.ir.implementation.TempVariableTag private import semmle.code.cpp.ir.internal.TempVariableTag private newtype TIRVariable = diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/Instruction.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/Instruction.qll similarity index 99% rename from cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/Instruction.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/Instruction.qll index 7a3c103ffde..a53c65a462e 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/Instruction.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/Instruction.qll @@ -4,10 +4,10 @@ import IRBlock import IRVariable import OperandTag import cpp -import semmle.code.cpp.ir.EdgeKind -import semmle.code.cpp.ir.MemoryAccessKind -import semmle.code.cpp.ir.Opcode -private import semmle.code.cpp.ir.internal.Opcode +import semmle.code.cpp.ir.implementation.EdgeKind +import semmle.code.cpp.ir.implementation.MemoryAccessKind +import semmle.code.cpp.ir.implementation.Opcode +private import semmle.code.cpp.ir.implementation.Opcode class InstructionTag = Construction::InstructionTagType; diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/OperandTag.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/OperandTag.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/OperandTag.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/OperandTag.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/PrintIR.ql b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/PrintIR.ql similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/PrintIR.ql rename to cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/PrintIR.ql diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/PrintIR.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/PrintIR.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/PrintIR.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/PrintIR.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/SSAConstruction.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/SSAConstruction.qll similarity index 99% rename from cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/SSAConstruction.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/SSAConstruction.qll index e2760489439..ba9294e105c 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/SSAConstruction.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/SSAConstruction.qll @@ -1,6 +1,6 @@ import SSAConstructionInternal import cpp -private import semmle.code.cpp.ir.internal.Opcode +private import semmle.code.cpp.ir.implementation.Opcode import NewIR import Cached diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/SSAConstructionInternal.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/SSAConstructionInternal.qll new file mode 100644 index 00000000000..ed2403326be --- /dev/null +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/SSAConstructionInternal.qll @@ -0,0 +1,3 @@ +import semmle.code.cpp.ir.internal.unaliased_ssa.IR as OldIR +import semmle.code.cpp.ir.internal.aliased_ssa.IR as NewIR +import SimpleSSA as Alias diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/SimpleSSA.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/SimpleSSA.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/SimpleSSA.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/SimpleSSA.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/SimpleSSAInternal.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/SimpleSSAInternal.qll new file mode 100644 index 00000000000..2649f2f3999 --- /dev/null +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa/SimpleSSAInternal.qll @@ -0,0 +1,3 @@ +import AliasAnalysis as Alias +import semmle.code.cpp.ir.internal.unaliased_ssa.IR as InputIR + diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/AliasAnalysisInternal.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/AliasAnalysisInternal.qll deleted file mode 100644 index 96fbeb3e54b..00000000000 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/AliasAnalysisInternal.qll +++ /dev/null @@ -1 +0,0 @@ -import semmle.code.cpp.ir.internal.ssa_ir.IR as InputIR diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IR.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IR.qll deleted file mode 100644 index 97c027cc128..00000000000 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IR.qll +++ /dev/null @@ -1,7 +0,0 @@ -import FunctionIR -import Instruction -import IRBlock -import IRVariable -import OperandTag -import semmle.code.cpp.ir.EdgeKind -import semmle.code.cpp.ir.MemoryAccessKind diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/SSAConstructionInternal.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/SSAConstructionInternal.qll deleted file mode 100644 index 9c81d0c619d..00000000000 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/SSAConstructionInternal.qll +++ /dev/null @@ -1,3 +0,0 @@ -import semmle.code.cpp.ir.internal.ssa_ir.IR as OldIR -import semmle.code.cpp.ir.internal.aliased_ssa_ir.IR as NewIR -import SimpleSSA as Alias diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/SimpleSSAInternal.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/SimpleSSAInternal.qll deleted file mode 100644 index 759ace90fdb..00000000000 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/SimpleSSAInternal.qll +++ /dev/null @@ -1,3 +0,0 @@ -import AliasAnalysis as Alias -import semmle.code.cpp.ir.internal.ssa_ir.IR as InputIR - diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/FunctionIR.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw/FunctionIR.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/FunctionIR.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw/FunctionIR.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/raw/IR.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw/IR.qll new file mode 100644 index 00000000000..26813be359c --- /dev/null +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/raw/IR.qll @@ -0,0 +1,7 @@ +import FunctionIR +import Instruction +import IRBlock +import IRVariable +import OperandTag +import semmle.code.cpp.ir.implementation.EdgeKind +import semmle.code.cpp.ir.implementation.MemoryAccessKind diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRBlock.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw/IRBlock.qll similarity index 97% rename from cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRBlock.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw/IRBlock.qll index 594e3ddfb38..8ac4d30cf59 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRBlock.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/raw/IRBlock.qll @@ -1,7 +1,7 @@ private import IRInternal private import IRBlockConstruction import Instruction -import semmle.code.cpp.ir.EdgeKind +import semmle.code.cpp.ir.implementation.EdgeKind class IRBlock extends TIRBlock { final string toString() { diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRBlockConstruction.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw/IRBlockConstruction.qll similarity index 97% rename from cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRBlockConstruction.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw/IRBlockConstruction.qll index 3356b677098..c3f07869baa 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRBlockConstruction.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/raw/IRBlockConstruction.qll @@ -1,7 +1,7 @@ private import IRInternal import Instruction import cpp -import semmle.code.cpp.ir.EdgeKind +import semmle.code.cpp.ir.implementation.EdgeKind private predicate startsBasicBlock(Instruction instr) { not instr instanceof PhiInstruction and diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRConstruction.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw/IRConstruction.qll similarity index 99% rename from cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRConstruction.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw/IRConstruction.qll index 509568dfef2..f4f9459e31c 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRConstruction.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/raw/IRConstruction.qll @@ -1,5 +1,5 @@ import cpp -import semmle.code.cpp.ir.internal.raw_ir.IR +import semmle.code.cpp.ir.internal.raw.IR private import semmle.code.cpp.ir.internal.TempVariableTag private import InstructionTag private import TranslatedElement diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRInternal.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw/IRInternal.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRInternal.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw/IRInternal.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRSanity.ql b/cpp/ql/src/semmle/code/cpp/ir/internal/raw/IRSanity.ql similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRSanity.ql rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw/IRSanity.ql diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRSanity.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw/IRSanity.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRSanity.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw/IRSanity.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRVariable.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw/IRVariable.qll similarity index 98% rename from cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRVariable.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw/IRVariable.qll index 2eae3dc7c17..00ca0e78bb8 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRVariable.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/raw/IRVariable.qll @@ -1,7 +1,7 @@ private import IRInternal import FunctionIR import cpp -import semmle.code.cpp.ir.TempVariableTag +import semmle.code.cpp.ir.implementation.TempVariableTag private import semmle.code.cpp.ir.internal.TempVariableTag private newtype TIRVariable = diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/Instruction.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw/Instruction.qll similarity index 99% rename from cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/Instruction.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw/Instruction.qll index 7a3c103ffde..a53c65a462e 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/Instruction.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/raw/Instruction.qll @@ -4,10 +4,10 @@ import IRBlock import IRVariable import OperandTag import cpp -import semmle.code.cpp.ir.EdgeKind -import semmle.code.cpp.ir.MemoryAccessKind -import semmle.code.cpp.ir.Opcode -private import semmle.code.cpp.ir.internal.Opcode +import semmle.code.cpp.ir.implementation.EdgeKind +import semmle.code.cpp.ir.implementation.MemoryAccessKind +import semmle.code.cpp.ir.implementation.Opcode +private import semmle.code.cpp.ir.implementation.Opcode class InstructionTag = Construction::InstructionTagType; diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/InstructionTag.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw/InstructionTag.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/InstructionTag.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw/InstructionTag.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/OperandTag.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw/OperandTag.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/OperandTag.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw/OperandTag.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/PrintIR.ql b/cpp/ql/src/semmle/code/cpp/ir/internal/raw/PrintIR.ql similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/PrintIR.ql rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw/PrintIR.ql diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/PrintIR.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw/PrintIR.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/PrintIR.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw/PrintIR.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedCondition.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw/TranslatedCondition.qll similarity index 99% rename from cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedCondition.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw/TranslatedCondition.qll index a47288d3491..9e30772e5a2 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedCondition.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/raw/TranslatedCondition.qll @@ -1,5 +1,5 @@ import cpp -private import semmle.code.cpp.ir.internal.Opcode +private import semmle.code.cpp.ir.implementation.Opcode private import InstructionTag private import TranslatedElement private import TranslatedExpr diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedDeclarationEntry.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw/TranslatedDeclarationEntry.qll similarity index 99% rename from cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedDeclarationEntry.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw/TranslatedDeclarationEntry.qll index d34aaa210a8..a6b60504633 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedDeclarationEntry.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/raw/TranslatedDeclarationEntry.qll @@ -1,5 +1,5 @@ import cpp -private import semmle.code.cpp.ir.internal.Opcode +private import semmle.code.cpp.ir.implementation.Opcode private import InstructionTag private import TranslatedElement private import TranslatedExpr diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedElement.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw/TranslatedElement.qll similarity index 99% rename from cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedElement.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw/TranslatedElement.qll index 49f18da1672..83c0448db44 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedElement.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/raw/TranslatedElement.qll @@ -1,6 +1,6 @@ import cpp -import semmle.code.cpp.ir.internal.raw_ir.IR -private import semmle.code.cpp.ir.internal.Opcode +import semmle.code.cpp.ir.internal.raw.IR +private import semmle.code.cpp.ir.implementation.Opcode private import semmle.code.cpp.ir.internal.TempVariableTag private import InstructionTag private import TranslatedCondition diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedExpr.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw/TranslatedExpr.qll similarity index 99% rename from cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedExpr.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw/TranslatedExpr.qll index 326bd8b01a6..8fc3fd706d0 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedExpr.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/raw/TranslatedExpr.qll @@ -1,5 +1,5 @@ import cpp -private import semmle.code.cpp.ir.internal.Opcode +private import semmle.code.cpp.ir.implementation.Opcode private import semmle.code.cpp.ir.internal.TempVariableTag private import InstructionTag private import TranslatedCondition diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedFunction.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw/TranslatedFunction.qll similarity index 99% rename from cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedFunction.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw/TranslatedFunction.qll index 2a4849c6f97..f73bfe51300 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedFunction.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/raw/TranslatedFunction.qll @@ -1,6 +1,6 @@ import cpp -import semmle.code.cpp.ir.internal.raw_ir.IR -private import semmle.code.cpp.ir.internal.Opcode +import semmle.code.cpp.ir.internal.raw.IR +private import semmle.code.cpp.ir.implementation.Opcode private import semmle.code.cpp.ir.internal.TempVariableTag private import InstructionTag private import TranslatedElement diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedInitialization.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw/TranslatedInitialization.qll similarity index 99% rename from cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedInitialization.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw/TranslatedInitialization.qll index d5ac51b985b..43c5b826e23 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedInitialization.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/raw/TranslatedInitialization.qll @@ -1,5 +1,5 @@ import cpp -private import semmle.code.cpp.ir.internal.Opcode +private import semmle.code.cpp.ir.implementation.Opcode private import InstructionTag private import TranslatedElement private import TranslatedExpr diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedStmt.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw/TranslatedStmt.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedStmt.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw/TranslatedStmt.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IR.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IR.qll deleted file mode 100644 index 97c027cc128..00000000000 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IR.qll +++ /dev/null @@ -1,7 +0,0 @@ -import FunctionIR -import Instruction -import IRBlock -import IRVariable -import OperandTag -import semmle.code.cpp.ir.EdgeKind -import semmle.code.cpp.ir.MemoryAccessKind diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/AliasAnalysisInternal.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/AliasAnalysisInternal.qll deleted file mode 100644 index d46a4ae6b9e..00000000000 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/AliasAnalysisInternal.qll +++ /dev/null @@ -1 +0,0 @@ -import semmle.code.cpp.ir.internal.raw_ir.IR as InputIR diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IR.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IR.qll deleted file mode 100644 index 97c027cc128..00000000000 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IR.qll +++ /dev/null @@ -1,7 +0,0 @@ -import FunctionIR -import Instruction -import IRBlock -import IRVariable -import OperandTag -import semmle.code.cpp.ir.EdgeKind -import semmle.code.cpp.ir.MemoryAccessKind diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/SSAConstructionInternal.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/SSAConstructionInternal.qll deleted file mode 100644 index 611a6084f4b..00000000000 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/SSAConstructionInternal.qll +++ /dev/null @@ -1,3 +0,0 @@ -import semmle.code.cpp.ir.internal.raw_ir.IR as OldIR -import semmle.code.cpp.ir.internal.ssa_ir.IR as NewIR -import SimpleSSA as Alias diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/SimpleSSAInternal.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/SimpleSSAInternal.qll deleted file mode 100644 index 317ef40b7bf..00000000000 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/SimpleSSAInternal.qll +++ /dev/null @@ -1,2 +0,0 @@ -import AliasAnalysis as Alias -import semmle.code.cpp.ir.internal.raw_ir.IR as InputIR diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/AliasAnalysis.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/AliasAnalysis.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/AliasAnalysis.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/AliasAnalysis.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/AliasAnalysisInternal.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/AliasAnalysisInternal.qll new file mode 100644 index 00000000000..1949cedf809 --- /dev/null +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/AliasAnalysisInternal.qll @@ -0,0 +1 @@ +import semmle.code.cpp.ir.internal.raw.IR as InputIR diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/FunctionIR.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/FunctionIR.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/FunctionIR.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/FunctionIR.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/IR.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/IR.qll new file mode 100644 index 00000000000..26813be359c --- /dev/null +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/IR.qll @@ -0,0 +1,7 @@ +import FunctionIR +import Instruction +import IRBlock +import IRVariable +import OperandTag +import semmle.code.cpp.ir.implementation.EdgeKind +import semmle.code.cpp.ir.implementation.MemoryAccessKind diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRBlock.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/IRBlock.qll similarity index 97% rename from cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRBlock.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/IRBlock.qll index 594e3ddfb38..8ac4d30cf59 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRBlock.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/IRBlock.qll @@ -1,7 +1,7 @@ private import IRInternal private import IRBlockConstruction import Instruction -import semmle.code.cpp.ir.EdgeKind +import semmle.code.cpp.ir.implementation.EdgeKind class IRBlock extends TIRBlock { final string toString() { diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRBlockConstruction.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/IRBlockConstruction.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRBlockConstruction.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/IRBlockConstruction.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRInternal.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/IRInternal.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRInternal.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/IRInternal.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRSanity.ql b/cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/IRSanity.ql similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRSanity.ql rename to cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/IRSanity.ql diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRSanity.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/IRSanity.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRSanity.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/IRSanity.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRVariable.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/IRVariable.qll similarity index 98% rename from cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRVariable.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/IRVariable.qll index 2eae3dc7c17..00ca0e78bb8 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRVariable.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/IRVariable.qll @@ -1,7 +1,7 @@ private import IRInternal import FunctionIR import cpp -import semmle.code.cpp.ir.TempVariableTag +import semmle.code.cpp.ir.implementation.TempVariableTag private import semmle.code.cpp.ir.internal.TempVariableTag private newtype TIRVariable = diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/Instruction.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/Instruction.qll similarity index 99% rename from cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/Instruction.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/Instruction.qll index 7a3c103ffde..a53c65a462e 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/Instruction.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/Instruction.qll @@ -4,10 +4,10 @@ import IRBlock import IRVariable import OperandTag import cpp -import semmle.code.cpp.ir.EdgeKind -import semmle.code.cpp.ir.MemoryAccessKind -import semmle.code.cpp.ir.Opcode -private import semmle.code.cpp.ir.internal.Opcode +import semmle.code.cpp.ir.implementation.EdgeKind +import semmle.code.cpp.ir.implementation.MemoryAccessKind +import semmle.code.cpp.ir.implementation.Opcode +private import semmle.code.cpp.ir.implementation.Opcode class InstructionTag = Construction::InstructionTagType; diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/OperandTag.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/OperandTag.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/OperandTag.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/OperandTag.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/PrintIR.ql b/cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/PrintIR.ql similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/PrintIR.ql rename to cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/PrintIR.ql diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/PrintIR.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/PrintIR.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/PrintIR.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/PrintIR.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/SSAConstruction.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/SSAConstruction.qll similarity index 99% rename from cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/SSAConstruction.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/SSAConstruction.qll index e2760489439..ba9294e105c 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/SSAConstruction.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/SSAConstruction.qll @@ -1,6 +1,6 @@ import SSAConstructionInternal import cpp -private import semmle.code.cpp.ir.internal.Opcode +private import semmle.code.cpp.ir.implementation.Opcode import NewIR import Cached diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/SSAConstructionInternal.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/SSAConstructionInternal.qll new file mode 100644 index 00000000000..dca170fb314 --- /dev/null +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/SSAConstructionInternal.qll @@ -0,0 +1,3 @@ +import semmle.code.cpp.ir.internal.raw.IR as OldIR +import semmle.code.cpp.ir.internal.unaliased_ssa.IR as NewIR +import SimpleSSA as Alias diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/SimpleSSA.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/SimpleSSA.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/SimpleSSA.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/SimpleSSA.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/SimpleSSAInternal.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/SimpleSSAInternal.qll new file mode 100644 index 00000000000..69d71fa2073 --- /dev/null +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/unaliased_ssa/SimpleSSAInternal.qll @@ -0,0 +1,2 @@ +import AliasAnalysis as Alias +import semmle.code.cpp.ir.internal.raw.IR as InputIR diff --git a/cpp/ql/test/library-tests/ir/constant_func/constant_func.ql b/cpp/ql/test/library-tests/ir/constant_func/constant_func.ql index a5b4842c612..1cd4a523a3c 100644 --- a/cpp/ql/test/library-tests/ir/constant_func/constant_func.ql +++ b/cpp/ql/test/library-tests/ir/constant_func/constant_func.ql @@ -1,5 +1,5 @@ import default -import semmle.code.cpp.ir.internal.ssa_ir.IR +import semmle.code.cpp.ir.IR import semmle.code.cpp.ir.internal.IntegerConstant language[monotonicAggregates] diff --git a/cpp/ql/test/library-tests/ir/ir/RawIRSanity.qlref b/cpp/ql/test/library-tests/ir/ir/RawIRSanity.qlref deleted file mode 100644 index f4fc90cf1fb..00000000000 --- a/cpp/ql/test/library-tests/ir/ir/RawIRSanity.qlref +++ /dev/null @@ -1 +0,0 @@ -semmle/code/cpp/ir/internal/raw_ir/IRSanity.ql \ No newline at end of file diff --git a/cpp/ql/test/library-tests/ir/ir/SSAIRSanity.qlref b/cpp/ql/test/library-tests/ir/ir/SSAIRSanity.qlref deleted file mode 100644 index 52090868a56..00000000000 --- a/cpp/ql/test/library-tests/ir/ir/SSAIRSanity.qlref +++ /dev/null @@ -1 +0,0 @@ -semmle/code/cpp/ir/internal/ssa_ir/IRSanity.ql \ No newline at end of file diff --git a/cpp/ql/test/library-tests/ir/ir/AliasedSSAIRSanity.expected b/cpp/ql/test/library-tests/ir/ir/aliased_ssa_sanity.expected similarity index 100% rename from cpp/ql/test/library-tests/ir/ir/AliasedSSAIRSanity.expected rename to cpp/ql/test/library-tests/ir/ir/aliased_ssa_sanity.expected diff --git a/cpp/ql/test/library-tests/ir/ir/AliasedSSAIRSanity.qlref b/cpp/ql/test/library-tests/ir/ir/aliased_ssa_sanity.qlref similarity index 100% rename from cpp/ql/test/library-tests/ir/ir/AliasedSSAIRSanity.qlref rename to cpp/ql/test/library-tests/ir/ir/aliased_ssa_sanity.qlref diff --git a/cpp/ql/test/library-tests/ir/ir/raw_ir.qlref b/cpp/ql/test/library-tests/ir/ir/raw_ir.qlref index 8a3ee06305e..8bf1b6a2c4f 100644 --- a/cpp/ql/test/library-tests/ir/ir/raw_ir.qlref +++ b/cpp/ql/test/library-tests/ir/ir/raw_ir.qlref @@ -1 +1 @@ -semmle/code/cpp/ir/internal/raw_ir/PrintIR.ql \ No newline at end of file +semmle/code/cpp/ir/internal/raw/PrintIR.ql \ No newline at end of file diff --git a/cpp/ql/test/library-tests/ir/ir/RawIRSanity.expected b/cpp/ql/test/library-tests/ir/ir/raw_sanity.expected similarity index 100% rename from cpp/ql/test/library-tests/ir/ir/RawIRSanity.expected rename to cpp/ql/test/library-tests/ir/ir/raw_sanity.expected diff --git a/cpp/ql/test/library-tests/ir/ir/raw_sanity.qlref b/cpp/ql/test/library-tests/ir/ir/raw_sanity.qlref new file mode 100644 index 00000000000..abcf565564b --- /dev/null +++ b/cpp/ql/test/library-tests/ir/ir/raw_sanity.qlref @@ -0,0 +1 @@ +semmle/code/cpp/ir/internal/raw/IRSanity.ql \ No newline at end of file diff --git a/cpp/ql/test/library-tests/ir/ir/ssa_ir.qlref b/cpp/ql/test/library-tests/ir/ir/ssa_ir.qlref deleted file mode 100644 index cd34217420f..00000000000 --- a/cpp/ql/test/library-tests/ir/ir/ssa_ir.qlref +++ /dev/null @@ -1 +0,0 @@ -semmle/code/cpp/ir/internal/ssa_ir/PrintIR.ql \ No newline at end of file diff --git a/cpp/ql/test/library-tests/ir/ir/ssa_ir.expected b/cpp/ql/test/library-tests/ir/ir/unaliased_ssa_ir.expected similarity index 100% rename from cpp/ql/test/library-tests/ir/ir/ssa_ir.expected rename to cpp/ql/test/library-tests/ir/ir/unaliased_ssa_ir.expected diff --git a/cpp/ql/test/library-tests/ir/ir/unaliased_ssa_ir.qlref b/cpp/ql/test/library-tests/ir/ir/unaliased_ssa_ir.qlref new file mode 100644 index 00000000000..88ed25cdec6 --- /dev/null +++ b/cpp/ql/test/library-tests/ir/ir/unaliased_ssa_ir.qlref @@ -0,0 +1 @@ +semmle/code/cpp/ir/internal/unaliased_ssa/PrintIR.ql \ No newline at end of file diff --git a/cpp/ql/test/library-tests/ir/ir/SSAIRSanity.expected b/cpp/ql/test/library-tests/ir/ir/unaliased_ssa_sanity.expected similarity index 100% rename from cpp/ql/test/library-tests/ir/ir/SSAIRSanity.expected rename to cpp/ql/test/library-tests/ir/ir/unaliased_ssa_sanity.expected diff --git a/cpp/ql/test/library-tests/ir/ir/unaliased_ssa_sanity.qlref b/cpp/ql/test/library-tests/ir/ir/unaliased_ssa_sanity.qlref new file mode 100644 index 00000000000..c6ddef9470d --- /dev/null +++ b/cpp/ql/test/library-tests/ir/ir/unaliased_ssa_sanity.qlref @@ -0,0 +1 @@ +semmle/code/cpp/ir/internal/unaliased_ssa/IRSanity.ql \ No newline at end of file