From aacee8fecf59e67bf7863ee1b35217f427a648f3 Mon Sep 17 00:00:00 2001 From: Dave Bartolomeo Date: Thu, 30 Aug 2018 09:52:49 -0700 Subject: [PATCH] C++: Reshuffle IR files into a consistent directory structure There are no real code changes here, other than to fix up `import`s. All tests still hae the same output, as expected. A future commit will hide the IR flavors other than the one we want queries to use directly. --- config/identical-files.json | 64 +++++++++---------- .../src/semmle/code/cpp/ir/AliasedSSAIR.qll | 1 + .../cpp/{ssa => ir}/AliasedSSAIRSanity.ql | 2 +- cpp/ql/src/semmle/code/cpp/ir/IR.qll | 2 +- cpp/ql/src/semmle/code/cpp/ir/IRSanity.ql | 2 +- .../code/cpp/{ssa => ir}/PrintAliasedSSAIR.ql | 0 .../semmle/code/cpp/ir/PrintAliasedSSAIR.qll | 1 + cpp/ql/src/semmle/code/cpp/ir/PrintIR.qll | 2 +- .../semmle/code/cpp/{ssa => ir}/PrintSSAIR.ql | 0 cpp/ql/src/semmle/code/cpp/ir/PrintSSAIR.qll | 1 + cpp/ql/src/semmle/code/cpp/ir/SSAIR.qll | 1 + .../code/cpp/{ssa => ir}/SSAIRSanity.ql | 2 +- .../{ssa => ir}/internal/IntegerConstant.qll | 0 .../code/cpp/{ssa => ir}/internal/Overlap.qll | 0 .../aliased_ssa_ir}/AliasAnalysis.qll | 2 +- .../aliased_ssa_ir/AliasAnalysisInternal.qll | 1 + .../{ => aliased_ssa_ir}/FunctionIR.qll | 0 .../internal/{ => aliased_ssa_ir}/IRBlock.qll | 0 .../aliased_ssa_ir}/IRBlockConstruction.qll | 0 .../internal/{ => aliased_ssa_ir}/IRImpl.qll | 0 .../internal/aliased_ssa_ir}/IRInternal.qll | 0 .../{ => aliased_ssa_ir}/IRSanityImpl.qll | 0 .../{ => aliased_ssa_ir}/IRVariable.qll | 0 .../{ => aliased_ssa_ir}/Instruction.qll | 0 .../{ => aliased_ssa_ir}/OperandTag.qll | 0 .../{ => aliased_ssa_ir}/PrintIRImpl.qll | 0 .../aliased_ssa_ir}/SSAConstruction.qll | 0 .../SSAConstructionInternal.qll | 3 + .../internal/aliased_ssa_ir}/SimpleSSA.qll | 2 +- .../aliased_ssa_ir/SimpleSSAInternal.qll | 3 + .../internal/raw_ir}/FunctionIR.qll | 0 .../internal/raw_ir}/IRBlock.qll | 0 .../{ => raw_ir}/IRBlockConstruction.qll | 0 .../internal/{ => raw_ir}/IRConstruction.qll | 4 +- .../internal/raw_ir}/IRImpl.qll | 0 .../ir/internal/{ => raw_ir}/IRInternal.qll | 0 .../internal/raw_ir}/IRSanityImpl.qll | 0 .../internal/raw_ir}/IRVariable.qll | 0 .../internal/raw_ir}/Instruction.qll | 0 .../internal/{ => raw_ir}/InstructionTag.qll | 0 .../internal/raw_ir}/OperandTag.qll | 0 .../internal/raw_ir}/PrintIRImpl.qll | 0 .../{ => raw_ir}/TranslatedCondition.qll | 2 +- .../TranslatedDeclarationEntry.qll | 2 +- .../{ => raw_ir}/TranslatedElement.qll | 6 +- .../internal/{ => raw_ir}/TranslatedExpr.qll | 4 +- .../{ => raw_ir}/TranslatedFunction.qll | 6 +- .../{ => raw_ir}/TranslatedInitialization.qll | 2 +- .../internal/{ => raw_ir}/TranslatedStmt.qll | 2 +- .../internal/ssa_ir}/AliasAnalysis.qll | 2 +- .../internal/ssa_ir/AliasAnalysisInternal.qll | 1 + .../ssa => ir/internal/ssa_ir}/FunctionIR.qll | 0 .../ssa => ir/internal/ssa_ir}/IRBlock.qll | 0 .../internal/ssa_ir}/IRBlockConstruction.qll | 0 .../ssa => ir/internal/ssa_ir}/IRImpl.qll | 0 .../ssa => ir/internal/ssa_ir}/IRInternal.qll | 0 .../internal/ssa_ir}/IRSanityImpl.qll | 0 .../ssa => ir/internal/ssa_ir}/IRVariable.qll | 0 .../internal/ssa_ir}/Instruction.qll | 0 .../ssa => ir/internal/ssa_ir}/OperandTag.qll | 0 .../internal/ssa_ir}/PrintIRImpl.qll | 0 .../internal/ssa_ir}/SSAConstruction.qll | 0 .../ssa_ir/SSAConstructionInternal.qll | 3 + .../ssa => ir/internal/ssa_ir}/SimpleSSA.qll | 2 +- .../ir/internal/ssa_ir/SimpleSSAInternal.qll | 3 + .../src/semmle/code/cpp/ssa/AliasedSSAIR.qll | 1 - .../semmle/code/cpp/ssa/PrintAliasedSSAIR.qll | 1 - cpp/ql/src/semmle/code/cpp/ssa/PrintSSAIR.qll | 1 - cpp/ql/src/semmle/code/cpp/ssa/SSAIR.qll | 1 - .../aliased_ssa/AliasAnalysisInternal.qll | 1 - .../aliased_ssa/SSAConstructionInternal.qll | 3 - .../aliased_ssa/SimpleSSAInternal.qll | 3 - .../internal/ssa/AliasAnalysisInternal.qll | 1 - .../internal/ssa/SSAConstructionInternal.qll | 3 - .../ssa/internal/ssa/SimpleSSAInternal.qll | 3 - .../ir/constant_func/constant_func.ql | 4 +- .../ir/ir/AliasedSSAIRSanity.qlref | 2 +- .../library-tests/ir/ir/SSAIRSanity.qlref | 2 +- .../library-tests/ir/ir/aliased_ssa_ir.qlref | 2 +- .../library-tests/ir/ir/ssa_block_count.ql | 2 +- cpp/ql/test/library-tests/ir/ir/ssa_ir.qlref | 2 +- 81 files changed, 80 insertions(+), 80 deletions(-) create mode 100644 cpp/ql/src/semmle/code/cpp/ir/AliasedSSAIR.qll rename cpp/ql/src/semmle/code/cpp/{ssa => ir}/AliasedSSAIRSanity.ql (82%) rename cpp/ql/src/semmle/code/cpp/{ssa => ir}/PrintAliasedSSAIR.ql (100%) create mode 100644 cpp/ql/src/semmle/code/cpp/ir/PrintAliasedSSAIR.qll rename cpp/ql/src/semmle/code/cpp/{ssa => ir}/PrintSSAIR.ql (100%) create mode 100644 cpp/ql/src/semmle/code/cpp/ir/PrintSSAIR.qll create mode 100644 cpp/ql/src/semmle/code/cpp/ir/SSAIR.qll rename cpp/ql/src/semmle/code/cpp/{ssa => ir}/SSAIRSanity.ql (84%) rename cpp/ql/src/semmle/code/cpp/{ssa => ir}/internal/IntegerConstant.qll (100%) rename cpp/ql/src/semmle/code/cpp/{ssa => ir}/internal/Overlap.qll (100%) rename cpp/ql/src/semmle/code/cpp/{ssa/internal/aliased_ssa => ir/internal/aliased_ssa_ir}/AliasAnalysis.qll (99%) create mode 100644 cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/AliasAnalysisInternal.qll rename cpp/ql/src/semmle/code/cpp/ir/internal/{ => aliased_ssa_ir}/FunctionIR.qll (100%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{ => aliased_ssa_ir}/IRBlock.qll (100%) rename cpp/ql/src/semmle/code/cpp/{ssa/internal/aliased_ssa => ir/internal/aliased_ssa_ir}/IRBlockConstruction.qll (100%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{ => aliased_ssa_ir}/IRImpl.qll (100%) rename cpp/ql/src/semmle/code/cpp/{ssa/internal/aliased_ssa => ir/internal/aliased_ssa_ir}/IRInternal.qll (100%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{ => aliased_ssa_ir}/IRSanityImpl.qll (100%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{ => aliased_ssa_ir}/IRVariable.qll (100%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{ => aliased_ssa_ir}/Instruction.qll (100%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{ => aliased_ssa_ir}/OperandTag.qll (100%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{ => aliased_ssa_ir}/PrintIRImpl.qll (100%) rename cpp/ql/src/semmle/code/cpp/{ssa/internal/aliased_ssa => ir/internal/aliased_ssa_ir}/SSAConstruction.qll (100%) create mode 100644 cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/SSAConstructionInternal.qll rename cpp/ql/src/semmle/code/cpp/{ssa/internal/aliased_ssa => ir/internal/aliased_ssa_ir}/SimpleSSA.qll (97%) create mode 100644 cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/SimpleSSAInternal.qll rename cpp/ql/src/semmle/code/cpp/{ssa/internal/aliased_ssa => ir/internal/raw_ir}/FunctionIR.qll (100%) rename cpp/ql/src/semmle/code/cpp/{ssa/internal/aliased_ssa => ir/internal/raw_ir}/IRBlock.qll (100%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{ => raw_ir}/IRBlockConstruction.qll (100%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{ => raw_ir}/IRConstruction.qll (97%) rename cpp/ql/src/semmle/code/cpp/{ssa/internal/aliased_ssa => ir/internal/raw_ir}/IRImpl.qll (100%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{ => raw_ir}/IRInternal.qll (100%) rename cpp/ql/src/semmle/code/cpp/{ssa/internal/aliased_ssa => ir/internal/raw_ir}/IRSanityImpl.qll (100%) rename cpp/ql/src/semmle/code/cpp/{ssa/internal/aliased_ssa => ir/internal/raw_ir}/IRVariable.qll (100%) rename cpp/ql/src/semmle/code/cpp/{ssa/internal/aliased_ssa => ir/internal/raw_ir}/Instruction.qll (100%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{ => raw_ir}/InstructionTag.qll (100%) rename cpp/ql/src/semmle/code/cpp/{ssa/internal/aliased_ssa => ir/internal/raw_ir}/OperandTag.qll (100%) rename cpp/ql/src/semmle/code/cpp/{ssa/internal/aliased_ssa => ir/internal/raw_ir}/PrintIRImpl.qll (100%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{ => raw_ir}/TranslatedCondition.qll (99%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{ => raw_ir}/TranslatedDeclarationEntry.qll (99%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{ => raw_ir}/TranslatedElement.qll (99%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{ => raw_ir}/TranslatedExpr.qll (99%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{ => raw_ir}/TranslatedFunction.qll (98%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{ => raw_ir}/TranslatedInitialization.qll (99%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{ => raw_ir}/TranslatedStmt.qll (99%) rename cpp/ql/src/semmle/code/cpp/{ssa/internal/ssa => ir/internal/ssa_ir}/AliasAnalysis.qll (99%) create mode 100644 cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/AliasAnalysisInternal.qll rename cpp/ql/src/semmle/code/cpp/{ssa/internal/ssa => ir/internal/ssa_ir}/FunctionIR.qll (100%) rename cpp/ql/src/semmle/code/cpp/{ssa/internal/ssa => ir/internal/ssa_ir}/IRBlock.qll (100%) rename cpp/ql/src/semmle/code/cpp/{ssa/internal/ssa => ir/internal/ssa_ir}/IRBlockConstruction.qll (100%) rename cpp/ql/src/semmle/code/cpp/{ssa/internal/ssa => ir/internal/ssa_ir}/IRImpl.qll (100%) rename cpp/ql/src/semmle/code/cpp/{ssa/internal/ssa => ir/internal/ssa_ir}/IRInternal.qll (100%) rename cpp/ql/src/semmle/code/cpp/{ssa/internal/ssa => ir/internal/ssa_ir}/IRSanityImpl.qll (100%) rename cpp/ql/src/semmle/code/cpp/{ssa/internal/ssa => ir/internal/ssa_ir}/IRVariable.qll (100%) rename cpp/ql/src/semmle/code/cpp/{ssa/internal/ssa => ir/internal/ssa_ir}/Instruction.qll (100%) rename cpp/ql/src/semmle/code/cpp/{ssa/internal/ssa => ir/internal/ssa_ir}/OperandTag.qll (100%) rename cpp/ql/src/semmle/code/cpp/{ssa/internal/ssa => ir/internal/ssa_ir}/PrintIRImpl.qll (100%) rename cpp/ql/src/semmle/code/cpp/{ssa/internal/ssa => ir/internal/ssa_ir}/SSAConstruction.qll (100%) create mode 100644 cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/SSAConstructionInternal.qll rename cpp/ql/src/semmle/code/cpp/{ssa/internal/ssa => ir/internal/ssa_ir}/SimpleSSA.qll (97%) create mode 100644 cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/SimpleSSAInternal.qll delete mode 100644 cpp/ql/src/semmle/code/cpp/ssa/AliasedSSAIR.qll delete mode 100644 cpp/ql/src/semmle/code/cpp/ssa/PrintAliasedSSAIR.qll delete mode 100644 cpp/ql/src/semmle/code/cpp/ssa/PrintSSAIR.qll delete mode 100644 cpp/ql/src/semmle/code/cpp/ssa/SSAIR.qll delete mode 100644 cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/AliasAnalysisInternal.qll delete mode 100644 cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/SSAConstructionInternal.qll delete mode 100644 cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/SimpleSSAInternal.qll delete mode 100644 cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/AliasAnalysisInternal.qll delete mode 100644 cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/SSAConstructionInternal.qll delete mode 100644 cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/SimpleSSAInternal.qll diff --git a/config/identical-files.json b/config/identical-files.json index 52383e16efe..1c222eb63f9 100644 --- a/config/identical-files.json +++ b/config/identical-files.json @@ -1,58 +1,58 @@ { "C++ IR Instruction": [ - "cpp/ql/src/semmle/code/cpp/ir/internal/Instruction.qll", - "cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/Instruction.qll", - "cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/Instruction.qll" + "cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/Instruction.qll", + "cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/Instruction.qll", + "cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/Instruction.qll" ], "C++ IR IRBlock": [ - "cpp/ql/src/semmle/code/cpp/ir/internal/IRBlock.qll", - "cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/IRBlock.qll", - "cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/IRBlock.qll" + "cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRBlock.qll", + "cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRBlock.qll", + "cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRBlock.qll" ], "C++ IR IRVariable": [ - "cpp/ql/src/semmle/code/cpp/ir/internal/IRVariable.qll", - "cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/IRVariable.qll", - "cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/IRVariable.qll" + "cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRVariable.qll", + "cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRVariable.qll", + "cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRVariable.qll" ], "C++ IR FunctionIR": [ - "cpp/ql/src/semmle/code/cpp/ir/internal/FunctionIR.qll", - "cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/FunctionIR.qll", - "cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/FunctionIR.qll" + "cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/FunctionIR.qll", + "cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/FunctionIR.qll", + "cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/FunctionIR.qll" ], "C++ IR OperandTag": [ - "cpp/ql/src/semmle/code/cpp/ir/internal/OperandTag.qll", - "cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/OperandTag.qll", - "cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/OperandTag.qll" + "cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/OperandTag.qll", + "cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/OperandTag.qll", + "cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/OperandTag.qll" ], "C++ IR IRImpl": [ - "cpp/ql/src/semmle/code/cpp/ir/internal/IRImpl.qll", - "cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/IRImpl.qll", - "cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/IRImpl.qll" + "cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRImpl.qll", + "cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRImpl.qll", + "cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRImpl.qll" ], "C++ IR IRSanityImpl": [ - "cpp/ql/src/semmle/code/cpp/ir/internal/IRSanityImpl.qll", - "cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/IRSanityImpl.qll", - "cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/IRSanityImpl.qll" + "cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRSanityImpl.qll", + "cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRSanityImpl.qll", + "cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRSanityImpl.qll" ], "C++ IR PrintIRImpl": [ - "cpp/ql/src/semmle/code/cpp/ir/internal/PrintIRImpl.qll", - "cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/PrintIRImpl.qll", - "cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/PrintIRImpl.qll" + "cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/PrintIRImpl.qll", + "cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/PrintIRImpl.qll", + "cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/PrintIRImpl.qll" ], "C++ SSA AliasAnalysis": [ - "cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/AliasAnalysis.qll", - "cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/AliasAnalysis.qll" + "cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/AliasAnalysis.qll", + "cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/AliasAnalysis.qll" ], "C++ SSA SimpleSSA": [ - "cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/SimpleSSA.qll", - "cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/SimpleSSA.qll" + "cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/SimpleSSA.qll", + "cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/SimpleSSA.qll" ], "C++ SSA IRBlockConstruction": [ - "cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/IRBlockConstruction.qll", - "cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/IRBlockConstruction.qll" + "cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRBlockConstruction.qll", + "cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRBlockConstruction.qll" ], "C++ SSA SSAConstruction": [ - "cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/SSAConstruction.qll", - "cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/SSAConstruction.qll" + "cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/SSAConstruction.qll", + "cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/SSAConstruction.qll" ] } diff --git a/cpp/ql/src/semmle/code/cpp/ir/AliasedSSAIR.qll b/cpp/ql/src/semmle/code/cpp/ir/AliasedSSAIR.qll new file mode 100644 index 00000000000..cf2ae8943a4 --- /dev/null +++ b/cpp/ql/src/semmle/code/cpp/ir/AliasedSSAIR.qll @@ -0,0 +1 @@ +import internal.aliased_ssa_ir.IRImpl diff --git a/cpp/ql/src/semmle/code/cpp/ssa/AliasedSSAIRSanity.ql b/cpp/ql/src/semmle/code/cpp/ir/AliasedSSAIRSanity.ql similarity index 82% rename from cpp/ql/src/semmle/code/cpp/ssa/AliasedSSAIRSanity.ql rename to cpp/ql/src/semmle/code/cpp/ir/AliasedSSAIRSanity.ql index ee0e94374c6..1db8bc52403 100644 --- a/cpp/ql/src/semmle/code/cpp/ssa/AliasedSSAIRSanity.ql +++ b/cpp/ql/src/semmle/code/cpp/ir/AliasedSSAIRSanity.ql @@ -5,4 +5,4 @@ * @id cpp/aliased-ssa-ir-sanity-check */ -import internal.aliased_ssa.IRSanityImpl +import internal.aliased_ssa_ir.IRSanityImpl diff --git a/cpp/ql/src/semmle/code/cpp/ir/IR.qll b/cpp/ql/src/semmle/code/cpp/ir/IR.qll index 45c72e0dbb1..787eaa14f21 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/IR.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/IR.qll @@ -1 +1 @@ -import internal.IRImpl +import internal.raw_ir.IRImpl diff --git a/cpp/ql/src/semmle/code/cpp/ir/IRSanity.ql b/cpp/ql/src/semmle/code/cpp/ir/IRSanity.ql index 151470849fd..35123e4ab9a 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.IRSanityImpl +import internal.raw_ir.IRSanityImpl diff --git a/cpp/ql/src/semmle/code/cpp/ssa/PrintAliasedSSAIR.ql b/cpp/ql/src/semmle/code/cpp/ir/PrintAliasedSSAIR.ql similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ssa/PrintAliasedSSAIR.ql rename to cpp/ql/src/semmle/code/cpp/ir/PrintAliasedSSAIR.ql diff --git a/cpp/ql/src/semmle/code/cpp/ir/PrintAliasedSSAIR.qll b/cpp/ql/src/semmle/code/cpp/ir/PrintAliasedSSAIR.qll new file mode 100644 index 00000000000..b3d9c0a1679 --- /dev/null +++ b/cpp/ql/src/semmle/code/cpp/ir/PrintAliasedSSAIR.qll @@ -0,0 +1 @@ +import internal.aliased_ssa_ir.PrintIRImpl diff --git a/cpp/ql/src/semmle/code/cpp/ir/PrintIR.qll b/cpp/ql/src/semmle/code/cpp/ir/PrintIR.qll index 2c4bf124a52..e814c753e5a 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/PrintIR.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/PrintIR.qll @@ -1 +1 @@ -import internal.PrintIRImpl +import internal.raw_ir.PrintIRImpl diff --git a/cpp/ql/src/semmle/code/cpp/ssa/PrintSSAIR.ql b/cpp/ql/src/semmle/code/cpp/ir/PrintSSAIR.ql similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ssa/PrintSSAIR.ql rename to cpp/ql/src/semmle/code/cpp/ir/PrintSSAIR.ql diff --git a/cpp/ql/src/semmle/code/cpp/ir/PrintSSAIR.qll b/cpp/ql/src/semmle/code/cpp/ir/PrintSSAIR.qll new file mode 100644 index 00000000000..dea6d135103 --- /dev/null +++ b/cpp/ql/src/semmle/code/cpp/ir/PrintSSAIR.qll @@ -0,0 +1 @@ +import internal.ssa_ir.PrintIRImpl diff --git a/cpp/ql/src/semmle/code/cpp/ir/SSAIR.qll b/cpp/ql/src/semmle/code/cpp/ir/SSAIR.qll new file mode 100644 index 00000000000..860ce7dc958 --- /dev/null +++ b/cpp/ql/src/semmle/code/cpp/ir/SSAIR.qll @@ -0,0 +1 @@ +import internal.ssa_ir.IRImpl diff --git a/cpp/ql/src/semmle/code/cpp/ssa/SSAIRSanity.ql b/cpp/ql/src/semmle/code/cpp/ir/SSAIRSanity.ql similarity index 84% rename from cpp/ql/src/semmle/code/cpp/ssa/SSAIRSanity.ql rename to cpp/ql/src/semmle/code/cpp/ir/SSAIRSanity.ql index 4f1ed9a9261..ea84b916ba7 100644 --- a/cpp/ql/src/semmle/code/cpp/ssa/SSAIRSanity.ql +++ b/cpp/ql/src/semmle/code/cpp/ir/SSAIRSanity.ql @@ -5,4 +5,4 @@ * @id cpp/ssa-ir-sanity-check */ -import internal.ssa.IRSanityImpl +import internal.ssa_ir.IRSanityImpl diff --git a/cpp/ql/src/semmle/code/cpp/ssa/internal/IntegerConstant.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/IntegerConstant.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ssa/internal/IntegerConstant.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/IntegerConstant.qll diff --git a/cpp/ql/src/semmle/code/cpp/ssa/internal/Overlap.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/Overlap.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ssa/internal/Overlap.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/Overlap.qll diff --git a/cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/AliasAnalysis.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/AliasAnalysis.qll similarity index 99% rename from cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/AliasAnalysis.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/AliasAnalysis.qll index 6d40ee0f66b..56137d54179 100644 --- a/cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/AliasAnalysis.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/AliasAnalysis.qll @@ -1,7 +1,7 @@ private import AliasAnalysisInternal import cpp private import IR -private import semmle.code.cpp.ssa.internal.IntegerConstant as Ints +private import semmle.code.cpp.ir.internal.IntegerConstant as Ints private class IntValue = Ints::IntValue; 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 new file mode 100644 index 00000000000..e050fe4a1df --- /dev/null +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/AliasAnalysisInternal.qll @@ -0,0 +1 @@ +import semmle.code.cpp.ir.internal.ssa_ir.IRImpl as IR diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/FunctionIR.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/FunctionIR.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/FunctionIR.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/FunctionIR.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/IRBlock.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRBlock.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/IRBlock.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRBlock.qll diff --git a/cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/IRBlockConstruction.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRBlockConstruction.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/IRBlockConstruction.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRBlockConstruction.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/IRImpl.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRImpl.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/IRImpl.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRImpl.qll diff --git a/cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/IRInternal.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRInternal.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/IRInternal.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRInternal.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/IRSanityImpl.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRSanityImpl.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/IRSanityImpl.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRSanityImpl.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/IRVariable.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRVariable.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/IRVariable.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRVariable.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/Instruction.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/Instruction.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/Instruction.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/Instruction.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/OperandTag.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/OperandTag.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/OperandTag.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/OperandTag.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/PrintIRImpl.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/PrintIRImpl.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/PrintIRImpl.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/PrintIRImpl.qll diff --git a/cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/SSAConstruction.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/SSAConstruction.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/SSAConstruction.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/SSAConstruction.qll 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 new file mode 100644 index 00000000000..fedfc0cca88 --- /dev/null +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/SSAConstructionInternal.qll @@ -0,0 +1,3 @@ +import semmle.code.cpp.ir.internal.ssa_ir.IRImpl as OldIR +import semmle.code.cpp.ir.internal.aliased_ssa_ir.IRImpl as NewIR +import SimpleSSA as Alias diff --git a/cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/SimpleSSA.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/SimpleSSA.qll similarity index 97% rename from cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/SimpleSSA.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/SimpleSSA.qll index 7f1fe39b4b2..48160719c4c 100644 --- a/cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/SimpleSSA.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/SimpleSSA.qll @@ -2,7 +2,7 @@ import SimpleSSAInternal import cpp import Alias import IR -import semmle.code.cpp.ssa.internal.Overlap +import semmle.code.cpp.ir.internal.Overlap private newtype TVirtualVariable = MkVirtualVariable(IRVariable var) { 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 new file mode 100644 index 00000000000..237e051f234 --- /dev/null +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/SimpleSSAInternal.qll @@ -0,0 +1,3 @@ +import AliasAnalysis as Alias +import semmle.code.cpp.ir.internal.ssa_ir.IRImpl as IR + diff --git a/cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/FunctionIR.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/FunctionIR.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/FunctionIR.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/FunctionIR.qll diff --git a/cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/IRBlock.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRBlock.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/IRBlock.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRBlock.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/IRBlockConstruction.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRBlockConstruction.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/IRBlockConstruction.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRBlockConstruction.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/IRConstruction.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRConstruction.qll similarity index 97% rename from cpp/ql/src/semmle/code/cpp/ir/internal/IRConstruction.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRConstruction.qll index 3552c984957..034365c9c76 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/IRConstruction.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRConstruction.qll @@ -1,7 +1,7 @@ import cpp -import semmle.code.cpp.ir.IR +import semmle.code.cpp.ir.internal.raw_ir.IRImpl +private import semmle.code.cpp.ir.internal.TempVariableTag private import InstructionTag -private import TempVariableTag private import TranslatedElement private import TranslatedFunction diff --git a/cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/IRImpl.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRImpl.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/IRImpl.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRImpl.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/IRInternal.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRInternal.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/IRInternal.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRInternal.qll diff --git a/cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/IRSanityImpl.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRSanityImpl.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/IRSanityImpl.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRSanityImpl.qll diff --git a/cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/IRVariable.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRVariable.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/IRVariable.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRVariable.qll diff --git a/cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/Instruction.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/Instruction.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/Instruction.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/Instruction.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/InstructionTag.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/InstructionTag.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/InstructionTag.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/InstructionTag.qll diff --git a/cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/OperandTag.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/OperandTag.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/OperandTag.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/OperandTag.qll diff --git a/cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/PrintIRImpl.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/PrintIRImpl.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/PrintIRImpl.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/PrintIRImpl.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/TranslatedCondition.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedCondition.qll similarity index 99% rename from cpp/ql/src/semmle/code/cpp/ir/internal/TranslatedCondition.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedCondition.qll index a8597e114fd..a47288d3491 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/TranslatedCondition.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedCondition.qll @@ -1,6 +1,6 @@ import cpp +private import semmle.code.cpp.ir.internal.Opcode private import InstructionTag -private import Opcode private import TranslatedElement private import TranslatedExpr diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/TranslatedDeclarationEntry.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedDeclarationEntry.qll similarity index 99% rename from cpp/ql/src/semmle/code/cpp/ir/internal/TranslatedDeclarationEntry.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedDeclarationEntry.qll index 917290df884..d34aaa210a8 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/TranslatedDeclarationEntry.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedDeclarationEntry.qll @@ -1,6 +1,6 @@ import cpp +private import semmle.code.cpp.ir.internal.Opcode private import InstructionTag -private import Opcode private import TranslatedElement private import TranslatedExpr private import TranslatedInitialization diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/TranslatedElement.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedElement.qll similarity index 99% rename from cpp/ql/src/semmle/code/cpp/ir/internal/TranslatedElement.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedElement.qll index c4639f13fb1..a77bc20151f 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/TranslatedElement.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedElement.qll @@ -1,8 +1,8 @@ import cpp -import semmle.code.cpp.ir.IR +import semmle.code.cpp.ir.internal.raw_ir.IRImpl +private import semmle.code.cpp.ir.internal.Opcode +private import semmle.code.cpp.ir.internal.TempVariableTag private import InstructionTag -private import Opcode -private import TempVariableTag private import TranslatedCondition private import TranslatedFunction private import TranslatedStmt diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/TranslatedExpr.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedExpr.qll similarity index 99% rename from cpp/ql/src/semmle/code/cpp/ir/internal/TranslatedExpr.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedExpr.qll index 088eb2ca5e8..326bd8b01a6 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/TranslatedExpr.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedExpr.qll @@ -1,7 +1,7 @@ import cpp +private import semmle.code.cpp.ir.internal.Opcode +private import semmle.code.cpp.ir.internal.TempVariableTag private import InstructionTag -private import Opcode -private import TempVariableTag private import TranslatedCondition private import TranslatedElement private import TranslatedFunction diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/TranslatedFunction.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedFunction.qll similarity index 98% rename from cpp/ql/src/semmle/code/cpp/ir/internal/TranslatedFunction.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedFunction.qll index 68d46b400a4..0fb3678316b 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/TranslatedFunction.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedFunction.qll @@ -1,8 +1,8 @@ import cpp -import semmle.code.cpp.ir.IR +import semmle.code.cpp.ir.internal.raw_ir.IRImpl +private import semmle.code.cpp.ir.internal.Opcode +private import semmle.code.cpp.ir.internal.TempVariableTag private import InstructionTag -private import Opcode -private import TempVariableTag private import TranslatedElement private import TranslatedExpr private import TranslatedInitialization diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/TranslatedInitialization.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedInitialization.qll similarity index 99% rename from cpp/ql/src/semmle/code/cpp/ir/internal/TranslatedInitialization.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedInitialization.qll index 6bdee89458e..d5ac51b985b 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/TranslatedInitialization.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedInitialization.qll @@ -1,6 +1,6 @@ import cpp +private import semmle.code.cpp.ir.internal.Opcode private import InstructionTag -private import Opcode private import TranslatedElement private import TranslatedExpr private import TranslatedFunction diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/TranslatedStmt.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedStmt.qll similarity index 99% rename from cpp/ql/src/semmle/code/cpp/ir/internal/TranslatedStmt.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedStmt.qll index 37b2c61d8fc..81d6ac541ab 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/TranslatedStmt.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedStmt.qll @@ -1,6 +1,6 @@ import cpp +private import semmle.code.cpp.ir.internal.TempVariableTag private import InstructionTag -private import Opcode private import TranslatedCondition private import TranslatedDeclarationEntry private import TranslatedElement diff --git a/cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/AliasAnalysis.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/AliasAnalysis.qll similarity index 99% rename from cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/AliasAnalysis.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/AliasAnalysis.qll index 6d40ee0f66b..56137d54179 100644 --- a/cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/AliasAnalysis.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/AliasAnalysis.qll @@ -1,7 +1,7 @@ private import AliasAnalysisInternal import cpp private import IR -private import semmle.code.cpp.ssa.internal.IntegerConstant as Ints +private import semmle.code.cpp.ir.internal.IntegerConstant as Ints private class IntValue = Ints::IntValue; 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 new file mode 100644 index 00000000000..e21b68fa276 --- /dev/null +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/AliasAnalysisInternal.qll @@ -0,0 +1 @@ +import semmle.code.cpp.ir.internal.raw_ir.IRImpl as IR diff --git a/cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/FunctionIR.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/FunctionIR.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/FunctionIR.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/FunctionIR.qll diff --git a/cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/IRBlock.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRBlock.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/IRBlock.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRBlock.qll diff --git a/cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/IRBlockConstruction.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRBlockConstruction.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/IRBlockConstruction.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRBlockConstruction.qll diff --git a/cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/IRImpl.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRImpl.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/IRImpl.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRImpl.qll diff --git a/cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/IRInternal.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRInternal.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/IRInternal.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRInternal.qll diff --git a/cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/IRSanityImpl.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRSanityImpl.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/IRSanityImpl.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRSanityImpl.qll diff --git a/cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/IRVariable.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRVariable.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/IRVariable.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRVariable.qll diff --git a/cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/Instruction.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/Instruction.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/Instruction.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/Instruction.qll diff --git a/cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/OperandTag.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/OperandTag.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/OperandTag.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/OperandTag.qll diff --git a/cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/PrintIRImpl.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/PrintIRImpl.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/PrintIRImpl.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/PrintIRImpl.qll diff --git a/cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/SSAConstruction.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/SSAConstruction.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/SSAConstruction.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/SSAConstruction.qll 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 new file mode 100644 index 00000000000..f0827218fc3 --- /dev/null +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/SSAConstructionInternal.qll @@ -0,0 +1,3 @@ +import semmle.code.cpp.ir.internal.raw_ir.IRImpl as OldIR +import semmle.code.cpp.ir.internal.ssa_ir.IRImpl as NewIR +import SimpleSSA as Alias diff --git a/cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/SimpleSSA.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/SimpleSSA.qll similarity index 97% rename from cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/SimpleSSA.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/SimpleSSA.qll index 7f1fe39b4b2..48160719c4c 100644 --- a/cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/SimpleSSA.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/SimpleSSA.qll @@ -2,7 +2,7 @@ import SimpleSSAInternal import cpp import Alias import IR -import semmle.code.cpp.ssa.internal.Overlap +import semmle.code.cpp.ir.internal.Overlap private newtype TVirtualVariable = MkVirtualVariable(IRVariable var) { 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 new file mode 100644 index 00000000000..c60a521506c --- /dev/null +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/SimpleSSAInternal.qll @@ -0,0 +1,3 @@ +import AliasAnalysis as Alias +import semmle.code.cpp.ir.internal.raw_ir.IRImpl as IR + diff --git a/cpp/ql/src/semmle/code/cpp/ssa/AliasedSSAIR.qll b/cpp/ql/src/semmle/code/cpp/ssa/AliasedSSAIR.qll deleted file mode 100644 index 8aee096b06e..00000000000 --- a/cpp/ql/src/semmle/code/cpp/ssa/AliasedSSAIR.qll +++ /dev/null @@ -1 +0,0 @@ -import internal.aliased_ssa.IRImpl diff --git a/cpp/ql/src/semmle/code/cpp/ssa/PrintAliasedSSAIR.qll b/cpp/ql/src/semmle/code/cpp/ssa/PrintAliasedSSAIR.qll deleted file mode 100644 index 0bd6b346d6d..00000000000 --- a/cpp/ql/src/semmle/code/cpp/ssa/PrintAliasedSSAIR.qll +++ /dev/null @@ -1 +0,0 @@ -import internal.aliased_ssa.PrintIRImpl diff --git a/cpp/ql/src/semmle/code/cpp/ssa/PrintSSAIR.qll b/cpp/ql/src/semmle/code/cpp/ssa/PrintSSAIR.qll deleted file mode 100644 index a7a019299f2..00000000000 --- a/cpp/ql/src/semmle/code/cpp/ssa/PrintSSAIR.qll +++ /dev/null @@ -1 +0,0 @@ -import internal.ssa.PrintIRImpl diff --git a/cpp/ql/src/semmle/code/cpp/ssa/SSAIR.qll b/cpp/ql/src/semmle/code/cpp/ssa/SSAIR.qll deleted file mode 100644 index 477c25b1a35..00000000000 --- a/cpp/ql/src/semmle/code/cpp/ssa/SSAIR.qll +++ /dev/null @@ -1 +0,0 @@ -import internal.ssa.IRImpl diff --git a/cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/AliasAnalysisInternal.qll b/cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/AliasAnalysisInternal.qll deleted file mode 100644 index 02e8979ae8e..00000000000 --- a/cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/AliasAnalysisInternal.qll +++ /dev/null @@ -1 +0,0 @@ -import semmle.code.cpp.ssa.SSAIR as IR diff --git a/cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/SSAConstructionInternal.qll b/cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/SSAConstructionInternal.qll deleted file mode 100644 index 7ceb3b2572d..00000000000 --- a/cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/SSAConstructionInternal.qll +++ /dev/null @@ -1,3 +0,0 @@ -import semmle.code.cpp.ssa.SSAIR as OldIR -import semmle.code.cpp.ssa.AliasedSSAIR as NewIR -import SimpleSSA as Alias diff --git a/cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/SimpleSSAInternal.qll b/cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/SimpleSSAInternal.qll deleted file mode 100644 index 48651bf3978..00000000000 --- a/cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/SimpleSSAInternal.qll +++ /dev/null @@ -1,3 +0,0 @@ -import AliasAnalysis as Alias -import semmle.code.cpp.ssa.SSAIR as IR - diff --git a/cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/AliasAnalysisInternal.qll b/cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/AliasAnalysisInternal.qll deleted file mode 100644 index b6bb6445150..00000000000 --- a/cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/AliasAnalysisInternal.qll +++ /dev/null @@ -1 +0,0 @@ -import semmle.code.cpp.ir.IR as IR diff --git a/cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/SSAConstructionInternal.qll b/cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/SSAConstructionInternal.qll deleted file mode 100644 index 84ab4e1ae53..00000000000 --- a/cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/SSAConstructionInternal.qll +++ /dev/null @@ -1,3 +0,0 @@ -import semmle.code.cpp.ir.IR as OldIR -import semmle.code.cpp.ssa.SSAIR as NewIR -import SimpleSSA as Alias diff --git a/cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/SimpleSSAInternal.qll b/cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/SimpleSSAInternal.qll deleted file mode 100644 index bb12750f197..00000000000 --- a/cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/SimpleSSAInternal.qll +++ /dev/null @@ -1,3 +0,0 @@ -import AliasAnalysis as Alias -import semmle.code.cpp.ir.IR as IR - 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 238873c4575..b15e1fd6bc1 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,6 +1,6 @@ import default -import semmle.code.cpp.ssa.SSAIR -import semmle.code.cpp.ssa.internal.IntegerConstant +import semmle.code.cpp.ir.SSAIR +import semmle.code.cpp.ir.internal.IntegerConstant language[monotonicAggregates] IntValue getConstantValue(Instruction instr) { diff --git a/cpp/ql/test/library-tests/ir/ir/AliasedSSAIRSanity.qlref b/cpp/ql/test/library-tests/ir/ir/AliasedSSAIRSanity.qlref index 607a5e6bc1f..69bc424d696 100644 --- a/cpp/ql/test/library-tests/ir/ir/AliasedSSAIRSanity.qlref +++ b/cpp/ql/test/library-tests/ir/ir/AliasedSSAIRSanity.qlref @@ -1 +1 @@ -semmle/code/cpp/ssa/AliasedSSAIRSanity.ql \ No newline at end of file +semmle/code/cpp/ir/AliasedSSAIRSanity.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 index 7150a050efb..9bdd6daa23e 100644 --- a/cpp/ql/test/library-tests/ir/ir/SSAIRSanity.qlref +++ b/cpp/ql/test/library-tests/ir/ir/SSAIRSanity.qlref @@ -1 +1 @@ -semmle/code/cpp/ssa/SSAIRSanity.ql \ No newline at end of file +semmle/code/cpp/ir/SSAIRSanity.ql \ No newline at end of file diff --git a/cpp/ql/test/library-tests/ir/ir/aliased_ssa_ir.qlref b/cpp/ql/test/library-tests/ir/ir/aliased_ssa_ir.qlref index 3ca5faacfda..9f4d3f50ce5 100644 --- a/cpp/ql/test/library-tests/ir/ir/aliased_ssa_ir.qlref +++ b/cpp/ql/test/library-tests/ir/ir/aliased_ssa_ir.qlref @@ -1 +1 @@ -semmle/code/cpp/ssa/PrintAliasedSSAIR.ql \ No newline at end of file +semmle/code/cpp/ir/PrintAliasedSSAIR.ql \ No newline at end of file diff --git a/cpp/ql/test/library-tests/ir/ir/ssa_block_count.ql b/cpp/ql/test/library-tests/ir/ir/ssa_block_count.ql index 909e5c2adce..67b8e96191a 100644 --- a/cpp/ql/test/library-tests/ir/ir/ssa_block_count.ql +++ b/cpp/ql/test/library-tests/ir/ir/ssa_block_count.ql @@ -1,5 +1,5 @@ import default -import semmle.code.cpp.ssa.SSAIR +import semmle.code.cpp.ir.SSAIR from FunctionIR funcIR select funcIR.toString(), count(funcIR.getABlock()) diff --git a/cpp/ql/test/library-tests/ir/ir/ssa_ir.qlref b/cpp/ql/test/library-tests/ir/ir/ssa_ir.qlref index cdfe9652bb1..864dbebd9fa 100644 --- a/cpp/ql/test/library-tests/ir/ir/ssa_ir.qlref +++ b/cpp/ql/test/library-tests/ir/ir/ssa_ir.qlref @@ -1 +1 @@ -semmle/code/cpp/ssa/PrintSSAIR.ql \ No newline at end of file +semmle/code/cpp/ir/PrintSSAIR.ql \ No newline at end of file