--- /dev/null	2017-01-22 10:16:57.869617664 -0800
+++ new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/SaveCalleeSaveRegisters.java	2017-02-15 17:05:26.057518717 -0800
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2016, 2016, 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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.graalvm.compiler.lir.alloc;
+
+import java.util.List;
+
+import org.graalvm.compiler.core.common.LIRKind;
+import org.graalvm.compiler.core.common.cfg.AbstractBlockBase;
+import org.graalvm.compiler.lir.LIR;
+import org.graalvm.compiler.lir.LIRInsertionBuffer;
+import org.graalvm.compiler.lir.LIRInstruction;
+import org.graalvm.compiler.lir.StandardOp;
+import org.graalvm.compiler.lir.Variable;
+import org.graalvm.compiler.lir.framemap.FrameMapBuilder;
+import org.graalvm.compiler.lir.gen.LIRGenerationResult;
+import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
+import org.graalvm.compiler.lir.phases.PreAllocationOptimizationPhase;
+import org.graalvm.compiler.lir.util.RegisterMap;
+
+import jdk.vm.ci.code.Architecture;
+import jdk.vm.ci.code.Register;
+import jdk.vm.ci.code.RegisterArray;
+import jdk.vm.ci.code.RegisterValue;
+import jdk.vm.ci.code.TargetDescription;
+import jdk.vm.ci.meta.PlatformKind;
+
+public class SaveCalleeSaveRegisters extends PreAllocationOptimizationPhase {
+
+    @Override
+    protected void run(TargetDescription target, LIRGenerationResult lirGenRes, PreAllocationOptimizationContext context) {
+        FrameMapBuilder frameMapBuilder = lirGenRes.getFrameMapBuilder();
+        RegisterArray calleeSaveRegisters = frameMapBuilder.getCodeCache().getRegisterConfig().getCalleeSaveRegisters();
+        if (calleeSaveRegisters == null || calleeSaveRegisters.size() == 0) {
+            return;
+        }
+        LIR lir = lirGenRes.getLIR();
+        RegisterMap<Variable> savedRegisters = saveAtEntry(lir, context.lirGen, calleeSaveRegisters, target.arch);
+
+        for (AbstractBlockBase<?> block : lir.codeEmittingOrder()) {
+            if (block == null) {
+                continue;
+            }
+            if (block.getSuccessorCount() == 0) {
+                restoreAtExit(lir, context.lirGen.getSpillMoveFactory(), savedRegisters, block);
+            }
+        }
+    }
+
+    private static RegisterMap<Variable> saveAtEntry(LIR lir, LIRGeneratorTool lirGen, RegisterArray calleeSaveRegisters, Architecture arch) {
+        AbstractBlockBase<?> startBlock = lir.getControlFlowGraph().getStartBlock();
+        List<LIRInstruction> instructions = lir.getLIRforBlock(startBlock);
+        int insertionIndex = 1;
+        LIRInsertionBuffer buffer = new LIRInsertionBuffer();
+        buffer.init(instructions);
+        StandardOp.LabelOp entry = (StandardOp.LabelOp) instructions.get(insertionIndex - 1);
+        RegisterValue[] savedRegisterValues = new RegisterValue[calleeSaveRegisters.size()];
+        int savedRegisterValueIndex = 0;
+        RegisterMap<Variable> saveMap = new RegisterMap<>(arch);
+        for (Register register : calleeSaveRegisters) {
+            PlatformKind registerPlatformKind = arch.getLargestStorableKind(register.getRegisterCategory());
+            LIRKind lirKind = LIRKind.value(registerPlatformKind);
+            RegisterValue registerValue = register.asValue(lirKind);
+            Variable saveVariable = lirGen.newVariable(lirKind);
+            LIRInstruction save = lirGen.getSpillMoveFactory().createMove(saveVariable, registerValue);
+            buffer.append(insertionIndex, save);
+            saveMap.put(register, saveVariable);
+            savedRegisterValues[savedRegisterValueIndex++] = registerValue;
+        }
+        entry.addIncomingValues(savedRegisterValues);
+        buffer.finish();
+        return saveMap;
+    }
+
+    private static void restoreAtExit(LIR lir, LIRGeneratorTool.MoveFactory moveFactory, RegisterMap<Variable> calleeSaveRegisters, AbstractBlockBase<?> block) {
+        List<LIRInstruction> instructions = lir.getLIRforBlock(block);
+        int insertionIndex = instructions.size() - 1;
+        LIRInsertionBuffer buffer = new LIRInsertionBuffer();
+        buffer.init(instructions);
+        assert instructions.get(insertionIndex) instanceof StandardOp.BlockEndOp;
+        calleeSaveRegisters.forEach((Register register, Variable saved) -> {
+            LIRInstruction restore = moveFactory.createMove(register.asValue(saved.getValueKind()), saved);
+            buffer.append(insertionIndex, restore);
+        });
+        buffer.finish();
+    }
+}