# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1383652136 -3600
# Node ID df42ff42279f2d4718802b74abfd714dbdf7cc3c
# Parent  38bf986ce231c4d52da10d8c282b1dcb3a9acfc0# Parent  e27f3169460e7729b5b8cc426449355832337b65
Merge.

diff -r 38bf986ce231 -r df42ff42279f src/share/vm/graal/graalRuntime.cpp
--- a/src/share/vm/graal/graalRuntime.cpp	Tue Nov 05 12:48:21 2013 +0100
+++ b/src/share/vm/graal/graalRuntime.cpp	Tue Nov 05 12:48:56 2013 +0100
@@ -299,13 +299,17 @@
 }
 
 JRT_ENTRY(void, GraalRuntime::create_null_exception(JavaThread* thread))
-  thread->set_vm_result(Exceptions::new_exception(thread, vmSymbols::java_lang_NullPointerException(), NULL)());
+  SharedRuntime::throw_and_post_jvmti_exception(thread, vmSymbols::java_lang_NullPointerException());
+  thread->set_vm_result(PENDING_EXCEPTION);
+  CLEAR_PENDING_EXCEPTION;
 JRT_END
 
 JRT_ENTRY(void, GraalRuntime::create_out_of_bounds_exception(JavaThread* thread, jint index))
   char message[jintAsStringSize];
   sprintf(message, "%d", index);
-  thread->set_vm_result(Exceptions::new_exception(thread, vmSymbols::java_lang_ArrayIndexOutOfBoundsException(), message)());
+  SharedRuntime::throw_and_post_jvmti_exception(thread, vmSymbols::java_lang_ArrayIndexOutOfBoundsException(), message);
+  thread->set_vm_result(PENDING_EXCEPTION);
+  CLEAR_PENDING_EXCEPTION;
 JRT_END
 
 JRT_ENTRY_NO_ASYNC(void, GraalRuntime::monitorenter(JavaThread* thread, oopDesc* obj, BasicLock* lock))