commit 9c750f9b6283f62b3e6a93c0c6b2838abde5000e
author Elliott Hughes <enh@google.com> Thu Apr 05 12:07:59 2012 -0700
committer Elliott Hughes <enh@google.com> Thu Apr 05 12:07:59 2012 -0700
tree ba9d030321e0528a18159e74e23a6b65218b2555
parent c8eeb9b283d5053c1b1092363320646dc7c0deab

Ensure we don't AddLocalReference a bogus value when returning to native code from an upcall that threw.

Also add a few missing CHECKs.

Change-Id: Icf29506b258a2177b5e80c75cd2710761431ba4b

src/thread.cc

diff --git a/src/thread.cc b/src/thread.cc
index 125480e..4177913 100644
--- a/src/thread.cc
+++ b/src/thread.cc
@@ -1562,6 +1562,7 @@
   CHECK_NE(catch_native_pc, 0u);
   long_jump_context->SetSP(reinterpret_cast<uintptr_t>(catch_finder.handler_frame_.GetSP()));
   long_jump_context->SetPC(catch_native_pc);
+  long_jump_context->SmashCallerSaves();
   long_jump_context->DoLongJump();
   LOG(FATAL) << "UNREACHABLE";
 }