--- old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotLIRGenerator.java	2017-03-20 17:38:36.000000000 -0700
+++ new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotLIRGenerator.java	2017-03-20 17:38:35.000000000 -0700
@@ -22,26 +22,18 @@
  */
 package org.graalvm.compiler.hotspot;
 
+import org.graalvm.compiler.core.common.CompressEncoding;
 import org.graalvm.compiler.core.common.LIRKind;
 import org.graalvm.compiler.debug.GraalError;
 import org.graalvm.compiler.hotspot.meta.HotSpotConstantLoadAction;
 import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
-import org.graalvm.compiler.hotspot.nodes.DeoptimizationFetchUnrollInfoCallNode;
-import org.graalvm.compiler.hotspot.nodes.EnterUnpackFramesStackFrameNode;
 import org.graalvm.compiler.hotspot.nodes.GraalHotSpotVMConfigNode;
-import org.graalvm.compiler.hotspot.nodes.LeaveCurrentStackFrameNode;
-import org.graalvm.compiler.hotspot.nodes.LeaveDeoptimizedStackFrameNode;
-import org.graalvm.compiler.hotspot.nodes.LeaveUnpackFramesStackFrameNode;
-import org.graalvm.compiler.hotspot.nodes.PushInterpreterFrameNode;
-import org.graalvm.compiler.hotspot.nodes.SaveAllRegistersNode;
-import org.graalvm.compiler.hotspot.nodes.UncommonTrapCallNode;
 import org.graalvm.compiler.hotspot.nodes.aot.LoadConstantIndirectlyNode;
 import org.graalvm.compiler.hotspot.nodes.aot.ResolveConstantNode;
 import org.graalvm.compiler.hotspot.nodes.aot.ResolveMethodAndLoadCountersNode;
 import org.graalvm.compiler.hotspot.nodes.profiling.RandomSeedNode;
 import org.graalvm.compiler.hotspot.replacements.EncodedSymbolConstant;
 import org.graalvm.compiler.lir.LIRFrameState;
-import org.graalvm.compiler.lir.StandardOp.SaveRegistersOp;
 import org.graalvm.compiler.lir.VirtualStackSlot;
 import org.graalvm.compiler.lir.gen.LIRGenerator;
 import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
@@ -71,65 +63,6 @@
     void emitDeoptimizeCaller(DeoptimizationAction action, DeoptimizationReason reason);
 
     /**
-     * Emits code for a {@link SaveAllRegistersNode}.
-     *
-     * @return a {@link SaveRegistersOp} operation
-     */
-    SaveRegistersOp emitSaveAllRegisters();
-
-    /**
-     * Emits code for a {@link LeaveCurrentStackFrameNode}.
-     *
-     * @param saveRegisterOp saved registers
-     */
-    default void emitLeaveCurrentStackFrame(SaveRegistersOp saveRegisterOp) {
-        throw GraalError.unimplemented();
-    }
-
-    /**
-     * Emits code for a {@link LeaveDeoptimizedStackFrameNode}.
-     *
-     * @param frameSize
-     * @param initialInfo
-     */
-    default void emitLeaveDeoptimizedStackFrame(Value frameSize, Value initialInfo) {
-        throw GraalError.unimplemented();
-    }
-
-    /**
-     * Emits code for a {@link EnterUnpackFramesStackFrameNode}.
-     *
-     * @param framePc
-     * @param senderSp
-     * @param senderFp
-     * @param saveRegisterOp
-     */
-    default void emitEnterUnpackFramesStackFrame(Value framePc, Value senderSp, Value senderFp, SaveRegistersOp saveRegisterOp) {
-        throw GraalError.unimplemented();
-    }
-
-    /**
-     * Emits code for a {@link LeaveUnpackFramesStackFrameNode}.
-     *
-     * @param saveRegisterOp
-     */
-    default void emitLeaveUnpackFramesStackFrame(SaveRegistersOp saveRegisterOp) {
-        throw GraalError.unimplemented();
-    }
-
-    /**
-     * Emits code for a {@link PushInterpreterFrameNode}.
-     *
-     * @param frameSize
-     * @param framePc
-     * @param senderSp
-     * @param initialInfo
-     */
-    default void emitPushInterpreterFrame(Value frameSize, Value framePc, Value senderSp, Value initialInfo) {
-        throw GraalError.unimplemented();
-    }
-
-    /**
      * Emits code for a {@link LoadConstantIndirectlyNode}.
      *
      * @param constant
@@ -228,29 +161,6 @@
     }
 
     /**
-     * Emits code for a {@link UncommonTrapCallNode}.
-     *
-     * @param trapRequest
-     * @param mode
-     * @param saveRegisterOp
-     * @return a {@code Deoptimization::UnrollBlock} pointer
-     */
-    default Value emitUncommonTrapCall(Value trapRequest, Value mode, SaveRegistersOp saveRegisterOp) {
-        throw GraalError.unimplemented();
-    }
-
-    /**
-     * Emits code for a {@link DeoptimizationFetchUnrollInfoCallNode}.
-     *
-     * @param mode
-     * @param saveRegisterOp
-     * @return a {@code Deoptimization::UnrollBlock} pointer
-     */
-    default Value emitDeoptimizationFetchUnrollInfoCall(Value mode, SaveRegistersOp saveRegisterOp) {
-        throw GraalError.unimplemented();
-    }
-
-    /**
      * Gets a stack slot for a lock at a given lock nesting depth.
      */
     VirtualStackSlot getLockSlot(int lockDepth);