Mercurial > hg > truffle
diff src/share/vm/runtime/vframeArray.cpp @ 1330:4a9cc99938e3
Merge
author | acorn |
---|---|
date | Fri, 26 Mar 2010 11:10:26 -0400 |
parents | 3cf667df43ef |
children | 2338d41fbd81 |
line wrap: on
line diff
--- a/src/share/vm/runtime/vframeArray.cpp Thu Mar 25 16:54:59 2010 -0700 +++ b/src/share/vm/runtime/vframeArray.cpp Fri Mar 26 11:10:26 2010 -0400 @@ -223,7 +223,7 @@ break; case Deoptimization::Unpack_exception: // exception is pending - pc = SharedRuntime::raw_exception_handler_for_return_address(pc); + pc = SharedRuntime::raw_exception_handler_for_return_address(thread, pc); // [phh] We're going to end up in some handler or other, so it doesn't // matter what mdp we point to. See exception_handler_for_exception() // in interpreterRuntime.cpp.