Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

java: inline range test #17997

Merged
merged 5 commits into from
Nov 26, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
public class B {
public int forloop() {
int result = 0;
for (int i = 0; i < 10; i++) {// $ bound="i in [0..10]" bound="i in [0..9]"
yoff marked this conversation as resolved.
Show resolved Hide resolved
result = i; // $ bound="i in [0..9]"
}
return result; // $ bound="result in [0..9]"
}

public int forloopexit() {
int result = 0;
for (; result < 10;) { // $ bound="result in [0..10]"
result += 1; // $ bound="result in [0..9]"
}
return result; // $ bound="result = 10"
}

public int forloopexitstep() {
int result = 0;
for (; result < 10;) { // $ bound="result in [0..12]"
result += 3; // $ bound="result in [0..9]"
}
return result; // $ bound="result = 12"
}

public int forloopexitupd() {
int result = 0;
for (; result < 10; result++) { // $ bound="result in [0..9]" bound="result in [0..10]"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I will get that done.

}
return result; // $ bound="result = 10"
}

public int forloopexitnested() {
int result = 0;
for (; result < 10;) {
int i = 0;
for (; i < 3;) { // $ bound="i in [0..3]"
i += 1; // $ bound="i in [0..2]"
}
result += i; // $ bound="result in [0..9]" bound="i = 3"
}
return result; // $ MISSING:bound="result = 12"
}

public int emptyforloop() {
int result = 0;
for (int i = 0; i < 0; i++) { // $ bound="i = 0" bound="i in [0..-1]"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

result = i; // $ bound="i in [0..-1]"
}
return result; // $ bound="result = 0"
}

public int noloop() {
int result = 0;
result += 1; // $ bound="result = 0"
return result; // $ bound="result = 1"
}

public int foreachloop() {
int result = 0;
for (int i : new int[] {1, 2, 3, 4, 5}) {
result = i;
}
return result;
}

public int emptyforeachloop() {
int result = 0;
for (int i : new int[] {}) {
result = i;
}
return result;
}

public int whileloop() {
int result = 100;
while (result > 5) { // $ bound="result in [4..100]"
result = result - 2; // $ bound="result in [6..100]"
}
return result; // $ bound="result = 4"
}

public int oddwhileloop() {
int result = 101;
while (result > 5) { // $ bound="result in [5..101]"
result = result - 2; // $ bound="result in [7..101]"
}
return result; // $ bound="result = 5"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/**
* Inline range analysis tests for Java.
* See `shared/util/codeql/dataflow/test/InlineFlowTest.qll`
*/

import java
import semmle.code.java.dataflow.RangeAnalysis
private import codeql.util.test.InlineExpectationsTest
private import TestUtilities.internal.InlineExpectationsTestImpl
private import Make<Impl> as IET
yoff marked this conversation as resolved.
Show resolved Hide resolved

module RangeTest implements IET::TestSig {
string getARelevantTag() { result = "bound" }

predicate hasActualResult(Location location, string element, string tag, string value) {
tag = "bound" and
exists(Expr e, int lower, int upper |
constrained(e, lower, upper) and
e instanceof VarRead and
e.getCompilationUnit().fromSource()
|
location = e.getLocation() and
element = e.toString() and
if lower = upper
then value = "\"" + e.toString() + " = " + lower.toString() + "\""
else
value = "\"" + e.toString() + " in [" + lower.toString() + ".." + upper.toString() + "]\""
)
}

private predicate constrained(Expr e, int lower, int upper) {
lower = min(int delta | bounded(e, any(ZeroBound z), delta, false, _)) and
upper = min(int delta | bounded(e, any(ZeroBound z), delta, true, _))
yoff marked this conversation as resolved.
Show resolved Hide resolved
}
}

import IET::MakeTest<RangeTest>