Merge rc/1.18 into next.

cpp/ql/src/Critical/MemoryMayNotBeFreed.ql

@@ -62,8 +62,14 @@ predicate verifiedRealloc(FunctionCall reallocCall, Variable v, ControlFlowNode
       // a realloc followed by a null check at 'node' (return the non-null
       // successor, i.e. where the realloc is confirmed to have succeeded)
       newV.getAnAssignedValue() = reallocCall and
-      node.(AnalysedExpr).getNonNullSuccessor(newV) = verified
+      node.(AnalysedExpr).getNonNullSuccessor(newV) = verified and
       // note: this case uses naive flow logic (getAnAssignedValue).
+
+      // special case: if the result of the 'realloc' is assigned to the
+      // same variable, we don't descriminate properly between the old
+      // and the new allocation; better to not consider this a free at
+      // all in that case.
+      newV != v
     ) or (
       // a realloc(ptr, 0), which always succeeds and frees
       // (return the realloc itself)

cpp/ql/src/semmle/code/cpp/Class.qll

@@ -566,7 +566,7 @@ class Class extends UserType {
    * The alignment of this type in bytes (on the machine where facts were
    * extracted).
    */
-  int getAlignment() { usertypesize(underlyingElement(this),_,result) }
+  override int getAlignment() { usertypesize(underlyingElement(this),_,result) }
 
   /**
    * Holds if this class is constructed from another class as a result of

cpp/ql/src/semmle/code/cpp/File.qll

@@ -162,7 +162,7 @@ abstract class Container extends Locatable, @container {
    *
    * This is the absolute path of the container.
    */
-  string toString() {
+  override string toString() {
     result = getAbsolutePath()
   }
 }

cpp/ql/src/semmle/code/cpp/controlflow/internal/PrimitiveBasicBlocks.qll

@@ -43,15 +43,28 @@ private cached module Cached {
     (not successors_extended(_, node) and successors_extended(node, _))
   }
 
+  /** Holds if `n2` follows `n1` in a `PrimitiveBasicBlock`. */
+  private predicate member_step(Node n1, Node n2) {
+    successors_extended(n1, n2) and
+    not n2 instanceof PrimitiveBasicBlock
+  }
+
+  /** Returns the index of `node` in its `PrimitiveBasicBlock`. */
+  private int getMemberIndex(Node node) {
+    primitive_basic_block_entry_node(node) and
+    result = 0
+    or
+    exists(Node prev |
+      member_step(prev, node) and
+      result = getMemberIndex(prev) + 1
+    )
+  }
+
   /** Holds if `node` is the `pos`th control-flow node in primitive basic block `bb`. */
   cached
   predicate primitive_basic_block_member(Node node, PrimitiveBasicBlock bb, int pos) {
-    (node = bb and pos = 0)
-    or
-    (not (node instanceof PrimitiveBasicBlock) and
-     exists (Node pred
-     | successors_extended(pred, node)
-     | primitive_basic_block_member(pred, bb, pos - 1)))
+    pos = getMemberIndex(node) and
+    member_step*(bb, node)
   }
 
   /** Gets the number of control-flow nodes in the primitive basic block `bb`. */

cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowPrivate.qll

@@ -128,6 +128,7 @@ predicate readStep(Node node1, Content f, Node node2) {
  * numeric conversions, and otherwise the erasure is used.
  */
 RefType getErasedRepr(Type t) {
+  suppressUnusedType(t) and
   result instanceof VoidType // stub implementation
 }
 
@@ -140,6 +141,8 @@ predicate compatibleTypes(Type t1, Type t2) {
   any() // stub implementation
 }
 
+private predicate suppressUnusedType(Type t) { any() }
+
 //////////////////////////////////////////////////////////////////////////////
 // Java QL library compatibility wrappers
 //////////////////////////////////////////////////////////////////////////////

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

@@ -1 +1,3 @@
-import internal.IRImpl
+// Most queries should operate on the aliased SSA IR, so that's what we expose
+// publically as the "IR".
+import implementation.aliased_ssa.IR

cpp/ql/src/semmle/code/cpp/ir/IRSanity.ql

@@ -5,4 +5,4 @@
  * @id cpp/ir-sanity-check
  */
 
-import internal.IRSanityImpl
+import implementation.aliased_ssa.IRSanity

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

@@ -1 +0,0 @@
-import internal.Opcode

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

@@ -5,4 +5,4 @@
  * @kind graph
  */
 
-import PrintIR
+import implementation.aliased_ssa.PrintIR

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

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

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

cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/FunctionIR.qll

@@ -1,4 +1,4 @@
-private import IRInternal
+private import internal.IRInternal
 import Instruction
 import cpp
 

cpp/ql/src/semmle/code/cpp/ir/implementation/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

cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/IRBlock.qll

@@ -1,7 +1,7 @@
-private import IRInternal
-private import IRBlockConstruction
+private import internal.IRInternal
 import Instruction
-import semmle.code.cpp.ir.EdgeKind
+import semmle.code.cpp.ir.implementation.EdgeKind
+private import Construction::BlockConstruction
 
 class IRBlock extends TIRBlock {
   final string toString() {

cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/IRSanity.ql

@@ -5,4 +5,4 @@
  * @id cpp/aliased-ssa-ir-sanity-check
  */
 
-import internal.aliased_ssa.IRSanityImpl
+import IRSanity

cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/IRSanity.qll

@@ -1,3 +1,3 @@
-private import IRImpl
+private import IR
 import InstructionSanity
 

cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/IRVariable.qll

@@ -1,7 +1,7 @@
-private import IRInternal
+private import internal.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 =

cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/Instruction.qll

@@ -1,13 +1,13 @@
-private import IRInternal
+private import internal.IRInternal
 import FunctionIR
 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;
 

cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/OperandTag.qll

@@ -1,4 +1,4 @@
-private import IRInternal
+private import internal.IRInternal
 import Instruction
 import IRBlock
 import cpp

cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/PrintIR.ql

@@ -5,4 +5,4 @@
  * @kind graph
  */
 
-import PrintAliasedSSAIR
+import PrintIR

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

@@ -1,4 +1,4 @@
-private import IRImpl
+private import IR
 import cpp
 
 private newtype TPrintableIRNode =
@@ -83,7 +83,7 @@ class PrintableFunctionIR extends PrintableIRNode, TPrintableFunctionIR {
   override int getOrder() {
     this = rank[result + 1](PrintableFunctionIR orderedFunc, Location location |
       location = orderedFunc.getFunctionIR().getLocation() |
-      orderedFunc order by location.getFile().getURL(), location.getStartLine(),
+      orderedFunc order by location.getFile().getAbsolutePath(), location.getStartLine(),
         location.getStartColumn(), orderedFunc.getLabel()
     )
   }

cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/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 InputIR
+private import semmle.code.cpp.ir.internal.IntegerConstant as Ints
 
 private class IntValue = Ints::IntValue;
 

cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasAnalysisInternal.qll

@@ -0,0 +1 @@
+import semmle.code.cpp.ir.implementation.unaliased_ssa.IR as InputIR

cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/IRBlockConstruction.qll

@@ -1,6 +1,6 @@
-private import IRInternal
-private import Construction::OldIR as OldIR
-import Instruction
+import SSAConstructionInternal
+private import SSAConstruction as Construction
+private import NewIR
 
 import Cached
 private cached module Cached {

cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConstruction.qll

@@ -1,7 +1,8 @@
 import SSAConstructionInternal
 import cpp
-private import semmle.code.cpp.ir.internal.Opcode
+private import semmle.code.cpp.ir.implementation.Opcode
 import NewIR
+import IRBlockConstruction as BlockConstruction
 
 import Cached
 cached private module Cached {

cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConstructionInternal.qll

@@ -0,0 +1,3 @@
+import semmle.code.cpp.ir.implementation.unaliased_ssa.IR as OldIR
+import semmle.code.cpp.ir.implementation.aliased_ssa.IR as NewIR
+import SimpleSSA as Alias

cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SimpleSSA.qll

@@ -1,8 +1,8 @@
 import SimpleSSAInternal
 import cpp
 import Alias
-import IR
-import semmle.code.cpp.ssa.internal.Overlap
+private import InputIR
+import semmle.code.cpp.ir.internal.Overlap
 
 private newtype TVirtualVariable =
   MkVirtualVariable(IRVariable var) {

cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SimpleSSAInternal.qll

@@ -0,0 +1,3 @@
+import AliasAnalysis as Alias
+import semmle.code.cpp.ir.implementation.unaliased_ssa.IR as InputIR
+

cpp/ql/src/semmle/code/cpp/ir/implementation/raw/FunctionIR.qll

@@ -1,4 +1,4 @@
-private import IRInternal
+private import internal.IRInternal
 import Instruction
 import cpp
 

cpp/ql/src/semmle/code/cpp/ir/implementation/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

cpp/ql/src/semmle/code/cpp/ir/implementation/raw/IRBlock.qll

@@ -1,7 +1,7 @@
-private import IRInternal
-private import IRBlockConstruction
+private import internal.IRInternal
 import Instruction
-import semmle.code.cpp.ir.EdgeKind
+import semmle.code.cpp.ir.implementation.EdgeKind
+private import Construction::BlockConstruction
 
 class IRBlock extends TIRBlock {
   final string toString() {

cpp/ql/src/semmle/code/cpp/ir/implementation/raw/IRSanity.ql

@@ -0,0 +1,8 @@
+/**
+ * @name Raw IR Sanity Check
+ * @description Performs sanity checks on the Intermediate Representation. This query should have no results. 
+ * @kind problem
+ * @id cpp/raw-ir-sanity-check
+ */
+
+import IRSanity

cpp/ql/src/semmle/code/cpp/ir/implementation/raw/IRSanity.qll

@@ -1,3 +1,3 @@
-private import IRImpl
+private import IR
 import InstructionSanity
 

cpp/ql/src/semmle/code/cpp/ir/implementation/raw/IRVariable.qll

@@ -1,7 +1,7 @@
-private import IRInternal
+private import internal.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 =

cpp/ql/src/semmle/code/cpp/ir/implementation/raw/Instruction.qll

@@ -1,13 +1,13 @@
-private import IRInternal
+private import internal.IRInternal
 import FunctionIR
 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;
 

cpp/ql/src/semmle/code/cpp/ir/implementation/raw/OperandTag.qll

@@ -1,4 +1,4 @@
-private import IRInternal
+private import internal.IRInternal
 import Instruction
 import IRBlock
 import cpp

cpp/ql/src/semmle/code/cpp/ir/implementation/raw/PrintIR.ql

@@ -0,0 +1,8 @@
+/**
+ * @name Print Raw IR
+ * @description Outputs a representation of the Raw IR graph
+ * @id cpp/print-raw-ir
+ * @kind graph
+ */
+
+import PrintIR

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

@@ -1,4 +1,4 @@
-private import IRImpl
+private import IR
 import cpp
 
 private newtype TPrintableIRNode =
@@ -83,7 +83,7 @@ class PrintableFunctionIR extends PrintableIRNode, TPrintableFunctionIR {
   override int getOrder() {
     this = rank[result + 1](PrintableFunctionIR orderedFunc, Location location |
       location = orderedFunc.getFunctionIR().getLocation() |
-      orderedFunc order by location.getFile().getURL(), location.getStartLine(),
+      orderedFunc order by location.getFile().getAbsolutePath(), location.getStartLine(),
         location.getStartColumn(), orderedFunc.getLabel()
     )
   }

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

@@ -1,7 +1,6 @@
-private import IRInternal
-import Instruction
+import semmle.code.cpp.ir.implementation.raw.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

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

@@ -1,7 +1,8 @@
 import cpp
-import semmle.code.cpp.ir.IR
+import semmle.code.cpp.ir.implementation.raw.IR
+import IRBlockConstruction as BlockConstruction
+private import semmle.code.cpp.ir.internal.TempVariableTag
 private import InstructionTag
-private import TempVariableTag
 private import TranslatedElement
 private import TranslatedFunction
 

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

@@ -1,6 +1,6 @@
 import cpp
+private import semmle.code.cpp.ir.implementation.Opcode
 private import InstructionTag
-private import Opcode
 private import TranslatedElement
 private import TranslatedExpr
 

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

@@ -1,6 +1,6 @@
 import cpp
+private import semmle.code.cpp.ir.implementation.Opcode
 private import InstructionTag
-private import Opcode
 private import TranslatedElement
 private import TranslatedExpr
 private import TranslatedInitialization

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

@@ -1,8 +1,8 @@
 import cpp
-import semmle.code.cpp.ir.IR
+import semmle.code.cpp.ir.implementation.raw.IR
+private import semmle.code.cpp.ir.implementation.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

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

@@ -1,7 +1,7 @@
 import cpp
+private import semmle.code.cpp.ir.implementation.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

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

@@ -1,8 +1,8 @@
 import cpp
-import semmle.code.cpp.ir.IR
+import semmle.code.cpp.ir.implementation.raw.IR
+private import semmle.code.cpp.ir.implementation.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

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

@@ -1,6 +1,6 @@
 import cpp
+private import semmle.code.cpp.ir.implementation.Opcode
 private import InstructionTag
-private import Opcode
 private import TranslatedElement
 private import TranslatedExpr
 private import TranslatedFunction

cpp/ql/src/semmle/code/cpp/ir/implementation/raw/internal/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

cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/FunctionIR.qll

@@ -1,4 +1,4 @@
-private import IRInternal
+private import internal.IRInternal
 import Instruction
 import cpp
 

cpp/ql/src/semmle/code/cpp/ir/implementation/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

cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/IRBlock.qll

@@ -1,7 +1,7 @@
-private import IRInternal
-private import IRBlockConstruction
+private import internal.IRInternal
 import Instruction
-import semmle.code.cpp.ir.EdgeKind
+import semmle.code.cpp.ir.implementation.EdgeKind
+private import Construction::BlockConstruction
 
 class IRBlock extends TIRBlock {
   final string toString() {

cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/IRSanity.ql

@@ -5,4 +5,4 @@
  * @id cpp/ssa-ir-sanity-check
  */
 
-import internal.ssa.IRSanityImpl
+import IRSanity

cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/IRSanity.qll

@@ -1,3 +1,3 @@
-private import IRImpl
+private import IR
 import InstructionSanity
 

cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/IRVariable.qll

@@ -1,7 +1,7 @@
-private import IRInternal
+private import internal.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 =

cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/Instruction.qll

@@ -1,13 +1,13 @@
-private import IRInternal
+private import internal.IRInternal
 import FunctionIR
 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;
 

cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/OperandTag.qll

@@ -1,4 +1,4 @@
-private import IRInternal
+private import internal.IRInternal
 import Instruction
 import IRBlock
 import cpp

cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/PrintIR.ql

@@ -5,4 +5,4 @@
  * @kind graph
  */
 
-import PrintSSAIR
+import PrintIR

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

@@ -1,4 +1,4 @@
-private import IRImpl
+private import IR
 import cpp
 
 private newtype TPrintableIRNode =
@@ -83,7 +83,7 @@ class PrintableFunctionIR extends PrintableIRNode, TPrintableFunctionIR {
   override int getOrder() {
     this = rank[result + 1](PrintableFunctionIR orderedFunc, Location location |
       location = orderedFunc.getFunctionIR().getLocation() |
-      orderedFunc order by location.getFile().getURL(), location.getStartLine(),
+      orderedFunc order by location.getFile().getAbsolutePath(), location.getStartLine(),
         location.getStartColumn(), orderedFunc.getLabel()
     )
   }

cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/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 InputIR
+private import semmle.code.cpp.ir.internal.IntegerConstant as Ints
 
 private class IntValue = Ints::IntValue;
 

cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/AliasAnalysisInternal.qll

@@ -0,0 +1 @@
+import semmle.code.cpp.ir.implementation.raw.IR as InputIR

cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/IRBlockConstruction.qll

@@ -1,6 +1,6 @@
-private import IRInternal
-private import Construction::OldIR as OldIR
-import Instruction
+import SSAConstructionInternal
+private import SSAConstruction as Construction
+private import NewIR
 
 import Cached
 private cached module Cached {

cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll

@@ -1,7 +1,8 @@
 import SSAConstructionInternal
 import cpp
-private import semmle.code.cpp.ir.internal.Opcode
+private import semmle.code.cpp.ir.implementation.Opcode
 import NewIR
+import IRBlockConstruction as BlockConstruction
 
 import Cached
 cached private module Cached {

cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConstructionInternal.qll

@@ -0,0 +1,3 @@
+import semmle.code.cpp.ir.implementation.raw.IR as OldIR
+import semmle.code.cpp.ir.implementation.unaliased_ssa.IR as NewIR
+import SimpleSSA as Alias

cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SimpleSSA.qll

@@ -1,8 +1,8 @@
 import SimpleSSAInternal
 import cpp
 import Alias
-import IR
-import semmle.code.cpp.ssa.internal.Overlap
+private import InputIR
+import semmle.code.cpp.ir.internal.Overlap
 
 private newtype TVirtualVariable =
   MkVirtualVariable(IRVariable var) {

cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SimpleSSAInternal.qll

@@ -0,0 +1,2 @@
+import AliasAnalysis as Alias
+import semmle.code.cpp.ir.implementation.raw.IR as InputIR

cpp/ql/src/semmle/code/cpp/ir/internal/IRImpl.qll

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

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

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

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

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

cpp/ql/src/semmle/code/cpp/ssa/PrintSSAIR.qll

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

cpp/ql/src/semmle/code/cpp/ssa/SSAIR.qll

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

cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/AliasAnalysisInternal.qll

@@ -1 +0,0 @@
-import semmle.code.cpp.ssa.SSAIR as IR

cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/IRImpl.qll

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

cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/SSAConstructionInternal.qll

@@ -1,3 +0,0 @@
-import semmle.code.cpp.ssa.SSAIR as OldIR
-import semmle.code.cpp.ssa.AliasedSSAIR as NewIR
-import SimpleSSA as Alias

cpp/ql/src/semmle/code/cpp/ssa/internal/aliased_ssa/SimpleSSAInternal.qll

@@ -1,3 +0,0 @@
-import AliasAnalysis as Alias
-import semmle.code.cpp.ssa.SSAIR as IR
-

cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/AliasAnalysisInternal.qll

@@ -1 +0,0 @@
-import semmle.code.cpp.ir.IR as IR

cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/IRImpl.qll

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

cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/SSAConstructionInternal.qll

@@ -1,3 +0,0 @@
-import semmle.code.cpp.ir.IR as OldIR
-import semmle.code.cpp.ssa.SSAIR as NewIR
-import SimpleSSA as Alias

cpp/ql/src/semmle/code/cpp/ssa/internal/ssa/SimpleSSAInternal.qll

@@ -1,3 +0,0 @@
-import AliasAnalysis as Alias
-import semmle.code.cpp.ir.IR as IR
-

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.IR
+import semmle.code.cpp.ir.internal.IntegerConstant
 
 language[monotonicAggregates]
 IntValue getConstantValue(Instruction instr) {

cpp/ql/test/library-tests/ir/constants/constants.ql

@@ -1,5 +1,5 @@
 import cpp
-import semmle.code.cpp.ssa.internal.IntegerConstant as Ints
+import semmle.code.cpp.ir.internal.IntegerConstant as Ints
 
 bindingset[n]
 string resultString(int n) {

cpp/ql/test/library-tests/ir/escape/escape.ql

@@ -1,6 +1,6 @@
 import default
-import semmle.code.cpp.ssa.internal.ssa.AliasAnalysis
-import semmle.code.cpp.ir.IR
+import semmle.code.cpp.ir.implementation.unaliased_ssa.internal.AliasAnalysis
+import semmle.code.cpp.ir.implementation.raw.IR
 
 predicate shouldEscape(IRAutomaticUserVariable var) {
   exists(string name |

cpp/ql/test/library-tests/ir/escape/points_to.ql

@@ -1,6 +1,6 @@
 import default
-import semmle.code.cpp.ssa.internal.ssa.AliasAnalysis
-import semmle.code.cpp.ir.IR
+import semmle.code.cpp.ir.implementation.unaliased_ssa.internal.AliasAnalysis
+import semmle.code.cpp.ir.implementation.raw.IR
 
 from Instruction instr, string pointsTo
 where

cpp/ql/test/library-tests/ir/escape/ssa_escape.ql

@@ -1,6 +1,6 @@
 import default
-import semmle.code.cpp.ssa.internal.aliased_ssa.AliasAnalysis
-import semmle.code.cpp.ssa.SSAIR
+import semmle.code.cpp.ir.implementation.aliased_ssa.internal.AliasAnalysis
+import semmle.code.cpp.ir.implementation.unaliased_ssa.IR
 
 predicate shouldEscape(IRAutomaticUserVariable var) {
   exists(string name |

cpp/ql/test/library-tests/ir/ir/AliasedSSAIRSanity.qlref

@@ -1 +0,0 @@
-semmle/code/cpp/ssa/AliasedSSAIRSanity.ql

cpp/ql/test/library-tests/ir/ir/SSAIRSanity.qlref

@@ -1 +0,0 @@
-semmle/code/cpp/ssa/SSAIRSanity.ql