Skip to content

Commit b2c94cc

Browse files
jbjjbj
committed
C++/C#/Java: Restore the AccessPathCons class
1 parent fbe3401 commit b2c94cc

File tree

19 files changed

+95
-95
lines changed

19 files changed

+95
-95
lines changed

‎cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl.qll‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1268,7 +1268,9 @@ private class AccessPathNil extends AccessPath, TNil {
12681268
override predicate pop(Content head, AccessPath tail) { none() }
12691269
}
12701270

1271-
private class AccessPathConsNil extends AccessPath, TConsNil {
1271+
abstract private class AccessPathCons extends AccessPath { }
1272+
1273+
private class AccessPathConsNil extends AccessPathCons, TConsNil {
12721274
override string toString() {
12731275
exists(Content f, DataFlowType t | this = TConsNil(f, t) |
12741276
result = f.toString() + " : " + ppReprType(t)
@@ -1284,7 +1286,7 @@ private class AccessPathConsNil extends AccessPath, TConsNil {
12841286
}
12851287
}
12861288

1287-
private class AccessPathConsCons extends AccessPath, TConsCons {
1289+
private class AccessPathConsCons extends AccessPathCons, TConsCons {
12881290
override string toString() {
12891291
exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) |
12901292
result = f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")"
@@ -1849,9 +1851,7 @@ private predicate pathIntoArg(
18491851
|
18501852
ap instanceof AccessPathNil and emptyAp = true
18511853
or
1852-
ap instanceof AccessPathConsNil and emptyAp = false
1853-
or
1854-
ap instanceof AccessPathConsCons and emptyAp = false
1854+
ap instanceof AccessPathCons and emptyAp = false
18551855
)
18561856
}
18571857

‎cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1268,7 +1268,9 @@ private class AccessPathNil extends AccessPath, TNil {
12681268
override predicate pop(Content head, AccessPath tail) { none() }
12691269
}
12701270

1271-
private class AccessPathConsNil extends AccessPath, TConsNil {
1271+
abstract private class AccessPathCons extends AccessPath { }
1272+
1273+
private class AccessPathConsNil extends AccessPathCons, TConsNil {
12721274
override string toString() {
12731275
exists(Content f, DataFlowType t | this = TConsNil(f, t) |
12741276
result = f.toString() + " : " + ppReprType(t)
@@ -1284,7 +1286,7 @@ private class AccessPathConsNil extends AccessPath, TConsNil {
12841286
}
12851287
}
12861288

1287-
private class AccessPathConsCons extends AccessPath, TConsCons {
1289+
private class AccessPathConsCons extends AccessPathCons, TConsCons {
12881290
override string toString() {
12891291
exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) |
12901292
result = f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")"
@@ -1849,9 +1851,7 @@ private predicate pathIntoArg(
18491851
|
18501852
ap instanceof AccessPathNil and emptyAp = true
18511853
or
1852-
ap instanceof AccessPathConsNil and emptyAp = false
1853-
or
1854-
ap instanceof AccessPathConsCons and emptyAp = false
1854+
ap instanceof AccessPathCons and emptyAp = false
18551855
)
18561856
}
18571857

‎cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1268,7 +1268,9 @@ private class AccessPathNil extends AccessPath, TNil {
12681268
override predicate pop(Content head, AccessPath tail) { none() }
12691269
}
12701270

1271-
private class AccessPathConsNil extends AccessPath, TConsNil {
1271+
abstract private class AccessPathCons extends AccessPath { }
1272+
1273+
private class AccessPathConsNil extends AccessPathCons, TConsNil {
12721274
override string toString() {
12731275
exists(Content f, DataFlowType t | this = TConsNil(f, t) |
12741276
result = f.toString() + " : " + ppReprType(t)
@@ -1284,7 +1286,7 @@ private class AccessPathConsNil extends AccessPath, TConsNil {
12841286
}
12851287
}
12861288

1287-
private class AccessPathConsCons extends AccessPath, TConsCons {
1289+
private class AccessPathConsCons extends AccessPathCons, TConsCons {
12881290
override string toString() {
12891291
exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) |
12901292
result = f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")"
@@ -1849,9 +1851,7 @@ private predicate pathIntoArg(
18491851
|
18501852
ap instanceof AccessPathNil and emptyAp = true
18511853
or
1852-
ap instanceof AccessPathConsNil and emptyAp = false
1853-
or
1854-
ap instanceof AccessPathConsCons and emptyAp = false
1854+
ap instanceof AccessPathCons and emptyAp = false
18551855
)
18561856
}
18571857

‎cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1268,7 +1268,9 @@ private class AccessPathNil extends AccessPath, TNil {
12681268
override predicate pop(Content head, AccessPath tail) { none() }
12691269
}
12701270

1271-
private class AccessPathConsNil extends AccessPath, TConsNil {
1271+
abstract private class AccessPathCons extends AccessPath { }
1272+
1273+
private class AccessPathConsNil extends AccessPathCons, TConsNil {
12721274
override string toString() {
12731275
exists(Content f, DataFlowType t | this = TConsNil(f, t) |
12741276
result = f.toString() + " : " + ppReprType(t)
@@ -1284,7 +1286,7 @@ private class AccessPathConsNil extends AccessPath, TConsNil {
12841286
}
12851287
}
12861288

1287-
private class AccessPathConsCons extends AccessPath, TConsCons {
1289+
private class AccessPathConsCons extends AccessPathCons, TConsCons {
12881290
override string toString() {
12891291
exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) |
12901292
result = f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")"
@@ -1849,9 +1851,7 @@ private predicate pathIntoArg(
18491851
|
18501852
ap instanceof AccessPathNil and emptyAp = true
18511853
or
1852-
ap instanceof AccessPathConsNil and emptyAp = false
1853-
or
1854-
ap instanceof AccessPathConsCons and emptyAp = false
1854+
ap instanceof AccessPathCons and emptyAp = false
18551855
)
18561856
}
18571857

‎cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1268,7 +1268,9 @@ private class AccessPathNil extends AccessPath, TNil {
12681268
override predicate pop(Content head, AccessPath tail) { none() }
12691269
}
12701270

1271-
private class AccessPathConsNil extends AccessPath, TConsNil {
1271+
abstract private class AccessPathCons extends AccessPath { }
1272+
1273+
private class AccessPathConsNil extends AccessPathCons, TConsNil {
12721274
override string toString() {
12731275
exists(Content f, DataFlowType t | this = TConsNil(f, t) |
12741276
result = f.toString() + " : " + ppReprType(t)
@@ -1284,7 +1286,7 @@ private class AccessPathConsNil extends AccessPath, TConsNil {
12841286
}
12851287
}
12861288

1287-
private class AccessPathConsCons extends AccessPath, TConsCons {
1289+
private class AccessPathConsCons extends AccessPathCons, TConsCons {
12881290
override string toString() {
12891291
exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) |
12901292
result = f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")"
@@ -1849,9 +1851,7 @@ private predicate pathIntoArg(
18491851
|
18501852
ap instanceof AccessPathNil and emptyAp = true
18511853
or
1852-
ap instanceof AccessPathConsNil and emptyAp = false
1853-
or
1854-
ap instanceof AccessPathConsCons and emptyAp = false
1854+
ap instanceof AccessPathCons and emptyAp = false
18551855
)
18561856
}
18571857

‎cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1268,7 +1268,9 @@ private class AccessPathNil extends AccessPath, TNil {
12681268
override predicate pop(Content head, AccessPath tail) { none() }
12691269
}
12701270

1271-
private class AccessPathConsNil extends AccessPath, TConsNil {
1271+
abstract private class AccessPathCons extends AccessPath { }
1272+
1273+
private class AccessPathConsNil extends AccessPathCons, TConsNil {
12721274
override string toString() {
12731275
exists(Content f, DataFlowType t | this = TConsNil(f, t) |
12741276
result = f.toString() + " : " + ppReprType(t)
@@ -1284,7 +1286,7 @@ private class AccessPathConsNil extends AccessPath, TConsNil {
12841286
}
12851287
}
12861288

1287-
private class AccessPathConsCons extends AccessPath, TConsCons {
1289+
private class AccessPathConsCons extends AccessPathCons, TConsCons {
12881290
override string toString() {
12891291
exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) |
12901292
result = f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")"
@@ -1849,9 +1851,7 @@ private predicate pathIntoArg(
18491851
|
18501852
ap instanceof AccessPathNil and emptyAp = true
18511853
or
1852-
ap instanceof AccessPathConsNil and emptyAp = false
1853-
or
1854-
ap instanceof AccessPathConsCons and emptyAp = false
1854+
ap instanceof AccessPathCons and emptyAp = false
18551855
)
18561856
}
18571857

‎cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1268,7 +1268,9 @@ private class AccessPathNil extends AccessPath, TNil {
12681268
override predicate pop(Content head, AccessPath tail) { none() }
12691269
}
12701270

1271-
private class AccessPathConsNil extends AccessPath, TConsNil {
1271+
abstract private class AccessPathCons extends AccessPath { }
1272+
1273+
private class AccessPathConsNil extends AccessPathCons, TConsNil {
12721274
override string toString() {
12731275
exists(Content f, DataFlowType t | this = TConsNil(f, t) |
12741276
result = f.toString() + " : " + ppReprType(t)
@@ -1284,7 +1286,7 @@ private class AccessPathConsNil extends AccessPath, TConsNil {
12841286
}
12851287
}
12861288

1287-
private class AccessPathConsCons extends AccessPath, TConsCons {
1289+
private class AccessPathConsCons extends AccessPathCons, TConsCons {
12881290
override string toString() {
12891291
exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) |
12901292
result = f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")"
@@ -1849,9 +1851,7 @@ private predicate pathIntoArg(
18491851
|
18501852
ap instanceof AccessPathNil and emptyAp = true
18511853
or
1852-
ap instanceof AccessPathConsNil and emptyAp = false
1853-
or
1854-
ap instanceof AccessPathConsCons and emptyAp = false
1854+
ap instanceof AccessPathCons and emptyAp = false
18551855
)
18561856
}
18571857

‎cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1268,7 +1268,9 @@ private class AccessPathNil extends AccessPath, TNil {
12681268
override predicate pop(Content head, AccessPath tail) { none() }
12691269
}
12701270

1271-
private class AccessPathConsNil extends AccessPath, TConsNil {
1271+
abstract private class AccessPathCons extends AccessPath { }
1272+
1273+
private class AccessPathConsNil extends AccessPathCons, TConsNil {
12721274
override string toString() {
12731275
exists(Content f, DataFlowType t | this = TConsNil(f, t) |
12741276
result = f.toString() + " : " + ppReprType(t)
@@ -1284,7 +1286,7 @@ private class AccessPathConsNil extends AccessPath, TConsNil {
12841286
}
12851287
}
12861288

1287-
private class AccessPathConsCons extends AccessPath, TConsCons {
1289+
private class AccessPathConsCons extends AccessPathCons, TConsCons {
12881290
override string toString() {
12891291
exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) |
12901292
result = f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")"
@@ -1849,9 +1851,7 @@ private predicate pathIntoArg(
18491851
|
18501852
ap instanceof AccessPathNil and emptyAp = true
18511853
or
1852-
ap instanceof AccessPathConsNil and emptyAp = false
1853-
or
1854-
ap instanceof AccessPathConsCons and emptyAp = false
1854+
ap instanceof AccessPathCons and emptyAp = false
18551855
)
18561856
}
18571857

‎cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1268,7 +1268,9 @@ private class AccessPathNil extends AccessPath, TNil {
12681268
override predicate pop(Content head, AccessPath tail) { none() }
12691269
}
12701270

1271-
private class AccessPathConsNil extends AccessPath, TConsNil {
1271+
abstract private class AccessPathCons extends AccessPath { }
1272+
1273+
private class AccessPathConsNil extends AccessPathCons, TConsNil {
12721274
override string toString() {
12731275
exists(Content f, DataFlowType t | this = TConsNil(f, t) |
12741276
result = f.toString() + " : " + ppReprType(t)
@@ -1284,7 +1286,7 @@ private class AccessPathConsNil extends AccessPath, TConsNil {
12841286
}
12851287
}
12861288

1287-
private class AccessPathConsCons extends AccessPath, TConsCons {
1289+
private class AccessPathConsCons extends AccessPathCons, TConsCons {
12881290
override string toString() {
12891291
exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) |
12901292
result = f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")"
@@ -1849,9 +1851,7 @@ private predicate pathIntoArg(
18491851
|
18501852
ap instanceof AccessPathNil and emptyAp = true
18511853
or
1852-
ap instanceof AccessPathConsNil and emptyAp = false
1853-
or
1854-
ap instanceof AccessPathConsCons and emptyAp = false
1854+
ap instanceof AccessPathCons and emptyAp = false
18551855
)
18561856
}
18571857

‎csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1268,7 +1268,9 @@ private class AccessPathNil extends AccessPath, TNil {
12681268
override predicate pop(Content head, AccessPath tail) { none() }
12691269
}
12701270

1271-
private class AccessPathConsNil extends AccessPath, TConsNil {
1271+
abstract private class AccessPathCons extends AccessPath { }
1272+
1273+
private class AccessPathConsNil extends AccessPathCons, TConsNil {
12721274
override string toString() {
12731275
exists(Content f, DataFlowType t | this = TConsNil(f, t) |
12741276
result = f.toString() + " : " + ppReprType(t)
@@ -1284,7 +1286,7 @@ private class AccessPathConsNil extends AccessPath, TConsNil {
12841286
}
12851287
}
12861288

1287-
private class AccessPathConsCons extends AccessPath, TConsCons {
1289+
private class AccessPathConsCons extends AccessPathCons, TConsCons {
12881290
override string toString() {
12891291
exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) |
12901292
result = f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")"
@@ -1849,9 +1851,7 @@ private predicate pathIntoArg(
18491851
|
18501852
ap instanceof AccessPathNil and emptyAp = true
18511853
or
1852-
ap instanceof AccessPathConsNil and emptyAp = false
1853-
or
1854-
ap instanceof AccessPathConsCons and emptyAp = false
1854+
ap instanceof AccessPathCons and emptyAp = false
18551855
)
18561856
}
18571857

0 commit comments

Comments
 (0)