diff --git a/hphp/runtime/vm/jit/linearscan.cpp b/hphp/runtime/vm/jit/linearscan.cpp
index 0763eb24d..dc20fc240 100644
--- a/hphp/runtime/vm/jit/linearscan.cpp
+++ b/hphp/runtime/vm/jit/linearscan.cpp
@@ -1191,7 +1191,7 @@ void LinearScan::allocRegsOneTrace(BlockList::iterator& blockIt,
         assert(!spill->block()->trace()->isMain());
         spill = spill->clone(m_irFactory);
       }
-      block->trace()->front()->prepend(spill);
+      trace->front()->prepend(spill);
     } else if (inst->isBlockEnd()) {
       block->next()->prepend(spill);
     } else {
diff --git a/hphp/test/slow/compilation/exitspill.php b/hphp/test/slow/compilation/exitspill.php
new file mode 100644
index 000000000..19e3b567c
--- /dev/null
+++ b/hphp/test/slow/compilation/exitspill.php
@@ -0,0 +1,28 @@
+<?php
+
+define('FIZ', 32);
+
+class X {
+  const FOO = 1;
+  const BAR = FIZ;
+  const BAZ = FIZ;
+  const BOO = FIZ;
+  const BIZ = FIZ;
+  const FIZ = FIZ;
+}
+
+function foo($a, $b) {
+  var_dump($a, $b);
+}
+
+function f() { return FIZ; }
+
+function test() {
+  foo(f(), array(X::FOO, X::BAZ,
+                 X::BAR, X::BAZ,
+                 X::BOO, X::BIZ));
+}
+
+test();
+
+
diff --git a/hphp/test/slow/compilation/exitspill.php.expect b/hphp/test/slow/compilation/exitspill.php.expect
new file mode 100644
index 000000000..ed77cd276
--- /dev/null
+++ b/hphp/test/slow/compilation/exitspill.php.expect
@@ -0,0 +1,15 @@
+int(32)
+array(6) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(32)
+  [2]=>
+  int(32)
+  [3]=>
+  int(32)
+  [4]=>
+  int(32)
+  [5]=>
+  int(32)
+}