Skip to content

Fix compiled SpEL > and >= comparisons with NaN #37574

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
CCCLL wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −2
Open

Fix compiled SpEL > and >= comparisons with NaN #37574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions spring-expression/src/main/java/org/springframework/expression/spel/ast/Operator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,12 +222,15 @@ protected void generateComparisonCode(MethodVisitor mv, CodeFlow cf, int compIns
}

// assert: SpelCompiler.boxingCompatible(leftDesc, rightDesc)
// For OpGT and OpGE, use DCMPL/FCMPL (NaN yields -1) like javac, so that
// a comparison with NaN is false; DCMPG/FCMPG (NaN yields 1) otherwise.
boolean greaterThan = (compInstruction1 == IFLE || compInstruction1 == IFLT);
if (targetType == 'D') {
mv.visitInsn(DCMPG);
mv.visitInsn(greaterThan ? DCMPL : DCMPG);
mv.visitJumpInsn(compInstruction1, elseTarget);
}
else if (targetType == 'F') {
mv.visitInsn(FCMPG);
mv.visitInsn(greaterThan ? FCMPL : FCMPG);
mv.visitJumpInsn(compInstruction1, elseTarget);
}
else if (targetType == 'J') {
Expand Down
14 changes: 14 additions & 0 deletions ...ssion/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -962,6 +962,20 @@ void opGe() {
assertThat((Boolean) expression.getValue()).isTrue();
}

@ParameterizedTest
@ValueSource(strings = {
"T(Double).NaN > 1.0d", "1.0d > T(Double).NaN", "T(Double).NaN >= 1.0d", "1.0d >= T(Double).NaN",
"T(Double).NaN < 1.0d", "1.0d < T(Double).NaN", "T(Double).NaN <= 1.0d", "1.0d <= T(Double).NaN",
"T(Float).NaN > 1.0f", "1.0f > T(Float).NaN", "T(Float).NaN >= 1.0f", "1.0f >= T(Float).NaN",
"T(Float).NaN < 1.0f", "1.0f < T(Float).NaN", "T(Float).NaN <= 1.0f", "1.0f <= T(Float).NaN"
})
void relationalOperatorsWithNaN(String expressionString) {
expression = parse(expressionString);
assertThat((Boolean) expression.getValue()).isFalse();
assertCanCompile(expression);
assertThat((Boolean) expression.getValue()).isFalse();
}

@Test
void opEq() {
String tvar = "35";
Expand Down