Mercurial > hg > truffle
diff src/cpu/x86/vm/graalRuntime_x86.cpp @ 7226:8a3efb8c831d
Merge.
author | Christian Haeubl <haeubl@ssw.jku.at> |
---|---|
date | Fri, 14 Dec 2012 13:02:49 +0100 |
parents | 2ae3e26b7e9a 5d0bb7d52783 |
children | a6bd253a770f |
line wrap: on
line diff
--- a/src/cpu/x86/vm/graalRuntime_x86.cpp Fri Dec 14 12:05:35 2012 +0100 +++ b/src/cpu/x86/vm/graalRuntime_x86.cpp Fri Dec 14 13:02:49 2012 +0100 @@ -111,23 +111,12 @@ if (metadata_result->is_valid()) { movptr(Address(thread, JavaThread::vm_result_2_offset()), NULL_WORD); } -#ifdef GRAAL // (thomaswue) Deoptimize in case of an exception. restore_live_registers(this, false); movptr(Address(thread, Thread::pending_exception_offset()), NULL_WORD); leave(); movl(rscratch1, Deoptimization::make_trap_request(Deoptimization::Reason_constraint, Deoptimization::Action_reinterpret)); jump(RuntimeAddress(SharedRuntime::deopt_blob()->uncommon_trap())); -#else - if (frame_size() == no_frame_size) { - leave(); - jump(RuntimeAddress(StubRoutines::forward_exception_entry())); - } else if (_stub_id == GraalRuntime::forward_exception_id) { - should_not_reach_here(); - } else { - jump(RuntimeAddress(GraalRuntime::entry_for(GraalRuntime::forward_exception_id))); - } -#endif bind(L); } // get oop results if there are any and reset the values in the thread