--- a/src/cpu/x86/vm/graalRuntime_x86.cpp	Wed Dec 12 15:46:11 2012 +0100
+++ b/src/cpu/x86/vm/graalRuntime_x86.cpp	Wed Dec 12 21:36:40 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