Skip to content

SimplifyBooleanExpressionVisitor: do not drop operands with side effects #8447

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.

Sign up for GitHub

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

Open
martinfrancois wants to merge 3 commits into
base: main
Choose a base branch
from
Open

SimplifyBooleanExpressionVisitor: do not drop operands with side effects #8447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
633a56a
SimplifyBooleanExpressionVisitor: do not drop operands with side effects
martinfrancois Aug 10, 2026
e7cfc8a
Merge branch 'main' into fix/simplify-boolean-expression-preserve-eva…
timtebeek Aug 11, 2026
fd78de7
Guard type tests outside Java and trim commentary
timtebeek Aug 11, 2026
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
23 changes: 23 additions & 0 deletions ...vy/src/test/java/org/openrewrite/groovy/cleanup/SimplifyBooleanExpressionVisitorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,29 @@ def doubleNegation(boolean g) {
);
}

@Test
void retainPropertyReadThatMayCallAGetter() {
rewriteRun(
groovy(
"""
class A {
boolean getFlag() {
println("effect")
true
}
}
class B {
def m(A a) {
boolean b = a.flag && false
boolean c = a.flag || true
boolean d = a.flag && a.flag
}
}
"""
)
);
}

@Test
void simplifyNotEqualsFalse() {
rewriteRun(
Expand Down
286 changes: 286 additions & 0 deletions ...test/src/test/java/org/openrewrite/java/cleanup/SimplifyBooleanExpressionVisitorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,6 +765,292 @@ boolean booleanExpression() {
);
}

@Test
void retainEvaluationDroppedByBooleanIdentities() {
rewriteRun(
java(
"""
class Test {
static class State {
boolean value;
}

boolean effect() {
return true;
}

State next() {
return new State();
}

String nextString() {
return "";
}

boolean andFalse() {
return effect() && false;
}

boolean orTrue() {
return effect() || true;
}

boolean repeatedField() {
return next().value && next().value;
}

boolean repeatedEquals() {
return nextString().equals(nextString());
}
}
"""
)
);
}

@Test
void retainEvaluationNestedInsideDroppedOperand() {
rewriteRun(
java(
"""
class Test {
static class State {
boolean value;
}

boolean[] flags = new boolean[1];

State next() {
return new State();
}

Boolean boxed() {
return Boolean.TRUE;
}

int denominator() {
return 0;
}

int index() {
return 0;
}

boolean nestedInFieldAccess() {
return next().value && false;
}

boolean nestedInArrayAccess() {
return flags[index()] || true;
}

boolean nestedInCast() {
return (boolean) boxed() && false;
}

boolean nestedInParentheses() {
return /*keep*/(next().value) || true;
}

boolean nestedInDivision() {
return 1 / denominator() > 0 && false;
}
}
"""
)
);
}

@Test
void retainEvaluationRejectedWithoutAnyMethodCall() {
rewriteRun(
java(
"""
class Test {
boolean[] flags = new boolean[1];
Boolean boxed = Boolean.TRUE;
int zero = 0;
int counter;

boolean arrayAccess() {
return flags[0] && false;
}

boolean cast() {
return (boolean) boxed || true;
}

boolean division() {
return 1 / zero > 0 && false;
}

boolean modulo() {
return 1 % zero > 0 || true;
}

boolean increment() {
return counter++ > 0 && false;
}

boolean concatenation() {
return ("a" + boxed).isEmpty() && false;
}
}
"""
)
);
}

@Test
void retainVolatileReads() {
rewriteRun(
java(
"""
class Test {
volatile boolean flag;

boolean andFalse() {
return flag && false;
}

boolean orTrue() {
return flag || true;
}

boolean repeated() {
return flag && flag;
}
}
"""
)
);
}

@Test
void removeShortCircuitedRightOperand() {
rewriteRun(
java(
"""
class Test {
boolean effect() {
return true;
}

boolean andFalse() {
return false && effect();
}

boolean orTrue() {
return true || effect();
}
}
""",
"""
class Test {
boolean effect() {
return true;
}

boolean andFalse() {
return false;
}

boolean orTrue() {
return true;
}
}
"""
)
);
}

@Test
void retainPatternVariableDeclaredByShortCircuitedOperand() {
rewriteRun(
java(
"""
class Test {
int andFalse(Object o) {
if (false && o instanceof String s) {
return s.length();
}
return 0;
}

int orTrue(Object o) {
if (true || !(o instanceof String s)) {
return 0;
}
return s.length();
}
}
"""
)
);
}

@Test
void dropShortCircuitedOperandWhosePatternVariableCannotEscape() {
rewriteRun(
java(
"""
import java.util.List;

class Test {
boolean orTrue(List<Object> l) {
return true || l.stream().anyMatch(o -> o instanceof String s && !s.isEmpty());
}
}
""",
"""
import java.util.List;

class Test {
boolean orTrue(List<Object> l) {
return true;
}
}
"""
)
);
}

@Test
void stillSimplifyEvaluationFreeIdentities() {
rewriteRun(
java(
"""
class Test {
boolean field;

void m(boolean a, String s) {
boolean b = a && false;
boolean c = a || true;
boolean d = a && a;
boolean e = a || a;
boolean f = this.field && false;
boolean g = s.equals(s);
}
}
""",
"""
class Test {
boolean field;

void m(boolean a, String s) {
boolean b = false;
boolean c = true;
boolean d = a;
boolean e = a;
boolean f = false;
boolean g = true;
}
}
"""
)
);
}

@CsvSource(delimiterString = "//", textBlock = """
a == null || a.isEmpty() // a == null || a.isEmpty()
a == null || !a.isEmpty() // a == null || !a.isEmpty()
Expand Down
Loading
Loading