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

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 2015, 2015, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

*** 20,64 ****
--- 20,64 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package org.graalvm.compiler.lir.sparc;
  
  import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
  import static jdk.vm.ci.code.ValueUtil.asRegister;
+ import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
  
  import org.graalvm.compiler.asm.sparc.SPARCAssembler;
  import org.graalvm.compiler.asm.sparc.SPARCAssembler.Opfs;
  import org.graalvm.compiler.asm.sparc.SPARCMacroAssembler;
  import org.graalvm.compiler.core.common.LIRKind;
  import org.graalvm.compiler.lir.LIRFrameState;
  import org.graalvm.compiler.lir.LIRInstructionClass;
  import org.graalvm.compiler.lir.Opcode;
  import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
  
! import jdk.vm.ci.meta.AllocatableValue;
  import jdk.vm.ci.sparc.SPARC;
  import jdk.vm.ci.sparc.SPARCKind;
  
  public final class SPARCOPFOp extends SPARCLIRInstruction implements SPARCTailDelayedLIRInstruction {
      public static final LIRInstructionClass<SPARCOPFOp> TYPE = LIRInstructionClass.create(SPARCOPFOp.class);
      public static final SizeEstimate SIZE = SizeEstimate.create(1);
  
      @Opcode protected final Opfs opf;
!     @Use({REG}) protected AllocatableValue rs1;
!     @Use({REG}) protected AllocatableValue rs2;
!     @Def({REG}) protected AllocatableValue rd;
      @State protected LIRFrameState state;
  
!     public SPARCOPFOp(Opfs opf, AllocatableValue rs2, AllocatableValue rd) {
          this(opf, SPARC.g0.asValue(LIRKind.value(SPARCKind.SINGLE)), rs2, rd);
      }
  
!     public SPARCOPFOp(Opfs opf, Value rs1, Value rs2, Value rd) {
!     public SPARCOPFOp(Opfs opf, AllocatableValue rs1, AllocatableValue rs2, AllocatableValue rd) {
          this(opf, rs1, rs2, rd, null);
      }
  
!     public SPARCOPFOp(Opfs opf, Value rs1, Value rs2, Value rd, LIRFrameState state) {
!     public SPARCOPFOp(Opfs opf, AllocatableValue rs1, AllocatableValue rs2, AllocatableValue rd, LIRFrameState state) {
          super(TYPE, SIZE);
          this.opf = opf;
          this.rs1 = rs1;
          this.rs2 = rs2;
          this.rd = rd;