Skip to content

Generate compilable code for non-finite floating-point values #36965

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

Generate compilable code for non-finite floating-point values #36965

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
22 changes: 20 additions & 2 deletions spring-core/src/main/java/org/springframework/aot/generate/ValueCodeGeneratorDelegates.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,10 +220,28 @@ private static class PrimitiveDelegate implements Delegate {
if (value instanceof Long) {
return CodeBlock.of("$LL", value);
}
if (value instanceof Float) {
if (value instanceof Float floatValue) {
if (Float.isNaN(floatValue)) {
return CodeBlock.of("$T.NaN", Float.class);
}
if (floatValue == Float.POSITIVE_INFINITY) {
return CodeBlock.of("$T.POSITIVE_INFINITY", Float.class);
}
if (floatValue == Float.NEGATIVE_INFINITY) {
return CodeBlock.of("$T.NEGATIVE_INFINITY", Float.class);
}
return CodeBlock.of("$LF", value);
}
if (value instanceof Double) {
if (value instanceof Double doubleValue) {
if (Double.isNaN(doubleValue)) {
return CodeBlock.of("$T.NaN", Double.class);
}
if (doubleValue == Double.POSITIVE_INFINITY) {
return CodeBlock.of("$T.POSITIVE_INFINITY", Double.class);
}
if (doubleValue == Double.NEGATIVE_INFINITY) {
return CodeBlock.of("$T.NEGATIVE_INFINITY", Double.class);
}
return CodeBlock.of("(double) $L", value);
}
if (value instanceof Character character) {
Expand Down
30 changes: 30 additions & 0 deletions spring-core/src/test/java/org/springframework/aot/generate/ValueCodeGeneratorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,36 @@ void generateWhenDouble() {
assertThat(generateCode(0.2)).hasToString("(double) 0.2");
}

@Test
void generateWhenFloatNaN() {
assertThat(generateCode(Float.NaN)).hasToString("java.lang.Float.NaN");
}

@Test
void generateWhenFloatPositiveInfinity() {
assertThat(generateCode(Float.POSITIVE_INFINITY)).hasToString("java.lang.Float.POSITIVE_INFINITY");
}

@Test
void generateWhenFloatNegativeInfinity() {
assertThat(generateCode(Float.NEGATIVE_INFINITY)).hasToString("java.lang.Float.NEGATIVE_INFINITY");
}

@Test
void generateWhenDoubleNaN() {
assertThat(generateCode(Double.NaN)).hasToString("java.lang.Double.NaN");
}

@Test
void generateWhenDoublePositiveInfinity() {
assertThat(generateCode(Double.POSITIVE_INFINITY)).hasToString("java.lang.Double.POSITIVE_INFINITY");
}

@Test
void generateWhenDoubleNegativeInfinity() {
assertThat(generateCode(Double.NEGATIVE_INFINITY)).hasToString("java.lang.Double.NEGATIVE_INFINITY");
}

@Test
void generateWhenChar() {
assertThat(generateCode('a')).hasToString("'a'");
Expand Down