Merge pull request #3666 from hvitved/csharp/ir-experimental

C#: Move IR code into 'experimental' folder

config/identical-files.json

@@ -53,114 +53,114 @@
     "cpp/ql/src/semmle/code/cpp/ir/implementation/raw/Instruction.qll",
     "cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/Instruction.qll",
     "cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/Instruction.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/raw/Instruction.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/Instruction.qll"
+    "csharp/ql/src/experimental/ir/implementation/raw/Instruction.qll",
+    "csharp/ql/src/experimental/ir/implementation/unaliased_ssa/Instruction.qll"
   ],
   "IR IRBlock": [
     "cpp/ql/src/semmle/code/cpp/ir/implementation/raw/IRBlock.qll",
     "cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/IRBlock.qll",
     "cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/IRBlock.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/raw/IRBlock.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/IRBlock.qll"
+    "csharp/ql/src/experimental/ir/implementation/raw/IRBlock.qll",
+    "csharp/ql/src/experimental/ir/implementation/unaliased_ssa/IRBlock.qll"
   ],
   "IR IRVariable": [
     "cpp/ql/src/semmle/code/cpp/ir/implementation/raw/IRVariable.qll",
     "cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/IRVariable.qll",
     "cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/IRVariable.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/raw/IRVariable.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/IRVariable.qll"
+    "csharp/ql/src/experimental/ir/implementation/raw/IRVariable.qll",
+    "csharp/ql/src/experimental/ir/implementation/unaliased_ssa/IRVariable.qll"
   ],
   "IR IRFunction": [
     "cpp/ql/src/semmle/code/cpp/ir/implementation/raw/IRFunction.qll",
     "cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/IRFunction.qll",
     "cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/IRFunction.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/raw/IRFunction.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/IRFunction.qll"
+    "csharp/ql/src/experimental/ir/implementation/raw/IRFunction.qll",
+    "csharp/ql/src/experimental/ir/implementation/unaliased_ssa/IRFunction.qll"
   ],
   "IR Operand": [
     "cpp/ql/src/semmle/code/cpp/ir/implementation/raw/Operand.qll",
     "cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/Operand.qll",
     "cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/Operand.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/raw/Operand.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/Operand.qll" 
+    "csharp/ql/src/experimental/ir/implementation/raw/Operand.qll",
+    "csharp/ql/src/experimental/ir/implementation/unaliased_ssa/Operand.qll" 
   ],
   "IR IRType": [
     "cpp/ql/src/semmle/code/cpp/ir/implementation/IRType.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/IRType.qll"
+    "csharp/ql/src/experimental/ir/implementation/IRType.qll"
   ],
   "IR IRConfiguration": [
     "cpp/ql/src/semmle/code/cpp/ir/implementation/IRConfiguration.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/IRConfiguration.qll"
+    "csharp/ql/src/experimental/ir/implementation/IRConfiguration.qll"
   ],
   "IR UseSoundEscapeAnalysis": [
     "cpp/ql/src/semmle/code/cpp/ir/implementation/UseSoundEscapeAnalysis.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/UseSoundEscapeAnalysis.qll"
+    "csharp/ql/src/experimental/ir/implementation/UseSoundEscapeAnalysis.qll"
   ],
   "IR Operand Tag": [
     "cpp/ql/src/semmle/code/cpp/ir/implementation/internal/OperandTag.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/internal/OperandTag.qll"
+    "csharp/ql/src/experimental/ir/implementation/internal/OperandTag.qll"
   ],
   "IR TIRVariable":[
     "cpp/ql/src/semmle/code/cpp/ir/implementation/internal/TIRVariable.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/internal/TIRVariable.qll"
+    "csharp/ql/src/experimental/ir/implementation/internal/TIRVariable.qll"
   ],
   "IR IR": [
     "cpp/ql/src/semmle/code/cpp/ir/implementation/raw/IR.qll",
     "cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/IR.qll",
     "cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/IR.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/raw/IR.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/IR.qll"
+    "csharp/ql/src/experimental/ir/implementation/raw/IR.qll",
+    "csharp/ql/src/experimental/ir/implementation/unaliased_ssa/IR.qll"
   ],
   "IR IRConsistency": [
     "cpp/ql/src/semmle/code/cpp/ir/implementation/raw/IRConsistency.qll",
     "cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/IRConsistency.qll",
     "cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/IRConsistency.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/raw/IRConsistency.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/IRConsistency.qll"
+    "csharp/ql/src/experimental/ir/implementation/raw/IRConsistency.qll",
+    "csharp/ql/src/experimental/ir/implementation/unaliased_ssa/IRConsistency.qll"
   ],
   "IR PrintIR": [
     "cpp/ql/src/semmle/code/cpp/ir/implementation/raw/PrintIR.qll",
     "cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/PrintIR.qll",
     "cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/PrintIR.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/raw/PrintIR.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/PrintIR.qll"
+    "csharp/ql/src/experimental/ir/implementation/raw/PrintIR.qll",
+    "csharp/ql/src/experimental/ir/implementation/unaliased_ssa/PrintIR.qll"
   ],
   "IR IntegerConstant": [
     "cpp/ql/src/semmle/code/cpp/ir/internal/IntegerConstant.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/internal/IntegerConstant.qll"
+    "csharp/ql/src/experimental/ir/internal/IntegerConstant.qll"
   ],
   "IR IntegerInteval": [
     "cpp/ql/src/semmle/code/cpp/ir/internal/IntegerInterval.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/internal/IntegerInterval.qll"
+    "csharp/ql/src/experimental/ir/internal/IntegerInterval.qll"
   ],
   "IR IntegerPartial": [
     "cpp/ql/src/semmle/code/cpp/ir/internal/IntegerPartial.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/internal/IntegerPartial.qll"
+    "csharp/ql/src/experimental/ir/internal/IntegerPartial.qll"
   ],
   "IR Overlap": [
     "cpp/ql/src/semmle/code/cpp/ir/internal/Overlap.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/internal/Overlap.qll"
+    "csharp/ql/src/experimental/ir/internal/Overlap.qll"
   ],
   "IR EdgeKind": [
     "cpp/ql/src/semmle/code/cpp/ir/implementation/EdgeKind.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/EdgeKind.qll"
+    "csharp/ql/src/experimental/ir/implementation/EdgeKind.qll"
   ],
   "IR MemoryAccessKind": [
     "cpp/ql/src/semmle/code/cpp/ir/implementation/MemoryAccessKind.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/MemoryAccessKind.qll"
+    "csharp/ql/src/experimental/ir/implementation/MemoryAccessKind.qll"
   ],
   "IR TempVariableTag": [
     "cpp/ql/src/semmle/code/cpp/ir/implementation/TempVariableTag.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/TempVariableTag.qll"
+    "csharp/ql/src/experimental/ir/implementation/TempVariableTag.qll"
   ],
   "IR Opcode": [
     "cpp/ql/src/semmle/code/cpp/ir/implementation/Opcode.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/Opcode.qll"
+    "csharp/ql/src/experimental/ir/implementation/Opcode.qll"
   ],
   "IR SSAConsistency": [
     "cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConsistency.qll",
     "cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConsistency.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/internal/SSAConsistency.qll"
+    "csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SSAConsistency.qll"
   ],
   "C++ IR InstructionImports": [
     "cpp/ql/src/semmle/code/cpp/ir/implementation/raw/internal/InstructionImports.qll",
@@ -199,7 +199,7 @@
   "SSA AliasAnalysis": [
     "cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/AliasAnalysis.qll",
     "cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasAnalysis.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/internal/AliasAnalysis.qll"
+    "csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/AliasAnalysis.qll"
   ],
   "C++ SSA AliasAnalysisImports": [
     "cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/AliasAnalysisImports.qll",
@@ -212,42 +212,42 @@
   ],
   "IR SSA SimpleSSA": [
     "cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SimpleSSA.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/internal/SimpleSSA.qll"
+    "csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SimpleSSA.qll"
   ],
   "IR AliasConfiguration (unaliased_ssa)": [
     "cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/AliasConfiguration.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/internal/AliasConfiguration.qll"
+    "csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/AliasConfiguration.qll"
   ],
   "IR SSA SSAConstruction": [
     "cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll",
     "cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConstruction.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll"
+    "csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll"
   ],
   "IR SSA PrintSSA": [
     "cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/PrintSSA.qll",
     "cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/PrintSSA.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/internal/PrintSSA.qll"
+    "csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/PrintSSA.qll"
   ],
   "IR ValueNumberInternal": [
     "cpp/ql/src/semmle/code/cpp/ir/implementation/raw/gvn/internal/ValueNumberingInternal.qll",
     "cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/gvn/internal/ValueNumberingInternal.qll",
     "cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/gvn/internal/ValueNumberingInternal.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/raw/gvn/internal/ValueNumberingInternal.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/gvn/internal/ValueNumberingInternal.qll"
+    "csharp/ql/src/experimental/ir/implementation/raw/gvn/internal/ValueNumberingInternal.qll",
+    "csharp/ql/src/experimental/ir/implementation/unaliased_ssa/gvn/internal/ValueNumberingInternal.qll"
   ],
   "C++ IR ValueNumber": [
     "cpp/ql/src/semmle/code/cpp/ir/implementation/raw/gvn/ValueNumbering.qll",
     "cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/gvn/ValueNumbering.qll",
     "cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/gvn/ValueNumbering.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/raw/gvn/ValueNumbering.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/gvn/ValueNumbering.qll"
+    "csharp/ql/src/experimental/ir/implementation/raw/gvn/ValueNumbering.qll",
+    "csharp/ql/src/experimental/ir/implementation/unaliased_ssa/gvn/ValueNumbering.qll"
   ],
   "C++ IR PrintValueNumbering": [
     "cpp/ql/src/semmle/code/cpp/ir/implementation/raw/gvn/PrintValueNumbering.qll",
     "cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/gvn/PrintValueNumbering.qll",
     "cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/gvn/PrintValueNumbering.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/raw/gvn/PrintValueNumbering.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/gvn/PrintValueNumbering.qll"
+    "csharp/ql/src/experimental/ir/implementation/raw/gvn/PrintValueNumbering.qll",
+    "csharp/ql/src/experimental/ir/implementation/unaliased_ssa/gvn/PrintValueNumbering.qll"
   ],
   "C++ IR ConstantAnalysis": [
     "cpp/ql/src/semmle/code/cpp/ir/implementation/raw/constant/ConstantAnalysis.qll",
@@ -276,32 +276,32 @@
     "cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/reachability/PrintDominance.qll"
   ],
   "C# IR InstructionImports": [
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/raw/internal/InstructionImports.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/internal/InstructionImports.qll"
+    "csharp/ql/src/experimental/ir/implementation/raw/internal/InstructionImports.qll",
+    "csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/InstructionImports.qll"
   ],
   "C# IR IRImports": [
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/raw/internal/IRImports.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/internal/IRImports.qll"
+    "csharp/ql/src/experimental/ir/implementation/raw/internal/IRImports.qll",
+    "csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/IRImports.qll"
   ],
   "C# IR IRBlockImports": [
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/raw/internal/IRBlockImports.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/internal/IRBlockImports.qll"
+    "csharp/ql/src/experimental/ir/implementation/raw/internal/IRBlockImports.qll",
+    "csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/IRBlockImports.qll"
   ],
   "C# IR IRVariableImports": [
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/raw/internal/IRVariableImports.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/internal/IRVariableImports.qll"
+    "csharp/ql/src/experimental/ir/implementation/raw/internal/IRVariableImports.qll",
+    "csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/IRVariableImports.qll"
   ],
   "C# IR OperandImports": [
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/raw/internal/OperandImports.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/internal/OperandImports.qll"
+    "csharp/ql/src/experimental/ir/implementation/raw/internal/OperandImports.qll",
+    "csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/OperandImports.qll"
   ],
   "C# IR PrintIRImports": [
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/raw/internal/PrintIRImports.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/internal/PrintIRImports.qll"
+    "csharp/ql/src/experimental/ir/implementation/raw/internal/PrintIRImports.qll",
+    "csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/PrintIRImports.qll"
   ],
   "C# IR ValueNumberingImports": [
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/raw/gvn/internal/ValueNumberingImports.qll",
-    "csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/gvn/internal/ValueNumberingImports.qll"
+    "csharp/ql/src/experimental/ir/implementation/raw/gvn/internal/ValueNumberingImports.qll",
+    "csharp/ql/src/experimental/ir/implementation/unaliased_ssa/gvn/internal/ValueNumberingImports.qll"
   ],
   "XML": [
     "cpp/ql/src/semmle/code/cpp/XML.qll",

csharp/ql/src/experimental/ir/implementation/internal/EdgeKindInternal.qll

@@ -0,0 +1 @@
+import experimental.ir.internal.IRCSharpLanguage as Language

csharp/ql/src/experimental/ir/implementation/internal/IRConfigurationInternal.qll

@@ -0,0 +1 @@
+import experimental.ir.internal.IRCSharpLanguage as Language

csharp/ql/src/experimental/ir/implementation/internal/IRTypeInternal.qll

@@ -0,0 +1 @@
+import experimental.ir.internal.IRCSharpLanguage as Language

csharp/ql/src/experimental/ir/implementation/internal/OpcodeImports.qll

@@ -0,0 +1 @@
+import experimental.ir.implementation.MemoryAccessKind as MemoryAccessKind

csharp/ql/src/experimental/ir/implementation/internal/OperandTagInternal.qll

@@ -0,0 +1 @@
+import experimental.ir.internal.IRCSharpLanguage as Language

csharp/ql/src/experimental/ir/implementation/internal/TIRVariableInternal.qll

@@ -0,0 +1,7 @@
+import experimental.ir.internal.IRCSharpLanguage as Language
+import experimental.ir.implementation.raw.internal.IRConstruction as Construction
+private import experimental.ir.implementation.TempVariableTag as TempVariableTag_
+
+module Imports {
+  module TempVariableTag = TempVariableTag_;
+}

csharp/ql/src/experimental/ir/implementation/internal/TempVariableTagInternal.qll

@@ -0,0 +1,6 @@
+import experimental.ir.internal.IRCSharpLanguage as Language
+private import experimental.ir.internal.TempVariableTag as TempVariableTag_
+
+module Imports {
+  module TempVariableTag = TempVariableTag_;
+}

csharp/ql/src/experimental/ir/implementation/raw/constant/ConstantAnalysis.qll

@@ -1,5 +1,5 @@
 private import internal.ConstantAnalysisInternal
-private import semmle.code.csharp.ir.internal.IntegerPartial
+private import experimental.ir.internal.IntegerPartial
 private import IR
 
 language[monotonicAggregates]

csharp/ql/src/experimental/ir/implementation/raw/constant/PrintConstantAnalysis.qll

@@ -1,5 +1,5 @@
 private import internal.ConstantAnalysisInternal
-private import semmle.code.csharp.ir.internal.IntegerConstant
+private import experimental.ir.internal.IntegerConstant
 private import ConstantAnalysis
 import IR
 

csharp/ql/src/experimental/ir/implementation/raw/constant/internal/ConstantAnalysisInternal.qll

@@ -0,0 +1 @@
+import experimental.ir.implementation.raw.IR as IR

csharp/ql/src/experimental/ir/implementation/raw/gvn/internal/ValueNumberingImports.qll

@@ -0,0 +1,3 @@
+import experimental.ir.internal.Overlap
+import experimental.ir.internal.IRCSharpLanguage as Language
+import experimental.ir.implementation.unaliased_ssa.IR

csharp/ql/src/experimental/ir/implementation/raw/internal/IRBlockImports.qll

@@ -0,0 +1 @@
+import experimental.ir.implementation.EdgeKind as EdgeKind

csharp/ql/src/experimental/ir/implementation/raw/internal/IRConstruction.qll

@@ -1,9 +1,9 @@
 import csharp
-import semmle.code.csharp.ir.implementation.raw.IR
-private import semmle.code.csharp.ir.implementation.internal.OperandTag
-private import semmle.code.csharp.ir.internal.CSharpType
-private import semmle.code.csharp.ir.internal.Overlap
-private import semmle.code.csharp.ir.internal.TempVariableTag
+import experimental.ir.implementation.raw.IR
+private import experimental.ir.implementation.internal.OperandTag
+private import experimental.ir.internal.CSharpType
+private import experimental.ir.internal.Overlap
+private import experimental.ir.internal.TempVariableTag
 private import InstructionTag
 private import TranslatedCondition
 private import TranslatedElement
@@ -11,8 +11,8 @@ private import TranslatedExpr
 private import TranslatedStmt
 private import desugar.Foreach
 private import TranslatedFunction
-private import semmle.code.csharp.ir.Util
-private import semmle.code.csharp.ir.internal.IRCSharpLanguage as Language
+private import experimental.ir.Util
+private import experimental.ir.internal.IRCSharpLanguage as Language
 
 TranslatedElement getInstructionTranslatedElement(Instruction instruction) {
   instruction = MkInstruction(result, _)

csharp/ql/src/experimental/ir/implementation/raw/internal/IRImports.qll

@@ -0,0 +1,3 @@
+import experimental.ir.implementation.EdgeKind as EdgeKind
+import experimental.ir.implementation.IRType as IRType
+import experimental.ir.implementation.MemoryAccessKind as MemoryAccessKind

csharp/ql/src/experimental/ir/implementation/raw/internal/IRInternal.qll

@@ -0,0 +1,3 @@
+import experimental.ir.internal.IRCSharpLanguage as Language
+import IRConstruction as Construction
+import experimental.ir.implementation.IRConfiguration as IRConfiguration

csharp/ql/src/experimental/ir/implementation/raw/internal/IRVariableImports.qll

@@ -0,0 +1,5 @@
+import experimental.ir.implementation.IRType as IRType
+import experimental.ir.implementation.TempVariableTag as TempVariableTag
+import experimental.ir.internal.IRUtilities as IRUtilities
+import experimental.ir.internal.TempVariableTag as TTempVariableTag
+import experimental.ir.implementation.internal.TIRVariable as TIRVariable

csharp/ql/src/experimental/ir/implementation/raw/internal/InstructionImports.qll

@@ -0,0 +1,6 @@
+import experimental.ir.implementation.EdgeKind as EdgeKind
+import experimental.ir.implementation.IRType as IRType
+import experimental.ir.implementation.MemoryAccessKind as MemoryAccessKind
+import experimental.ir.implementation.Opcode as Opcode
+import experimental.ir.implementation.internal.OperandTag as OperandTag
+import experimental.ir.internal.Overlap as Overlap

csharp/ql/src/experimental/ir/implementation/raw/internal/InstructionTag.qll

@@ -1,5 +1,5 @@
 import csharp
-import semmle.code.csharp.ir.Util
+import experimental.ir.Util
 
 private predicate elementIsInitialized(int elementIndex) {
   exists(ArrayInitWithMod initList | initList.isInitialized(elementIndex))

csharp/ql/src/experimental/ir/implementation/raw/internal/OperandImports.qll

@@ -0,0 +1,4 @@
+import experimental.ir.implementation.MemoryAccessKind as MemoryAccessKind
+import experimental.ir.implementation.IRType as IRType
+import experimental.ir.internal.Overlap as Overlap
+import experimental.ir.implementation.internal.OperandTag as OperandTag

csharp/ql/src/experimental/ir/implementation/raw/internal/PrintIRImports.qll

@@ -0,0 +1 @@
+import experimental.ir.IRConfiguration as IRConfiguration

csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedCall.qll

@@ -1,13 +1,13 @@
 import csharp
-private import semmle.code.csharp.ir.implementation.Opcode
-private import semmle.code.csharp.ir.implementation.internal.OperandTag
+private import experimental.ir.implementation.Opcode
+private import experimental.ir.implementation.internal.OperandTag
 private import InstructionTag
 private import TranslatedElement
 private import TranslatedExpr
 private import TranslatedInitialization
-private import semmle.code.csharp.ir.Util
-private import semmle.code.csharp.ir.implementation.raw.internal.common.TranslatedCallBase
-private import semmle.code.csharp.ir.internal.IRCSharpLanguage as Language
+private import experimental.ir.Util
+private import experimental.ir.implementation.raw.internal.common.TranslatedCallBase
+private import experimental.ir.internal.IRCSharpLanguage as Language
 
 /**
  * The IR translation of a call to a function. The function can be a normal function

csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedCondition.qll

@@ -1,12 +1,12 @@
 import csharp
-private import semmle.code.csharp.ir.implementation.Opcode
-private import semmle.code.csharp.ir.implementation.internal.OperandTag
-private import semmle.code.csharp.ir.internal.CSharpType
+private import experimental.ir.implementation.Opcode
+private import experimental.ir.implementation.internal.OperandTag
+private import experimental.ir.internal.CSharpType
 private import InstructionTag
 private import TranslatedElement
 private import TranslatedExpr
 private import common.TranslatedConditionBase
-private import semmle.code.csharp.ir.internal.IRCSharpLanguage as Language
+private import experimental.ir.internal.IRCSharpLanguage as Language
 
 TranslatedCondition getTranslatedCondition(Expr expr) { result.getExpr() = expr }
 

csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedDeclaration.qll

@@ -1,12 +1,12 @@
 import csharp
-private import semmle.code.csharp.ir.implementation.Opcode
-private import semmle.code.csharp.ir.internal.IRUtilities
-private import semmle.code.csharp.ir.implementation.internal.OperandTag
+private import experimental.ir.implementation.Opcode
+private import experimental.ir.internal.IRUtilities
+private import experimental.ir.implementation.internal.OperandTag
 private import InstructionTag
 private import TranslatedElement
 private import TranslatedExpr
 private import TranslatedInitialization
-private import semmle.code.csharp.ir.internal.IRCSharpLanguage as Language
+private import experimental.ir.internal.IRCSharpLanguage as Language
 private import common.TranslatedDeclarationBase
 
 /**

csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedElement.qll

@@ -1,17 +1,17 @@
 import csharp
-import semmle.code.csharp.ir.implementation.raw.IR
-private import semmle.code.csharp.ir.IRConfiguration
-private import semmle.code.csharp.ir.implementation.Opcode
-private import semmle.code.csharp.ir.implementation.internal.OperandTag
-private import semmle.code.csharp.ir.internal.CSharpType
-private import semmle.code.csharp.ir.internal.TempVariableTag
+import experimental.ir.implementation.raw.IR
+private import experimental.ir.IRConfiguration
+private import experimental.ir.implementation.Opcode
+private import experimental.ir.implementation.internal.OperandTag
+private import experimental.ir.internal.CSharpType
+private import experimental.ir.internal.TempVariableTag
 private import InstructionTag
 private import TranslatedCondition
 private import TranslatedFunction
 private import TranslatedStmt
 private import IRConstruction
-private import semmle.code.csharp.ir.Util
-private import semmle.code.csharp.ir.internal.IRCSharpLanguage as Language
+private import experimental.ir.Util
+private import experimental.ir.internal.IRCSharpLanguage as Language
 private import desugar.Foreach
 private import desugar.Delegate
 private import desugar.Lock

csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedExpr.qll

@@ -1,9 +1,9 @@
 import csharp
-private import semmle.code.csharp.ir.implementation.Opcode
-private import semmle.code.csharp.ir.implementation.internal.OperandTag
-private import semmle.code.csharp.ir.internal.TempVariableTag
-private import semmle.code.csharp.ir.internal.CSharpType
-private import semmle.code.csharp.ir.internal.IRUtilities
+private import experimental.ir.implementation.Opcode
+private import experimental.ir.implementation.internal.OperandTag
+private import experimental.ir.internal.TempVariableTag
+private import experimental.ir.internal.CSharpType
+private import experimental.ir.internal.IRUtilities
 private import InstructionTag
 private import TranslatedCondition
 private import TranslatedDeclaration
@@ -16,8 +16,8 @@ private import common.TranslatedExprBase
 private import desugar.Delegate
 private import desugar.internal.TranslatedCompilerGeneratedCall
 import TranslatedCall
-private import semmle.code.csharp.ir.Util
-private import semmle.code.csharp.ir.internal.IRCSharpLanguage as Language
+private import experimental.ir.Util
+private import experimental.ir.internal.IRCSharpLanguage as Language
 
 /**
  * Gets the TranslatedExpr for the specified expression. If `expr` is a load,

csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedFunction.qll

@@ -1,16 +1,16 @@
 import csharp
-import semmle.code.csharp.ir.implementation.raw.IR
-private import semmle.code.csharp.ir.implementation.Opcode
-private import semmle.code.csharp.ir.internal.CSharpType
-private import semmle.code.csharp.ir.internal.IRUtilities
-private import semmle.code.csharp.ir.implementation.internal.OperandTag
-private import semmle.code.csharp.ir.internal.TempVariableTag
+import experimental.ir.implementation.raw.IR
+private import experimental.ir.implementation.Opcode
+private import experimental.ir.internal.CSharpType
+private import experimental.ir.internal.IRUtilities
+private import experimental.ir.implementation.internal.OperandTag
+private import experimental.ir.internal.TempVariableTag
 private import InstructionTag
 private import TranslatedElement
 private import TranslatedExpr
 private import TranslatedInitialization
 private import TranslatedStmt
-private import semmle.code.csharp.ir.internal.IRCSharpLanguage as Language
+private import experimental.ir.internal.IRCSharpLanguage as Language
 
 /**
  * Gets the `TranslatedFunction` that represents function `callable`.

csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedInitialization.qll

@@ -4,14 +4,14 @@
  */
 
 import csharp
-private import semmle.code.csharp.ir.implementation.Opcode
-private import semmle.code.csharp.ir.implementation.internal.OperandTag
-private import semmle.code.csharp.ir.internal.CSharpType
+private import experimental.ir.implementation.Opcode
+private import experimental.ir.implementation.internal.OperandTag
+private import experimental.ir.internal.CSharpType
 private import InstructionTag
 private import TranslatedElement
 private import TranslatedExpr
 private import TranslatedFunction
-private import semmle.code.csharp.ir.Util
+private import experimental.ir.Util
 private import IRInternal
 private import desugar.Delegate
 

csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedStmt.qll

@@ -1,7 +1,7 @@
 import csharp
-private import semmle.code.csharp.ir.internal.CSharpType
-private import semmle.code.csharp.ir.internal.TempVariableTag
-private import semmle.code.csharp.ir.implementation.internal.OperandTag
+private import experimental.ir.internal.CSharpType
+private import experimental.ir.internal.TempVariableTag
+private import experimental.ir.implementation.internal.OperandTag
 private import InstructionTag
 private import TranslatedCondition
 private import TranslatedDeclaration
@@ -11,7 +11,7 @@ private import TranslatedFunction
 private import TranslatedInitialization
 private import common.TranslatedConditionBase
 private import IRInternal
-private import semmle.code.csharp.ir.internal.IRUtilities
+private import experimental.ir.internal.IRUtilities
 private import desugar.Foreach
 private import desugar.Lock
 

csharp/ql/src/experimental/ir/implementation/raw/internal/common/TranslatedCallBase.qll

@@ -4,14 +4,14 @@
  */
 
 import csharp
-private import semmle.code.csharp.ir.implementation.Opcode
-private import semmle.code.csharp.ir.implementation.internal.OperandTag
-private import semmle.code.csharp.ir.implementation.raw.internal.InstructionTag
-private import semmle.code.csharp.ir.implementation.raw.internal.TranslatedElement
-private import semmle.code.csharp.ir.implementation.raw.internal.TranslatedExpr
-private import semmle.code.csharp.ir.Util
-private import semmle.code.csharp.ir.internal.CSharpType
-private import semmle.code.csharp.ir.internal.IRCSharpLanguage as Language
+private import experimental.ir.implementation.Opcode
+private import experimental.ir.implementation.internal.OperandTag
+private import experimental.ir.implementation.raw.internal.InstructionTag
+private import experimental.ir.implementation.raw.internal.TranslatedElement
+private import experimental.ir.implementation.raw.internal.TranslatedExpr
+private import experimental.ir.Util
+private import experimental.ir.internal.CSharpType
+private import experimental.ir.internal.IRCSharpLanguage as Language
 private import TranslatedExprBase
 
 abstract class TranslatedCallBase extends TranslatedElement {

csharp/ql/src/experimental/ir/implementation/raw/internal/common/TranslatedConditionBase.qll

@@ -3,14 +3,14 @@
  */
 
 import csharp
-private import semmle.code.csharp.ir.implementation.Opcode
-private import semmle.code.csharp.ir.implementation.internal.OperandTag
-private import semmle.code.csharp.ir.implementation.raw.internal.InstructionTag
-private import semmle.code.csharp.ir.implementation.raw.internal.TranslatedElement
-private import semmle.code.csharp.ir.implementation.raw.internal.TranslatedExpr
-private import semmle.code.csharp.ir.implementation.raw.internal.TranslatedCondition
-private import semmle.code.csharp.ir.internal.CSharpType
-private import semmle.code.csharp.ir.internal.IRCSharpLanguage as Language
+private import experimental.ir.implementation.Opcode
+private import experimental.ir.implementation.internal.OperandTag
+private import experimental.ir.implementation.raw.internal.InstructionTag
+private import experimental.ir.implementation.raw.internal.TranslatedElement
+private import experimental.ir.implementation.raw.internal.TranslatedExpr
+private import experimental.ir.implementation.raw.internal.TranslatedCondition
+private import experimental.ir.internal.CSharpType
+private import experimental.ir.internal.IRCSharpLanguage as Language
 
 /**
  * Represents the context of the condition, ie. provides

csharp/ql/src/experimental/ir/implementation/raw/internal/common/TranslatedDeclarationBase.qll

@@ -4,15 +4,15 @@
  */
 
 import csharp
-private import semmle.code.csharp.ir.implementation.Opcode
-private import semmle.code.csharp.ir.internal.IRUtilities
-private import semmle.code.csharp.ir.implementation.internal.OperandTag
-private import semmle.code.csharp.ir.implementation.raw.internal.InstructionTag
-private import semmle.code.csharp.ir.implementation.raw.internal.TranslatedElement
-private import semmle.code.csharp.ir.implementation.raw.internal.TranslatedExpr
-private import semmle.code.csharp.ir.implementation.raw.internal.TranslatedInitialization
-private import semmle.code.csharp.ir.internal.CSharpType
-private import semmle.code.csharp.ir.internal.IRCSharpLanguage as Language
+private import experimental.ir.implementation.Opcode
+private import experimental.ir.internal.IRUtilities
+private import experimental.ir.implementation.internal.OperandTag
+private import experimental.ir.implementation.raw.internal.InstructionTag
+private import experimental.ir.implementation.raw.internal.TranslatedElement
+private import experimental.ir.implementation.raw.internal.TranslatedExpr
+private import experimental.ir.implementation.raw.internal.TranslatedInitialization
+private import experimental.ir.internal.CSharpType
+private import experimental.ir.internal.IRCSharpLanguage as Language
 
 abstract class LocalVariableDeclarationBase extends TranslatedElement {
   override TranslatedElement getChild(int id) { id = 0 and result = getInitialization() }

csharp/ql/src/experimental/ir/implementation/raw/internal/common/TranslatedExprBase.qll

@@ -3,8 +3,8 @@
  * (both AST generated and compiler generated).
  */
 
-private import semmle.code.csharp.ir.implementation.raw.internal.TranslatedElement
-private import semmle.code.csharp.ir.internal.IRCSharpLanguage as Language
+private import experimental.ir.implementation.raw.internal.TranslatedElement
+private import experimental.ir.internal.IRCSharpLanguage as Language
 
 abstract class TranslatedExprBase extends TranslatedElement {
   /**

csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/Common.qll

@@ -6,22 +6,22 @@
  */
 
 import csharp
-private import semmle.code.csharp.ir.implementation.Opcode
-private import semmle.code.csharp.ir.implementation.internal.OperandTag
-private import semmle.code.csharp.ir.internal.CSharpType
-private import semmle.code.csharp.ir.internal.TempVariableTag
-private import semmle.code.csharp.ir.implementation.raw.internal.TranslatedElement
-private import semmle.code.csharp.ir.implementation.raw.internal.TranslatedFunction
-private import semmle.code.csharp.ir.implementation.raw.internal.InstructionTag
+private import experimental.ir.implementation.Opcode
+private import experimental.ir.implementation.internal.OperandTag
+private import experimental.ir.internal.CSharpType
+private import experimental.ir.internal.TempVariableTag
+private import experimental.ir.implementation.raw.internal.TranslatedElement
+private import experimental.ir.implementation.raw.internal.TranslatedFunction
+private import experimental.ir.implementation.raw.internal.InstructionTag
 private import internal.TranslatedCompilerGeneratedStmt
 private import internal.TranslatedCompilerGeneratedExpr
 private import internal.TranslatedCompilerGeneratedCondition
 private import internal.TranslatedCompilerGeneratedCall
 private import internal.TranslatedCompilerGeneratedElement
 private import internal.TranslatedCompilerGeneratedDeclaration
-private import semmle.code.csharp.ir.implementation.raw.internal.common.TranslatedConditionBase
-private import semmle.code.csharp.ir.implementation.raw.internal.common.TranslatedExprBase
-private import semmle.code.csharp.ir.internal.IRCSharpLanguage as Language
+private import experimental.ir.implementation.raw.internal.common.TranslatedConditionBase
+private import experimental.ir.implementation.raw.internal.common.TranslatedExprBase
+private import experimental.ir.internal.IRCSharpLanguage as Language
 
 /**
  * The general form of a compiler generated try stmt.

csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/Delegate.qll

@@ -9,18 +9,18 @@
  */
 
 import csharp
-private import semmle.code.csharp.ir.implementation.Opcode
-private import semmle.code.csharp.ir.implementation.internal.OperandTag
-private import semmle.code.csharp.ir.internal.TempVariableTag
-private import semmle.code.csharp.ir.implementation.raw.internal.InstructionTag
-private import semmle.code.csharp.ir.implementation.raw.internal.TranslatedExpr
-private import semmle.code.csharp.ir.implementation.raw.internal.TranslatedElement
-private import semmle.code.csharp.ir.implementation.raw.internal.TranslatedStmt
-private import semmle.code.csharp.ir.implementation.raw.internal.TranslatedCondition
-private import semmle.code.csharp.ir.internal.IRCSharpLanguage as Language
+private import experimental.ir.implementation.Opcode
+private import experimental.ir.implementation.internal.OperandTag
+private import experimental.ir.internal.TempVariableTag
+private import experimental.ir.implementation.raw.internal.InstructionTag
+private import experimental.ir.implementation.raw.internal.TranslatedExpr
+private import experimental.ir.implementation.raw.internal.TranslatedElement
+private import experimental.ir.implementation.raw.internal.TranslatedStmt
+private import experimental.ir.implementation.raw.internal.TranslatedCondition
+private import experimental.ir.internal.IRCSharpLanguage as Language
 private import Common
 private import internal.TranslatedCompilerGeneratedCall
-private import semmle.code.csharp.ir.implementation.raw.internal.common.TranslatedExprBase
+private import experimental.ir.implementation.raw.internal.common.TranslatedExprBase
 
 /**
  * Module that exposes the functions needed for the translation of the delegate creation and call expressions.

csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/Foreach.qll

@@ -34,17 +34,17 @@
  */
 
 import csharp
-private import semmle.code.csharp.ir.implementation.Opcode
-private import semmle.code.csharp.ir.implementation.internal.OperandTag
-private import semmle.code.csharp.ir.internal.CSharpType
-private import semmle.code.csharp.ir.internal.TempVariableTag
-private import semmle.code.csharp.ir.implementation.raw.internal.InstructionTag
-private import semmle.code.csharp.ir.implementation.raw.internal.TranslatedExpr
-private import semmle.code.csharp.ir.implementation.raw.internal.TranslatedElement
-private import semmle.code.csharp.ir.implementation.raw.internal.TranslatedStmt
-private import semmle.code.csharp.ir.implementation.raw.internal.common.TranslatedConditionBase
-private import semmle.code.csharp.ir.implementation.raw.internal.common.TranslatedExprBase
-private import semmle.code.csharp.ir.internal.IRCSharpLanguage as Language
+private import experimental.ir.implementation.Opcode
+private import experimental.ir.implementation.internal.OperandTag
+private import experimental.ir.internal.CSharpType
+private import experimental.ir.internal.TempVariableTag
+private import experimental.ir.implementation.raw.internal.InstructionTag
+private import experimental.ir.implementation.raw.internal.TranslatedExpr
+private import experimental.ir.implementation.raw.internal.TranslatedElement
+private import experimental.ir.implementation.raw.internal.TranslatedStmt
+private import experimental.ir.implementation.raw.internal.common.TranslatedConditionBase
+private import experimental.ir.implementation.raw.internal.common.TranslatedExprBase
+private import experimental.ir.internal.IRCSharpLanguage as Language
 private import Common
 private import internal.TranslatedCompilerGeneratedStmt
 private import internal.TranslatedCompilerGeneratedCall

csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/Lock.qll

@@ -19,17 +19,17 @@
  */
 
 import csharp
-private import semmle.code.csharp.ir.implementation.Opcode
-private import semmle.code.csharp.ir.implementation.internal.OperandTag
-private import semmle.code.csharp.ir.internal.CSharpType
-private import semmle.code.csharp.ir.internal.TempVariableTag
-private import semmle.code.csharp.ir.implementation.raw.internal.TranslatedExpr
-private import semmle.code.csharp.ir.implementation.raw.internal.TranslatedElement
-private import semmle.code.csharp.ir.implementation.raw.internal.TranslatedStmt
-private import semmle.code.csharp.ir.implementation.raw.internal.common.TranslatedExprBase
-private import semmle.code.csharp.ir.implementation.raw.internal.common.TranslatedConditionBase
-private import semmle.code.csharp.ir.implementation.raw.internal.InstructionTag
-private import semmle.code.csharp.ir.internal.IRCSharpLanguage as Language
+private import experimental.ir.implementation.Opcode
+private import experimental.ir.implementation.internal.OperandTag
+private import experimental.ir.internal.CSharpType
+private import experimental.ir.internal.TempVariableTag
+private import experimental.ir.implementation.raw.internal.TranslatedExpr
+private import experimental.ir.implementation.raw.internal.TranslatedElement
+private import experimental.ir.implementation.raw.internal.TranslatedStmt
+private import experimental.ir.implementation.raw.internal.common.TranslatedExprBase
+private import experimental.ir.implementation.raw.internal.common.TranslatedConditionBase
+private import experimental.ir.implementation.raw.internal.InstructionTag
+private import experimental.ir.internal.IRCSharpLanguage as Language
 private import Common
 private import internal.TranslatedCompilerGeneratedStmt
 private import internal.TranslatedCompilerGeneratedCall

csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/internal/TranslatedCompilerGeneratedCall.qll

@@ -3,11 +3,11 @@
  */
 
 import csharp
-private import semmle.code.csharp.ir.implementation.raw.internal.TranslatedElement
-private import semmle.code.csharp.ir.implementation.raw.internal.TranslatedFunction
-private import semmle.code.csharp.ir.implementation.raw.internal.common.TranslatedCallBase
+private import experimental.ir.implementation.raw.internal.TranslatedElement
+private import experimental.ir.implementation.raw.internal.TranslatedFunction
+private import experimental.ir.implementation.raw.internal.common.TranslatedCallBase
 private import TranslatedCompilerGeneratedElement
-private import semmle.code.csharp.ir.internal.IRCSharpLanguage as Language
+private import experimental.ir.internal.IRCSharpLanguage as Language
 
 abstract class TranslatedCompilerGeneratedCall extends TranslatedCallBase,
   TranslatedCompilerGeneratedElement {

csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/internal/TranslatedCompilerGeneratedCondition.qll

@@ -3,10 +3,10 @@
  */
 
 import csharp
-private import semmle.code.csharp.ir.implementation.raw.internal.TranslatedElement
-private import semmle.code.csharp.ir.implementation.raw.internal.common.TranslatedConditionBase
+private import experimental.ir.implementation.raw.internal.TranslatedElement
+private import experimental.ir.implementation.raw.internal.common.TranslatedConditionBase
 private import TranslatedCompilerGeneratedElement
-private import semmle.code.csharp.ir.internal.IRCSharpLanguage as Language
+private import experimental.ir.internal.IRCSharpLanguage as Language
 
 abstract class TranslatedCompilerGeneratedValueCondition extends TranslatedCompilerGeneratedElement,
   ValueConditionBase {

csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/internal/TranslatedCompilerGeneratedDeclaration.qll

@@ -5,15 +5,15 @@
  */
 
 import csharp
-private import semmle.code.csharp.ir.implementation.Opcode
-private import semmle.code.csharp.ir.implementation.internal.OperandTag
-private import semmle.code.csharp.ir.implementation.raw.internal.InstructionTag
-private import semmle.code.csharp.ir.implementation.raw.internal.TranslatedElement
-private import semmle.code.csharp.ir.implementation.raw.internal.TranslatedFunction
-private import semmle.code.csharp.ir.implementation.raw.internal.common.TranslatedDeclarationBase
+private import experimental.ir.implementation.Opcode
+private import experimental.ir.implementation.internal.OperandTag
+private import experimental.ir.implementation.raw.internal.InstructionTag
+private import experimental.ir.implementation.raw.internal.TranslatedElement
+private import experimental.ir.implementation.raw.internal.TranslatedFunction
+private import experimental.ir.implementation.raw.internal.common.TranslatedDeclarationBase
 private import TranslatedCompilerGeneratedElement
-private import semmle.code.csharp.ir.internal.CSharpType
-private import semmle.code.csharp.ir.internal.IRCSharpLanguage as Language
+private import experimental.ir.internal.CSharpType
+private import experimental.ir.internal.IRCSharpLanguage as Language
 
 abstract class TranslatedCompilerGeneratedDeclaration extends LocalVariableDeclarationBase,
   TranslatedCompilerGeneratedElement {

csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/internal/TranslatedCompilerGeneratedElement.qll

@@ -3,8 +3,8 @@
  * which represents the element that generated the compiler generated element.
  */
 
-private import semmle.code.csharp.ir.implementation.raw.internal.TranslatedElement
-private import semmle.code.csharp.ir.internal.IRCSharpLanguage as Language
+private import experimental.ir.implementation.raw.internal.TranslatedElement
+private import experimental.ir.internal.IRCSharpLanguage as Language
 
 abstract class TranslatedCompilerGeneratedElement extends TranslatedElement,
   TTranslatedCompilerGeneratedElement {

csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/internal/TranslatedCompilerGeneratedExpr.qll

@@ -5,9 +5,9 @@
 
 import csharp
 private import TranslatedCompilerGeneratedElement
-private import semmle.code.csharp.ir.implementation.raw.Instruction
-private import semmle.code.csharp.ir.implementation.raw.internal.common.TranslatedExprBase
-private import semmle.code.csharp.ir.internal.IRCSharpLanguage as Language
+private import experimental.ir.implementation.raw.Instruction
+private import experimental.ir.implementation.raw.internal.common.TranslatedExprBase
+private import experimental.ir.internal.IRCSharpLanguage as Language
 
 abstract class TranslatedCompilerGeneratedExpr extends TranslatedCompilerGeneratedElement,
   TranslatedExprBase {

csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/internal/TranslatedCompilerGeneratedStmt.qll

@@ -5,7 +5,7 @@
 
 import csharp
 private import TranslatedCompilerGeneratedElement
-private import semmle.code.csharp.ir.internal.IRCSharpLanguage as Language
+private import experimental.ir.internal.IRCSharpLanguage as Language
 
 abstract class TranslatedCompilerGeneratedStmt extends TranslatedCompilerGeneratedElement {
   final override string toString() {

csharp/ql/src/experimental/ir/implementation/raw/internal/reachability/ReachableBlockInternal.qll

@@ -0,0 +1,2 @@
+import experimental.ir.implementation.raw.IR as IR
+import experimental.ir.implementation.raw.constant.ConstantAnalysis as ConstantAnalysis

csharp/ql/src/experimental/ir/implementation/unaliased_ssa/constant/ConstantAnalysis.qll

@@ -1,5 +1,5 @@
 private import internal.ConstantAnalysisInternal
-private import semmle.code.csharp.ir.internal.IntegerPartial
+private import experimental.ir.internal.IntegerPartial
 private import IR
 
 language[monotonicAggregates]

csharp/ql/src/experimental/ir/implementation/unaliased_ssa/constant/PrintConstantAnalysis.qll

@@ -1,5 +1,5 @@
 private import internal.ConstantAnalysisInternal
-private import semmle.code.csharp.ir.internal.IntegerConstant
+private import experimental.ir.internal.IntegerConstant
 private import ConstantAnalysis
 import IR
 

csharp/ql/src/experimental/ir/implementation/unaliased_ssa/constant/internal/ConstantAnalysisInternal.qll

@@ -0,0 +1 @@
+import experimental.ir.implementation.unaliased_ssa.IR as IR

csharp/ql/src/experimental/ir/implementation/unaliased_ssa/gvn/internal/ValueNumberingImports.qll

@@ -0,0 +1,3 @@
+import experimental.ir.internal.Overlap
+import experimental.ir.internal.IRCSharpLanguage as Language
+import experimental.ir.implementation.unaliased_ssa.IR

csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/AliasAnalysisImports.qll

@@ -1,6 +1,6 @@
 private import csharp
-import semmle.code.csharp.ir.implementation.IRConfiguration
-import semmle.code.csharp.ir.internal.IntegerConstant as Ints
+import experimental.ir.implementation.IRConfiguration
+import experimental.ir.internal.IntegerConstant as Ints
 
 module AliasModels {
   /**

csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/AliasAnalysisInternal.qll

@@ -0,0 +1,3 @@
+import experimental.ir.internal.IRCSharpLanguage as Language
+import experimental.ir.implementation.raw.IR as InputIR
+import AliasConfiguration as Configuration