[GR-54185] Don't try to commute address add on null pointer

PullRequest: graal/17858
simonis · May 30, 2024 · 07e8a71 · 07e8a71
2 parents 21ded9e + 3e473fb
commit 07e8a71
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/...jdk.graal.compiler/src/jdk/graal/compiler/core/aarch64/AArch64ArithmeticLIRGenerator.java b/...jdk.graal.compiler/src/jdk/graal/compiler/core/aarch64/AArch64ArithmeticLIRGenerator.java
@@ -450,7 +450,8 @@ public static boolean isAddSubtractConstant(JavaConstant constValue) {
             case Long:
                 return AArch64MacroAssembler.isAddSubtractImmediate(constValue.asLong(), true);
             case Object:
-                return constValue.isNull();
+                /* Object constants can't be encoded as immediates in add/subtract. */
+                return false;
             default:
                 throw GraalError.shouldNotReachHereUnexpectedValue(constValue.getJavaKind().getStackKind()); // ExcludeFromJacocoGeneratedReport
         }