*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64BlockEndOp.java	Mon Mar 20 17:39:29 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64BlockEndOp.java	Mon Mar 20 17:39:29 2017

*** 22,36 ****
--- 22,37 ----
   */
  
  package org.graalvm.compiler.lir.aarch64;
  
  import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
+ import org.graalvm.compiler.lir.LIRInstruction;
  import org.graalvm.compiler.lir.LIRInstructionClass;
- import org.graalvm.compiler.lir.StandardOp.AbstractBlockEndOp;
  import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
  
! public abstract class AArch64BlockEndOp extends AbstractBlockEndOp {
! public abstract class AArch64BlockEndOp extends LIRInstruction implements BlockEndOp {
  
      public static final LIRInstructionClass<AArch64BlockEndOp> TYPE = LIRInstructionClass.create(AArch64BlockEndOp.class);
  
      protected AArch64BlockEndOp(LIRInstructionClass<? extends AArch64BlockEndOp> c) {
          super(c);