C++: Move GVN out of "internal" directory

dave-bartolomeo · dave-bartolomeo · commit 5a25602c28a9 · 2018-09-20T08:21:15.000-07:00
diff --git a/config/identical-files.json b/config/identical-files.json
@@ -56,8 +56,8 @@
         "cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConstruction.qll"
     ],
     "C++ IR ValueNumber": [
-        "cpp/ql/src/semmle/code/cpp/ir/implementation/raw/internal/gvn/ValueNumber.qll",
-        "cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/gvn/ValueNumber.qll",
-        "cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/gvn/ValueNumber.qll"
+        "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"
     ]
 }
diff --git a/cpp/ql/src/semmle/code/cpp/ir/ValueNumbering.qll b/cpp/ql/src/semmle/code/cpp/ir/ValueNumbering.qll
@@ -0,0 +1 @@
+import implementation.aliased_ssa.gvn.ValueNumbering
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/gvn/ValueNumbering.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/gvn/ValueNumbering.qll
@@ -1,4 +1,4 @@
-private import ValueNumberInternal
+private import internal.ValueNumberingInternal
 import cpp
 private import IR
 
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/gvn/internal/ValueNumberingInternal.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/gvn/internal/ValueNumberingInternal.qll
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/raw/gvn/ValueNumbering.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/raw/gvn/ValueNumbering.qll
@@ -1,4 +1,4 @@
-private import ValueNumberInternal
+private import internal.ValueNumberingInternal
 import cpp
 private import IR
 
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/raw/gvn/internal/ValueNumberingInternal.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/raw/gvn/internal/ValueNumberingInternal.qll
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/gvn/ValueNumbering.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/gvn/ValueNumbering.qll
@@ -1,4 +1,4 @@
-private import ValueNumberInternal
+private import internal.ValueNumberingInternal
 import cpp
 private import IR
 
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/gvn/internal/ValueNumberingInternal.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/gvn/internal/ValueNumberingInternal.qll
diff --git a/cpp/ql/test/library-tests/valuenumbering/GlobalValueNumbering/ir_gvn.ql b/cpp/ql/test/library-tests/valuenumbering/GlobalValueNumbering/ir_gvn.ql
@@ -3,4 +3,4 @@
  */
 import semmle.code.cpp.ir.PrintIR
 import semmle.code.cpp.ir.IR
-import semmle.code.cpp.ir.implementation.aliased_ssa.internal.gvn.ValueNumber
+import semmle.code.cpp.ir.ValueNumbering

Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,8 @@`
`56`	`56`	`"cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConstruction.qll"`
`57`	`57`	`],`
`58`	`58`	`"C++ IR ValueNumber": [`
`59`		`- "cpp/ql/src/semmle/code/cpp/ir/implementation/raw/internal/gvn/ValueNumber.qll",`
`60`		`- "cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/gvn/ValueNumber.qll",`
`61`		`- "cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/gvn/ValueNumber.qll"`
	`59`	`+ "cpp/ql/src/semmle/code/cpp/ir/implementation/raw/gvn/ValueNumbering.qll",`
	`60`	`+ "cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/gvn/ValueNumbering.qll",`
	`61`	`+ "cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/gvn/ValueNumbering.qll"`
`62`	`62`	`]`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+import implementation.aliased_ssa.gvn.ValueNumbering`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-private import ValueNumberInternal`
	`1`	`+private import internal.ValueNumberingInternal`
`2`	`2`	`import cpp`
`3`	`3`	`private import IR`
`4`	`4`