Skip to content

Commit aa337c7

Browse files
MathiasVPMathiasVP
committed
C++: Update import paths in tests and experimental queries.
1 parent 4c5ca08 commit aa337c7

File tree

7 files changed

+30
-29
lines changed

7 files changed

+30
-29
lines changed

‎cpp/ql/src/experimental/Likely Bugs/ArrayAccessProductFlow.ql

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@
1111

1212
import cpp
1313
import experimental.semmle.code.cpp.dataflow.ProductFlow
14-
import experimental.semmle.code.cpp.semantic.analysis.RangeAnalysis
15-
import experimental.semmle.code.cpp.rangeanalysis.Bound
16-
import experimental.semmle.code.cpp.semantic.SemanticExprSpecific
14+
import semmle.code.cpp.rangeanalysis.new.internal.semantic.analysis.RangeAnalysis
15+
import semmle.code.cpp.rangeanalysis.new.internal.semantic.SemanticBound
16+
import semmle.code.cpp.rangeanalysis.new.internal.semantic.SemanticExprSpecific
17+
import semmle.code.cpp.rangeanalysis.new.internal.semantic.analysis.Bound
1718
import semmle.code.cpp.ir.IR
1819
import semmle.code.cpp.valuenumbering.GlobalValueNumbering
1920
import semmle.code.cpp.models.interfaces.Allocation
@@ -34,7 +35,7 @@ class PhpEmalloc extends AllocationFunction {
3435
override int getSizeArg() { result = 0 }
3536
}
3637

37-
predicate bounded(Instruction i, Bound b, int delta, boolean upper) {
38+
predicate bounded(Instruction i, SemBound b, int delta, boolean upper) {
3839
// TODO: reason
3940
semBounded(getSemanticExpr(i), b, delta, upper, _)
4041
}

‎cpp/ql/src/experimental/Likely Bugs/OverrunWriteProductFlow.ql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ import experimental.semmle.code.cpp.dataflow.ProductFlow
1717
import semmle.code.cpp.ir.IR
1818
import semmle.code.cpp.models.interfaces.Allocation
1919
import semmle.code.cpp.models.interfaces.ArrayFunction
20-
import experimental.semmle.code.cpp.semantic.analysis.RangeAnalysis
21-
import experimental.semmle.code.cpp.semantic.SemanticBound
22-
import experimental.semmle.code.cpp.semantic.SemanticExprSpecific
20+
import semmle.code.cpp.rangeanalysis.new.internal.semantic.analysis.RangeAnalysis
21+
import semmle.code.cpp.rangeanalysis.new.internal.semantic.SemanticBound
22+
import semmle.code.cpp.rangeanalysis.new.internal.semantic.SemanticExprSpecific
2323
import DataFlow::PathGraph
2424

2525
pragma[nomagic]

‎cpp/ql/src/experimental/Security/CWE/CWE-193/ConstantSizeArrayOffByOne.ql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
* experimental
1111
*/
1212

13-
import experimental.semmle.code.cpp.semantic.analysis.RangeAnalysis
14-
import experimental.semmle.code.cpp.semantic.SemanticBound
15-
import experimental.semmle.code.cpp.semantic.SemanticExprSpecific
13+
import semmle.code.cpp.rangeanalysis.new.internal.semantic.analysis.RangeAnalysis
14+
import semmle.code.cpp.rangeanalysis.new.internal.semantic.SemanticBound
15+
import semmle.code.cpp.rangeanalysis.new.internal.semantic.SemanticExprSpecific
1616
import semmle.code.cpp.ir.IR
1717
import semmle.code.cpp.ir.dataflow.DataFlow
1818
import PointerArithmeticToDerefFlow::PathGraph

‎cpp/ql/src/experimental/Security/CWE/CWE-193/InvalidPointerDeref.ql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717

1818
import cpp
1919
import experimental.semmle.code.cpp.dataflow.ProductFlow
20-
import experimental.semmle.code.cpp.semantic.analysis.RangeAnalysis
21-
import experimental.semmle.code.cpp.semantic.SemanticBound
22-
import experimental.semmle.code.cpp.semantic.SemanticExprSpecific
20+
import semmle.code.cpp.rangeanalysis.new.internal.semantic.analysis.RangeAnalysis
21+
import semmle.code.cpp.rangeanalysis.new.internal.semantic.SemanticBound
22+
import semmle.code.cpp.rangeanalysis.new.internal.semantic.SemanticExprSpecific
2323
import semmle.code.cpp.ir.IR
2424

2525
pragma[nomagic]

‎cpp/ql/test/library-tests/ir/modulus-analysis/ModulusAnalysis.ql

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import cpp
2-
import experimental.semmle.code.cpp.semantic.analysis.ModulusAnalysis
3-
import experimental.semmle.code.cpp.semantic.Semantic
4-
import experimental.semmle.code.cpp.semantic.analysis.RangeUtils
5-
import experimental.semmle.code.cpp.semantic.analysis.FloatDelta
6-
import experimental.semmle.code.cpp.semantic.analysis.RangeAnalysisSpecific
7-
import experimental.semmle.code.cpp.semantic.analysis.RangeAnalysisImpl
8-
import experimental.semmle.code.cpp.semantic.SemanticExprSpecific
2+
import semmle.code.cpp.rangeanalysis.new.internal.semantic.analysis.ModulusAnalysis
3+
import semmle.code.cpp.rangeanalysis.new.internal.semantic.Semantic
4+
import semmle.code.cpp.rangeanalysis.new.internal.semantic.analysis.RangeUtils
5+
import semmle.code.cpp.rangeanalysis.new.internal.semantic.analysis.FloatDelta
6+
import semmle.code.cpp.rangeanalysis.new.internal.semantic.analysis.RangeAnalysisSpecific
7+
import semmle.code.cpp.rangeanalysis.new.internal.semantic.analysis.RangeAnalysisImpl
8+
import semmle.code.cpp.rangeanalysis.new.internal.semantic.SemanticExprSpecific
99
import semmle.code.cpp.ir.IR as IR
1010
import TestUtilities.InlineExpectationsTest
1111

‎cpp/ql/test/library-tests/ir/range-analysis/RangeAnalysis.ql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import cpp
2-
import experimental.semmle.code.cpp.semantic.analysis.RangeAnalysis
3-
import experimental.semmle.code.cpp.semantic.Semantic
4-
import experimental.semmle.code.cpp.semantic.SemanticExprSpecific
2+
import semmle.code.cpp.rangeanalysis.new.internal.semantic.analysis.RangeAnalysis
3+
import semmle.code.cpp.rangeanalysis.new.internal.semantic.Semantic
4+
import semmle.code.cpp.rangeanalysis.new.internal.semantic.SemanticExprSpecific
55
import semmle.code.cpp.ir.IR as IR
66
import TestUtilities.InlineExpectationsTest
77

‎cpp/ql/test/library-tests/ir/sign-analysis/SignAnalysis.ql

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import cpp
2-
import experimental.semmle.code.cpp.semantic.analysis.SignAnalysisCommon
3-
import experimental.semmle.code.cpp.semantic.Semantic
4-
import experimental.semmle.code.cpp.semantic.analysis.RangeUtils
5-
import experimental.semmle.code.cpp.semantic.analysis.FloatDelta
6-
import experimental.semmle.code.cpp.semantic.analysis.RangeAnalysisSpecific
7-
import experimental.semmle.code.cpp.semantic.SemanticExprSpecific
2+
import semmle.code.cpp.rangeanalysis.new.internal.semantic.analysis.SignAnalysisCommon
3+
import semmle.code.cpp.rangeanalysis.new.internal.semantic.Semantic
4+
import semmle.code.cpp.rangeanalysis.new.internal.semantic.analysis.RangeUtils
5+
import semmle.code.cpp.rangeanalysis.new.internal.semantic.analysis.FloatDelta
6+
import semmle.code.cpp.rangeanalysis.new.internal.semantic.analysis.RangeAnalysisSpecific
7+
import semmle.code.cpp.rangeanalysis.new.internal.semantic.SemanticExprSpecific
88
import semmle.code.cpp.ir.IR as IR
99
import TestUtilities.InlineExpectationsTest
1010

0 commit comments

Comments
 (0)