*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64MacroAssembler.java	Fri Jul  7 09:29:23 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64MacroAssembler.java	Fri Jul  7 09:29:22 2017

*** 144,157 ****
--- 144,157 ----
                  } else {
                      boolean needsScratch = !isArithmeticImmediate(displacement);
                      return new AddressGenerationPlan(ADD_TO_BASE, REGISTER_OFFSET, needsScratch);
                  }
              } else {
!                 if (NumUtil.isSignedNbit(9, displacement)) {
                      return new AddressGenerationPlan(NO_WORK, IMMEDIATE_UNSCALED, false);
                  } else if (displacementScalable && NumUtil.isUnsignedNbit(12, scaledDisplacement)) {
!                 if (displacementScalable && NumUtil.isUnsignedNbit(12, scaledDisplacement)) {
                      return new AddressGenerationPlan(NO_WORK, IMMEDIATE_SCALED, false);
+                 } else if (NumUtil.isSignedNbit(9, displacement)) {
+                     return new AddressGenerationPlan(NO_WORK, IMMEDIATE_UNSCALED, false);
                  } else {
                      boolean needsScratch = !isArithmeticImmediate(displacement);
                      return new AddressGenerationPlan(ADD_TO_BASE, REGISTER_OFFSET, needsScratch);
                  }
              }