src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ArrayCompareToOp.java

rev 52509 : [mq]: graal

*** 28,39 ****
  import static jdk.vm.ci.code.ValueUtil.asRegister;
  import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
  
  import org.graalvm.compiler.asm.Label;
  import org.graalvm.compiler.asm.aarch64.AArch64Address;
- import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
  import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ConditionFlag;
  import org.graalvm.compiler.core.common.LIRKind;
  import org.graalvm.compiler.lir.LIRInstructionClass;
  import org.graalvm.compiler.lir.Opcode;
  import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
  import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
--- 28,39 ----
  import static jdk.vm.ci.code.ValueUtil.asRegister;
  import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
  
  import org.graalvm.compiler.asm.Label;
  import org.graalvm.compiler.asm.aarch64.AArch64Address;
  import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ConditionFlag;
+ import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
  import org.graalvm.compiler.core.common.LIRKind;
  import org.graalvm.compiler.lir.LIRInstructionClass;
  import org.graalvm.compiler.lir.Opcode;
  import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
  import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
*** 76,87 ****
          super(TYPE);
          this.kind1 = kind1;
          this.kind2 = kind2;
  
          // Both offsets should be the same but better be safe than sorry.
!         this.array1BaseOffset = tool.getProviders().getArrayOffsetProvider().arrayBaseOffset(kind1);
!         this.array2BaseOffset = tool.getProviders().getArrayOffsetProvider().arrayBaseOffset(kind2);
  
          this.resultValue = result;
  
          this.array1Value = array1;
          this.array2Value = array2;
--- 76,87 ----
          super(TYPE);
          this.kind1 = kind1;
          this.kind2 = kind2;
  
          // Both offsets should be the same but better be safe than sorry.
!         this.array1BaseOffset = tool.getProviders().getMetaAccess().getArrayBaseOffset(kind1);
!         this.array2BaseOffset = tool.getProviders().getMetaAccess().getArrayBaseOffset(kind2);
  
          this.resultValue = result;
  
          this.array1Value = array1;
          this.array2Value = array2;