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.

Author: dave-bartolomeo

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"
     ]
 }

cpp/ql/src/semmle/code/cpp/ir/AliasedSSAIR.qll

@@ -0,0 +1 @@
+import internal.aliased_ssa_ir.IRImpl

…emmle/code/cpp/ssa/AliasedSSAIRSanity.ql …semmle/code/cpp/ir/AliasedSSAIRSanity.qlcpp/ql/src/semmle/code/cpp/ssa/AliasedSSAIRSanity.ql renamed to cpp/ql/src/semmle/code/cpp/ir/AliasedSSAIRSanity.ql cpp/ql/src/semmle/code/cpp/ssa/AliasedSSAIRSanity.ql renamed to 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

cpp/ql/src/semmle/code/cpp/ir/IR.qll

@@ -1 +1 @@
-import internal.IRImpl
+import internal.raw_ir.IRImpl

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

…semmle/code/cpp/ssa/PrintAliasedSSAIR.ql …/semmle/code/cpp/ir/PrintAliasedSSAIR.qlcpp/ql/src/semmle/code/cpp/ssa/PrintAliasedSSAIR.ql renamed to cpp/ql/src/semmle/code/cpp/ir/PrintAliasedSSAIR.ql cpp/ql/src/semmle/code/cpp/ssa/PrintAliasedSSAIR.ql renamed to cpp/ql/src/semmle/code/cpp/ir/PrintAliasedSSAIR.ql

@@ -0,0 +1 @@
+import internal.aliased_ssa_ir.PrintIRImpl

cpp/ql/src/semmle/code/cpp/ir/PrintAliasedSSAIR.qll

@@ -1 +1 @@
-import internal.PrintIRImpl
+import internal.raw_ir.PrintIRImpl

cpp/ql/src/semmle/code/cpp/ir/PrintIR.qll

@@ -0,0 +1 @@
+import internal.ssa_ir.PrintIRImpl