From 9fd5f26e2e71488e98c2f288ca955b3cd78d70f9 Mon Sep 17 00:00:00 2001 From: Dave Bartolomeo Date: Thu, 30 Aug 2018 13:16:27 -0700 Subject: [PATCH] C++: Remove unnecessary Impl suffix from some files --- config/identical-files.json | 18 +++++++++--------- cpp/ql/src/semmle/code/cpp/ir/AliasedSSAIR.qll | 2 +- .../semmle/code/cpp/ir/AliasedSSAIRSanity.ql | 2 +- cpp/ql/src/semmle/code/cpp/ir/IR.qll | 2 +- cpp/ql/src/semmle/code/cpp/ir/IRSanity.ql | 2 +- .../semmle/code/cpp/ir/PrintAliasedSSAIR.qll | 2 +- cpp/ql/src/semmle/code/cpp/ir/PrintIR.qll | 2 +- cpp/ql/src/semmle/code/cpp/ir/PrintSSAIR.qll | 2 +- cpp/ql/src/semmle/code/cpp/ir/SSAIR.qll | 2 +- cpp/ql/src/semmle/code/cpp/ir/SSAIRSanity.ql | 2 +- .../internal/aliased_ssa_ir/AliasAnalysis.qll | 2 +- .../aliased_ssa_ir/AliasAnalysisInternal.qll | 2 +- .../aliased_ssa_ir/{IRImpl.qll => IR.qll} | 0 .../{IRSanityImpl.qll => IRSanity.qll} | 2 +- .../PrintIR.qll} | 2 +- .../aliased_ssa_ir/SSAConstructionInternal.qll | 4 ++-- .../ir/internal/aliased_ssa_ir/SimpleSSA.qll | 2 +- .../aliased_ssa_ir/SimpleSSAInternal.qll | 2 +- .../ir/internal/raw_ir/{IRImpl.qll => IR.qll} | 0 .../cpp/ir/internal/raw_ir/IRConstruction.qll | 2 +- .../IRSanityImpl.qll => raw_ir/IRSanity.qll} | 2 +- .../raw_ir/{PrintIRImpl.qll => PrintIR.qll} | 2 +- .../ir/internal/raw_ir/TranslatedElement.qll | 2 +- .../ir/internal/raw_ir/TranslatedFunction.qll | 2 +- .../cpp/ir/internal/ssa_ir/AliasAnalysis.qll | 2 +- .../internal/ssa_ir/AliasAnalysisInternal.qll | 2 +- .../ir/internal/ssa_ir/{IRImpl.qll => IR.qll} | 0 .../IRSanityImpl.qll => ssa_ir/IRSanity.qll} | 2 +- .../PrintIRImpl.qll => ssa_ir/PrintIR.qll} | 2 +- .../ssa_ir/SSAConstructionInternal.qll | 4 ++-- .../code/cpp/ir/internal/ssa_ir/SimpleSSA.qll | 2 +- .../ir/internal/ssa_ir/SimpleSSAInternal.qll | 3 +-- 32 files changed, 39 insertions(+), 40 deletions(-) rename cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/{IRImpl.qll => IR.qll} (100%) rename cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/{IRSanityImpl.qll => IRSanity.qll} (54%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{ssa_ir/PrintIRImpl.qll => aliased_ssa_ir/PrintIR.qll} (99%) rename cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/{IRImpl.qll => IR.qll} (100%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{ssa_ir/IRSanityImpl.qll => raw_ir/IRSanity.qll} (54%) rename cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/{PrintIRImpl.qll => PrintIR.qll} (99%) rename cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/{IRImpl.qll => IR.qll} (100%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{raw_ir/IRSanityImpl.qll => ssa_ir/IRSanity.qll} (54%) rename cpp/ql/src/semmle/code/cpp/ir/internal/{aliased_ssa_ir/PrintIRImpl.qll => ssa_ir/PrintIR.qll} (99%) diff --git a/config/identical-files.json b/config/identical-files.json index 1c222eb63f9..186b540133a 100644 --- a/config/identical-files.json +++ b/config/identical-files.json @@ -25,19 +25,19 @@ "cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/OperandTag.qll" ], "C++ IR IRImpl": [ - "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" + "cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IR.qll", + "cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IR.qll", + "cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IR.qll" ], "C++ IR IRSanityImpl": [ - "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" + "cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRSanity.qll", + "cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRSanity.qll", + "cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRSanity.qll" ], "C++ IR PrintIRImpl": [ - "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" + "cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/PrintIR.qll", + "cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/PrintIR.qll", + "cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/PrintIR.qll" ], "C++ SSA AliasAnalysis": [ "cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/AliasAnalysis.qll", diff --git a/cpp/ql/src/semmle/code/cpp/ir/AliasedSSAIR.qll b/cpp/ql/src/semmle/code/cpp/ir/AliasedSSAIR.qll index cf2ae8943a4..35e6aa9d9e7 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/AliasedSSAIR.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/AliasedSSAIR.qll @@ -1 +1 @@ -import internal.aliased_ssa_ir.IRImpl +import internal.aliased_ssa_ir.IR diff --git a/cpp/ql/src/semmle/code/cpp/ir/AliasedSSAIRSanity.ql b/cpp/ql/src/semmle/code/cpp/ir/AliasedSSAIRSanity.ql index 1db8bc52403..6725d4dfb31 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/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_ir.IRSanityImpl +import internal.aliased_ssa_ir.IRSanity diff --git a/cpp/ql/src/semmle/code/cpp/ir/IR.qll b/cpp/ql/src/semmle/code/cpp/ir/IR.qll index 787eaa14f21..ccfd455e800 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.raw_ir.IRImpl +import internal.raw_ir.IR diff --git a/cpp/ql/src/semmle/code/cpp/ir/IRSanity.ql b/cpp/ql/src/semmle/code/cpp/ir/IRSanity.ql index 35123e4ab9a..bb754bfd89f 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.raw_ir.IRSanityImpl +import internal.raw_ir.IRSanity diff --git a/cpp/ql/src/semmle/code/cpp/ir/PrintAliasedSSAIR.qll b/cpp/ql/src/semmle/code/cpp/ir/PrintAliasedSSAIR.qll index b3d9c0a1679..abca7660da5 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/PrintAliasedSSAIR.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/PrintAliasedSSAIR.qll @@ -1 +1 @@ -import internal.aliased_ssa_ir.PrintIRImpl +import internal.aliased_ssa_ir.PrintIR diff --git a/cpp/ql/src/semmle/code/cpp/ir/PrintIR.qll b/cpp/ql/src/semmle/code/cpp/ir/PrintIR.qll index e814c753e5a..d31a3c5fcfa 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.raw_ir.PrintIRImpl +import internal.raw_ir.PrintIR diff --git a/cpp/ql/src/semmle/code/cpp/ir/PrintSSAIR.qll b/cpp/ql/src/semmle/code/cpp/ir/PrintSSAIR.qll index dea6d135103..4faeb1cd000 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/PrintSSAIR.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/PrintSSAIR.qll @@ -1 +1 @@ -import internal.ssa_ir.PrintIRImpl +import internal.ssa_ir.PrintIR diff --git a/cpp/ql/src/semmle/code/cpp/ir/SSAIR.qll b/cpp/ql/src/semmle/code/cpp/ir/SSAIR.qll index 860ce7dc958..a20043415ba 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/SSAIR.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/SSAIR.qll @@ -1 +1 @@ -import internal.ssa_ir.IRImpl +import internal.ssa_ir.IR diff --git a/cpp/ql/src/semmle/code/cpp/ir/SSAIRSanity.ql b/cpp/ql/src/semmle/code/cpp/ir/SSAIRSanity.ql index ea84b916ba7..8cfc1fa8e77 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/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_ir.IRSanityImpl +import internal.ssa_ir.IRSanity diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/AliasAnalysis.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/AliasAnalysis.qll index 56137d54179..f3be51b63d2 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/AliasAnalysis.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/AliasAnalysis.qll @@ -1,6 +1,6 @@ private import AliasAnalysisInternal import cpp -private import IR +private import InputIR 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 index e050fe4a1df..96fbeb3e54b 100644 --- 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 @@ -1 +1 @@ -import semmle.code.cpp.ir.internal.ssa_ir.IRImpl as IR +import semmle.code.cpp.ir.internal.ssa_ir.IR as InputIR diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRImpl.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IR.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRImpl.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IR.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRSanityImpl.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRSanity.qll similarity index 54% rename from cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRSanityImpl.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRSanity.qll index f4a1d12de89..9e21452c1fb 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRSanityImpl.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRSanity.qll @@ -1,3 +1,3 @@ -private import IRImpl +private import IR import InstructionSanity diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/PrintIRImpl.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/PrintIR.qll similarity index 99% rename from cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/PrintIRImpl.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/PrintIR.qll index 2d4f4fdbe56..39614ea2152 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/PrintIRImpl.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/PrintIR.qll @@ -1,4 +1,4 @@ -private import IRImpl +private import IR import cpp private newtype TPrintableIRNode = 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 index fedfc0cca88..9c81d0c619d 100644 --- 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 @@ -1,3 +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 semmle.code.cpp.ir.internal.ssa_ir.IR as OldIR +import semmle.code.cpp.ir.internal.aliased_ssa_ir.IR as NewIR import SimpleSSA as Alias diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/SimpleSSA.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/SimpleSSA.qll index 48160719c4c..a2d8f3532ac 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/SimpleSSA.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/SimpleSSA.qll @@ -1,7 +1,7 @@ import SimpleSSAInternal import cpp import Alias -import IR +private import InputIR import semmle.code.cpp.ir.internal.Overlap private newtype TVirtualVariable = 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 index 237e051f234..759ace90fdb 100644 --- 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 @@ -1,3 +1,3 @@ import AliasAnalysis as Alias -import semmle.code.cpp.ir.internal.ssa_ir.IRImpl as IR +import semmle.code.cpp.ir.internal.ssa_ir.IR as InputIR diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRImpl.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IR.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRImpl.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IR.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRConstruction.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRConstruction.qll index 034365c9c76..509568dfef2 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRConstruction.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRConstruction.qll @@ -1,5 +1,5 @@ import cpp -import semmle.code.cpp.ir.internal.raw_ir.IRImpl +import semmle.code.cpp.ir.internal.raw_ir.IR private import semmle.code.cpp.ir.internal.TempVariableTag private import InstructionTag private import TranslatedElement diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRSanityImpl.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRSanity.qll similarity index 54% rename from cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRSanityImpl.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRSanity.qll index f4a1d12de89..9e21452c1fb 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRSanityImpl.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRSanity.qll @@ -1,3 +1,3 @@ -private import IRImpl +private import IR import InstructionSanity diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/PrintIRImpl.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/PrintIR.qll similarity index 99% rename from cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/PrintIRImpl.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/PrintIR.qll index 2d4f4fdbe56..39614ea2152 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/PrintIRImpl.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/PrintIR.qll @@ -1,4 +1,4 @@ -private import IRImpl +private import IR import cpp private newtype TPrintableIRNode = diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedElement.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedElement.qll index a77bc20151f..49f18da1672 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedElement.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedElement.qll @@ -1,5 +1,5 @@ import cpp -import semmle.code.cpp.ir.internal.raw_ir.IRImpl +import semmle.code.cpp.ir.internal.raw_ir.IR private import semmle.code.cpp.ir.internal.Opcode private import semmle.code.cpp.ir.internal.TempVariableTag private import InstructionTag diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedFunction.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedFunction.qll index 0fb3678316b..2a4849c6f97 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedFunction.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedFunction.qll @@ -1,5 +1,5 @@ import cpp -import semmle.code.cpp.ir.internal.raw_ir.IRImpl +import semmle.code.cpp.ir.internal.raw_ir.IR private import semmle.code.cpp.ir.internal.Opcode private import semmle.code.cpp.ir.internal.TempVariableTag private import InstructionTag diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/AliasAnalysis.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/AliasAnalysis.qll index 56137d54179..f3be51b63d2 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/AliasAnalysis.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/AliasAnalysis.qll @@ -1,6 +1,6 @@ private import AliasAnalysisInternal import cpp -private import IR +private import InputIR 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 index e21b68fa276..d46a4ae6b9e 100644 --- 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 @@ -1 +1 @@ -import semmle.code.cpp.ir.internal.raw_ir.IRImpl as IR +import semmle.code.cpp.ir.internal.raw_ir.IR as InputIR diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRImpl.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IR.qll similarity index 100% rename from cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRImpl.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IR.qll diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRSanityImpl.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRSanity.qll similarity index 54% rename from cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRSanityImpl.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRSanity.qll index f4a1d12de89..9e21452c1fb 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRSanityImpl.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRSanity.qll @@ -1,3 +1,3 @@ -private import IRImpl +private import IR import InstructionSanity diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/PrintIRImpl.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/PrintIR.qll similarity index 99% rename from cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/PrintIRImpl.qll rename to cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/PrintIR.qll index 3316bd2ced7..766315007cf 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/PrintIRImpl.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/PrintIR.qll @@ -1,4 +1,4 @@ -private import IRImpl +private import IR import cpp private newtype TPrintableIRNode = 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 index f0827218fc3..611a6084f4b 100644 --- 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 @@ -1,3 +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 semmle.code.cpp.ir.internal.raw_ir.IR as OldIR +import semmle.code.cpp.ir.internal.ssa_ir.IR as NewIR import SimpleSSA as Alias diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/SimpleSSA.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/SimpleSSA.qll index 48160719c4c..a2d8f3532ac 100644 --- a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/SimpleSSA.qll +++ b/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/SimpleSSA.qll @@ -1,7 +1,7 @@ import SimpleSSAInternal import cpp import Alias -import IR +private import InputIR import semmle.code.cpp.ir.internal.Overlap private newtype TVirtualVariable = 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 index c60a521506c..317ef40b7bf 100644 --- 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 @@ -1,3 +1,2 @@ import AliasAnalysis as Alias -import semmle.code.cpp.ir.internal.raw_ir.IRImpl as IR - +import semmle.code.cpp.ir.internal.raw_ir.IR as InputIR