mirror of
https://github.com/github/codeql.git
synced 2025-12-16 16:53:25 +01:00
C++: More IR reshuffling
Remove redundant "_ir" suffix. Move non-user-importable modules into "implementation" directory.
This commit is contained in:
@@ -1,3 +1,3 @@
|
||||
// Most queries should operate on the aliased SSA IR, so that's what we expose
|
||||
// publically as the "IR".
|
||||
import internal.aliased_ssa_ir.IR
|
||||
import internal.aliased_ssa.IR
|
||||
|
||||
@@ -5,4 +5,4 @@
|
||||
* @id cpp/ir-sanity-check
|
||||
*/
|
||||
|
||||
import internal.aliased_ssa_ir.IRSanity
|
||||
import internal.aliased_ssa.IRSanity
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
import internal.Opcode
|
||||
@@ -5,4 +5,4 @@
|
||||
* @kind graph
|
||||
*/
|
||||
|
||||
import internal.aliased_ssa_ir.PrintIR
|
||||
import internal.aliased_ssa.PrintIR
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import cpp
|
||||
private import internal.TempVariableTag
|
||||
private import semmle.code.cpp.ir.internal.TempVariableTag
|
||||
|
||||
class TempVariableTag extends TTempVariableTag {
|
||||
string toString() {
|
||||
@@ -0,0 +1 @@
|
||||
import semmle.code.cpp.ir.internal.unaliased_ssa.IR as InputIR
|
||||
@@ -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
|
||||
@@ -1,7 +1,7 @@
|
||||
private import IRInternal
|
||||
private import IRBlockConstruction
|
||||
import Instruction
|
||||
import semmle.code.cpp.ir.EdgeKind
|
||||
import semmle.code.cpp.ir.implementation.EdgeKind
|
||||
|
||||
class IRBlock extends TIRBlock {
|
||||
final string toString() {
|
||||
@@ -1,7 +1,7 @@
|
||||
private import 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 =
|
||||
@@ -4,10 +4,10 @@ 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;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import SSAConstructionInternal
|
||||
import cpp
|
||||
private import semmle.code.cpp.ir.internal.Opcode
|
||||
private import semmle.code.cpp.ir.implementation.Opcode
|
||||
import NewIR
|
||||
|
||||
import Cached
|
||||
@@ -0,0 +1,3 @@
|
||||
import semmle.code.cpp.ir.internal.unaliased_ssa.IR as OldIR
|
||||
import semmle.code.cpp.ir.internal.aliased_ssa.IR as NewIR
|
||||
import SimpleSSA as Alias
|
||||
@@ -0,0 +1,3 @@
|
||||
import AliasAnalysis as Alias
|
||||
import semmle.code.cpp.ir.internal.unaliased_ssa.IR as InputIR
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
import semmle.code.cpp.ir.internal.ssa_ir.IR as InputIR
|
||||
@@ -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
|
||||
@@ -1,3 +0,0 @@
|
||||
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
|
||||
@@ -1,3 +0,0 @@
|
||||
import AliasAnalysis as Alias
|
||||
import semmle.code.cpp.ir.internal.ssa_ir.IR as InputIR
|
||||
|
||||
7
cpp/ql/src/semmle/code/cpp/ir/internal/raw/IR.qll
Normal file
7
cpp/ql/src/semmle/code/cpp/ir/internal/raw/IR.qll
Normal file
@@ -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
|
||||
@@ -1,7 +1,7 @@
|
||||
private import IRInternal
|
||||
private import IRBlockConstruction
|
||||
import Instruction
|
||||
import semmle.code.cpp.ir.EdgeKind
|
||||
import semmle.code.cpp.ir.implementation.EdgeKind
|
||||
|
||||
class IRBlock extends TIRBlock {
|
||||
final string toString() {
|
||||
@@ -1,7 +1,7 @@
|
||||
private import IRInternal
|
||||
import 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
|
||||
@@ -1,5 +1,5 @@
|
||||
import cpp
|
||||
import semmle.code.cpp.ir.internal.raw_ir.IR
|
||||
import semmle.code.cpp.ir.internal.raw.IR
|
||||
private import semmle.code.cpp.ir.internal.TempVariableTag
|
||||
private import InstructionTag
|
||||
private import TranslatedElement
|
||||
@@ -1,7 +1,7 @@
|
||||
private import 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 =
|
||||
@@ -4,10 +4,10 @@ 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;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import cpp
|
||||
private import semmle.code.cpp.ir.internal.Opcode
|
||||
private import semmle.code.cpp.ir.implementation.Opcode
|
||||
private import InstructionTag
|
||||
private import TranslatedElement
|
||||
private import TranslatedExpr
|
||||
@@ -1,5 +1,5 @@
|
||||
import cpp
|
||||
private import semmle.code.cpp.ir.internal.Opcode
|
||||
private import semmle.code.cpp.ir.implementation.Opcode
|
||||
private import InstructionTag
|
||||
private import TranslatedElement
|
||||
private import TranslatedExpr
|
||||
@@ -1,6 +1,6 @@
|
||||
import cpp
|
||||
import semmle.code.cpp.ir.internal.raw_ir.IR
|
||||
private import semmle.code.cpp.ir.internal.Opcode
|
||||
import semmle.code.cpp.ir.internal.raw.IR
|
||||
private import semmle.code.cpp.ir.implementation.Opcode
|
||||
private import semmle.code.cpp.ir.internal.TempVariableTag
|
||||
private import InstructionTag
|
||||
private import TranslatedCondition
|
||||
@@ -1,5 +1,5 @@
|
||||
import cpp
|
||||
private import semmle.code.cpp.ir.internal.Opcode
|
||||
private import semmle.code.cpp.ir.implementation.Opcode
|
||||
private import semmle.code.cpp.ir.internal.TempVariableTag
|
||||
private import InstructionTag
|
||||
private import TranslatedCondition
|
||||
@@ -1,6 +1,6 @@
|
||||
import cpp
|
||||
import semmle.code.cpp.ir.internal.raw_ir.IR
|
||||
private import semmle.code.cpp.ir.internal.Opcode
|
||||
import semmle.code.cpp.ir.internal.raw.IR
|
||||
private import semmle.code.cpp.ir.implementation.Opcode
|
||||
private import semmle.code.cpp.ir.internal.TempVariableTag
|
||||
private import InstructionTag
|
||||
private import TranslatedElement
|
||||
@@ -1,5 +1,5 @@
|
||||
import cpp
|
||||
private import semmle.code.cpp.ir.internal.Opcode
|
||||
private import semmle.code.cpp.ir.implementation.Opcode
|
||||
private import InstructionTag
|
||||
private import TranslatedElement
|
||||
private import TranslatedExpr
|
||||
@@ -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
|
||||
@@ -1 +0,0 @@
|
||||
import semmle.code.cpp.ir.internal.raw_ir.IR as InputIR
|
||||
@@ -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
|
||||
@@ -1,3 +0,0 @@
|
||||
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
|
||||
@@ -1,2 +0,0 @@
|
||||
import AliasAnalysis as Alias
|
||||
import semmle.code.cpp.ir.internal.raw_ir.IR as InputIR
|
||||
@@ -0,0 +1 @@
|
||||
import semmle.code.cpp.ir.internal.raw.IR as InputIR
|
||||
@@ -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
|
||||
@@ -1,7 +1,7 @@
|
||||
private import IRInternal
|
||||
private import IRBlockConstruction
|
||||
import Instruction
|
||||
import semmle.code.cpp.ir.EdgeKind
|
||||
import semmle.code.cpp.ir.implementation.EdgeKind
|
||||
|
||||
class IRBlock extends TIRBlock {
|
||||
final string toString() {
|
||||
@@ -1,7 +1,7 @@
|
||||
private import 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 =
|
||||
@@ -4,10 +4,10 @@ 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;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import SSAConstructionInternal
|
||||
import cpp
|
||||
private import semmle.code.cpp.ir.internal.Opcode
|
||||
private import semmle.code.cpp.ir.implementation.Opcode
|
||||
import NewIR
|
||||
|
||||
import Cached
|
||||
@@ -0,0 +1,3 @@
|
||||
import semmle.code.cpp.ir.internal.raw.IR as OldIR
|
||||
import semmle.code.cpp.ir.internal.unaliased_ssa.IR as NewIR
|
||||
import SimpleSSA as Alias
|
||||
@@ -0,0 +1,2 @@
|
||||
import AliasAnalysis as Alias
|
||||
import semmle.code.cpp.ir.internal.raw.IR as InputIR
|
||||
@@ -1,5 +1,5 @@
|
||||
import default
|
||||
import semmle.code.cpp.ir.internal.ssa_ir.IR
|
||||
import semmle.code.cpp.ir.IR
|
||||
import semmle.code.cpp.ir.internal.IntegerConstant
|
||||
|
||||
language[monotonicAggregates]
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
semmle/code/cpp/ir/internal/raw_ir/IRSanity.ql
|
||||
@@ -1 +0,0 @@
|
||||
semmle/code/cpp/ir/internal/ssa_ir/IRSanity.ql
|
||||
@@ -1 +1 @@
|
||||
semmle/code/cpp/ir/internal/raw_ir/PrintIR.ql
|
||||
semmle/code/cpp/ir/internal/raw/PrintIR.ql
|
||||
1
cpp/ql/test/library-tests/ir/ir/raw_sanity.qlref
Normal file
1
cpp/ql/test/library-tests/ir/ir/raw_sanity.qlref
Normal file
@@ -0,0 +1 @@
|
||||
semmle/code/cpp/ir/internal/raw/IRSanity.ql
|
||||
@@ -1 +0,0 @@
|
||||
semmle/code/cpp/ir/internal/ssa_ir/PrintIR.ql
|
||||
1
cpp/ql/test/library-tests/ir/ir/unaliased_ssa_ir.qlref
Normal file
1
cpp/ql/test/library-tests/ir/ir/unaliased_ssa_ir.qlref
Normal file
@@ -0,0 +1 @@
|
||||
semmle/code/cpp/ir/internal/unaliased_ssa/PrintIR.ql
|
||||
@@ -0,0 +1 @@
|
||||
semmle/code/cpp/ir/internal/unaliased_ssa/IRSanity.ql
|
||||
Reference in New Issue
Block a user