Skip to content

Commit 1d2d872

Browse files
jbjjbj
authored
Merge pull request #2839 from MathiasVP/sync-ir-valuenumbering-internals
C++/C#: Fix sync config file for value numbering sharing
2 parents ddf6b4a + 59a1967 commit 1d2d872

18 files changed

Lines changed: 198 additions & 129 deletions

File tree

‎config/identical-files.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,12 @@
222222
"cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/PrintSSA.qll",
223223
"csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/internal/PrintSSA.qll"
224224
],
225-
"C++ IR ValueNumberInternal": [
225+
"IR ValueNumberInternal": [
226226
"cpp/ql/src/semmle/code/cpp/ir/implementation/raw/gvn/internal/ValueNumberingInternal.qll",
227227
"cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/gvn/internal/ValueNumberingInternal.qll",
228-
"cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/gvn/internal/ValueNumberingInternal.qll"
228+
"cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/gvn/internal/ValueNumberingInternal.qll",
229+
"csharp/ql/src/semmle/code/csharp/ir/implementation/raw/gvn/internal/ValueNumberingInternal.qll",
230+
"csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/gvn/internal/ValueNumberingInternal.qll"
229231
],
230232
"C++ IR ValueNumber": [
231233
"cpp/ql/src/semmle/code/cpp/ir/implementation/raw/gvn/ValueNumbering.qll",

‎cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/gvn/ValueNumbering.qll‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,19 @@ class ValueNumber extends TValueNumber {
2727
final Language::Location getLocation() {
2828
if
2929
exists(Instruction i |
30-
i = getAnInstruction() and not i.getLocation() instanceof UnknownLocation
30+
i = getAnInstruction() and not i.getLocation() instanceof Language::UnknownLocation
3131
)
3232
then
3333
result =
3434
min(Language::Location l |
35-
l = getAnInstruction().getLocation() and not l instanceof UnknownLocation
35+
l = getAnInstruction().getLocation() and not l instanceof Language::UnknownLocation
3636
|
3737
l
3838
order by
3939
l.getFile().getAbsolutePath(), l.getStartLine(), l.getStartColumn(), l.getEndLine(),
4040
l.getEndColumn()
4141
)
42-
else result instanceof UnknownDefaultLocation
42+
else result instanceof Language::UnknownDefaultLocation
4343
}
4444

4545
/**

‎cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/gvn/internal/ValueNumberingImports.qll‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
import semmle.code.cpp.ir.implementation.aliased_ssa.IR
22
import semmle.code.cpp.ir.internal.Overlap
33
import semmle.code.cpp.ir.internal.IRCppLanguage as Language
4-
import semmle.code.cpp.Location

‎cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/gvn/internal/ValueNumberingInternal.qll‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
private import ValueNumberingImports
2-
private import cpp
32

43
newtype TValueNumber =
54
TVariableAddressValueNumber(IRFunction irFunc, Language::AST ast) {
@@ -15,7 +14,7 @@ newtype TValueNumber =
1514
TStringConstantValueNumber(IRFunction irFunc, IRType type, string value) {
1615
stringConstantValueNumber(_, irFunc, type, value)
1716
} or
18-
TFieldAddressValueNumber(IRFunction irFunc, Field field, TValueNumber objectAddress) {
17+
TFieldAddressValueNumber(IRFunction irFunc, Language::Field field, TValueNumber objectAddress) {
1918
fieldAddressValueNumber(_, irFunc, field, objectAddress)
2019
} or
2120
TBinaryValueNumber(
@@ -33,7 +32,8 @@ newtype TValueNumber =
3332
unaryValueNumber(_, irFunc, opcode, operand)
3433
} or
3534
TInheritanceConversionValueNumber(
36-
IRFunction irFunc, Opcode opcode, Class baseClass, Class derivedClass, TValueNumber operand
35+
IRFunction irFunc, Opcode opcode, Language::Class baseClass, Language::Class derivedClass,
36+
TValueNumber operand
3737
) {
3838
inheritanceConversionValueNumber(_, irFunc, opcode, baseClass, derivedClass, operand)
3939
} or
@@ -136,7 +136,7 @@ private predicate initializeThisValueNumber(InitializeThisInstruction instr, IRF
136136
instr.getEnclosingIRFunction() = irFunc
137137
}
138138

139-
predicate constantValueNumber(
139+
private predicate constantValueNumber(
140140
ConstantInstruction instr, IRFunction irFunc, IRType type, string value
141141
) {
142142
instr.getEnclosingIRFunction() = irFunc and

‎cpp/ql/src/semmle/code/cpp/ir/implementation/raw/gvn/ValueNumbering.qll‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,19 @@ class ValueNumber extends TValueNumber {
2727
final Language::Location getLocation() {
2828
if
2929
exists(Instruction i |
30-
i = getAnInstruction() and not i.getLocation() instanceof UnknownLocation
30+
i = getAnInstruction() and not i.getLocation() instanceof Language::UnknownLocation
3131
)
3232
then
3333
result =
3434
min(Language::Location l |
35-
l = getAnInstruction().getLocation() and not l instanceof UnknownLocation
35+
l = getAnInstruction().getLocation() and not l instanceof Language::UnknownLocation
3636
|
3737
l
3838
order by
3939
l.getFile().getAbsolutePath(), l.getStartLine(), l.getStartColumn(), l.getEndLine(),
4040
l.getEndColumn()
4141
)
42-
else result instanceof UnknownDefaultLocation
42+
else result instanceof Language::UnknownDefaultLocation
4343
}
4444

4545
/**

‎cpp/ql/src/semmle/code/cpp/ir/implementation/raw/gvn/internal/ValueNumberingImports.qll‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
import semmle.code.cpp.ir.implementation.aliased_ssa.IR
22
import semmle.code.cpp.ir.internal.Overlap
33
import semmle.code.cpp.ir.internal.IRCppLanguage as Language
4-
import semmle.code.cpp.Location

‎cpp/ql/src/semmle/code/cpp/ir/implementation/raw/gvn/internal/ValueNumberingInternal.qll‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
private import ValueNumberingImports
2-
private import cpp
32

43
newtype TValueNumber =
54
TVariableAddressValueNumber(IRFunction irFunc, Language::AST ast) {
@@ -15,7 +14,7 @@ newtype TValueNumber =
1514
TStringConstantValueNumber(IRFunction irFunc, IRType type, string value) {
1615
stringConstantValueNumber(_, irFunc, type, value)
1716
} or
18-
TFieldAddressValueNumber(IRFunction irFunc, Field field, TValueNumber objectAddress) {
17+
TFieldAddressValueNumber(IRFunction irFunc, Language::Field field, TValueNumber objectAddress) {
1918
fieldAddressValueNumber(_, irFunc, field, objectAddress)
2019
} or
2120
TBinaryValueNumber(
@@ -33,7 +32,8 @@ newtype TValueNumber =
3332
unaryValueNumber(_, irFunc, opcode, operand)
3433
} or
3534
TInheritanceConversionValueNumber(
36-
IRFunction irFunc, Opcode opcode, Class baseClass, Class derivedClass, TValueNumber operand
35+
IRFunction irFunc, Opcode opcode, Language::Class baseClass, Language::Class derivedClass,
36+
TValueNumber operand
3737
) {
3838
inheritanceConversionValueNumber(_, irFunc, opcode, baseClass, derivedClass, operand)
3939
} or
@@ -136,7 +136,7 @@ private predicate initializeThisValueNumber(InitializeThisInstruction instr, IRF
136136
instr.getEnclosingIRFunction() = irFunc
137137
}
138138

139-
predicate constantValueNumber(
139+
private predicate constantValueNumber(
140140
ConstantInstruction instr, IRFunction irFunc, IRType type, string value
141141
) {
142142
instr.getEnclosingIRFunction() = irFunc and

‎cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/gvn/ValueNumbering.qll‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,19 @@ class ValueNumber extends TValueNumber {
2727
final Language::Location getLocation() {
2828
if
2929
exists(Instruction i |
30-
i = getAnInstruction() and not i.getLocation() instanceof UnknownLocation
30+
i = getAnInstruction() and not i.getLocation() instanceof Language::UnknownLocation
3131
)
3232
then
3333
result =
3434
min(Language::Location l |
35-
l = getAnInstruction().getLocation() and not l instanceof UnknownLocation
35+
l = getAnInstruction().getLocation() and not l instanceof Language::UnknownLocation
3636
|
3737
l
3838
order by
3939
l.getFile().getAbsolutePath(), l.getStartLine(), l.getStartColumn(), l.getEndLine(),
4040
l.getEndColumn()
4141
)
42-
else result instanceof UnknownDefaultLocation
42+
else result instanceof Language::UnknownDefaultLocation
4343
}
4444

4545
/**

‎cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/gvn/internal/ValueNumberingImports.qll‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
import semmle.code.cpp.ir.implementation.aliased_ssa.IR
22
import semmle.code.cpp.ir.internal.Overlap
33
import semmle.code.cpp.ir.internal.IRCppLanguage as Language
4-
import semmle.code.cpp.Location

‎cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/gvn/internal/ValueNumberingInternal.qll‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
private import ValueNumberingImports
2-
private import cpp
32

43
newtype TValueNumber =
54
TVariableAddressValueNumber(IRFunction irFunc, Language::AST ast) {
@@ -15,7 +14,7 @@ newtype TValueNumber =
1514
TStringConstantValueNumber(IRFunction irFunc, IRType type, string value) {
1615
stringConstantValueNumber(_, irFunc, type, value)
1716
} or
18-
TFieldAddressValueNumber(IRFunction irFunc, Field field, TValueNumber objectAddress) {
17+
TFieldAddressValueNumber(IRFunction irFunc, Language::Field field, TValueNumber objectAddress) {
1918
fieldAddressValueNumber(_, irFunc, field, objectAddress)
2019
} or
2120
TBinaryValueNumber(
@@ -33,7 +32,8 @@ newtype TValueNumber =
3332
unaryValueNumber(_, irFunc, opcode, operand)
3433
} or
3534
TInheritanceConversionValueNumber(
36-
IRFunction irFunc, Opcode opcode, Class baseClass, Class derivedClass, TValueNumber operand
35+
IRFunction irFunc, Opcode opcode, Language::Class baseClass, Language::Class derivedClass,
36+
TValueNumber operand
3737
) {
3838
inheritanceConversionValueNumber(_, irFunc, opcode, baseClass, derivedClass, operand)
3939
} or
@@ -136,7 +136,7 @@ private predicate initializeThisValueNumber(InitializeThisInstruction instr, IRF
136136
instr.getEnclosingIRFunction() = irFunc
137137
}
138138

139-
predicate constantValueNumber(
139+
private predicate constantValueNumber(
140140
ConstantInstruction instr, IRFunction irFunc, IRType type, string value
141141
) {
142142
instr.getEnclosingIRFunction() = irFunc and

0 commit comments

Comments
 (0)