Mercurial > hg > graal-jvmci-8

changeset 23372:1c7bac3f1f20

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use CHECK instead of HAS_PENDING_EXCEPTION (JDK-8155735).
author Roland Schatz <roland.schatz@oracle.com>
date Tue, 03 May 2016 12:07:58 +0200
parents a657931445ab
children 802821d82a92
files src/share/vm/jvmci/jvmciRuntime.cpp
diffstat 1 files changed, 6 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/jvmci/jvmciRuntime.cpp	Mon May 02 15:19:08 2016 +0200
+++ b/src/share/vm/jvmci/jvmciRuntime.cpp	Tue May 03 12:07:58 2016 +0200
@@ -412,27 +412,21 @@
 JRT_END
 
 JRT_ENTRY(void, JVMCIRuntime::throw_and_post_jvmti_exception(JavaThread* thread, const char* exception, const char* message))
-  TempNewSymbol symbol = SymbolTable::new_symbol(exception, thread);
-  if (!HAS_PENDING_EXCEPTION) {
-    SharedRuntime::throw_and_post_jvmti_exception(thread, symbol, message);
-  }
+  TempNewSymbol symbol = SymbolTable::new_symbol(exception, CHECK);
+  SharedRuntime::throw_and_post_jvmti_exception(thread, symbol, message);
 JRT_END
 
 JRT_ENTRY(void, JVMCIRuntime::throw_klass_external_name_exception(JavaThread* thread, const char* exception, Klass* klass))
   ResourceMark rm(thread);
-  TempNewSymbol symbol = SymbolTable::new_symbol(exception, thread);
-  if (!HAS_PENDING_EXCEPTION) {
-    SharedRuntime::throw_and_post_jvmti_exception(thread, symbol, klass->external_name());
-  }
+  TempNewSymbol symbol = SymbolTable::new_symbol(exception, CHECK);
+  SharedRuntime::throw_and_post_jvmti_exception(thread, symbol, klass->external_name());
 JRT_END
 
 JRT_ENTRY(void, JVMCIRuntime::throw_class_cast_exception(JavaThread* thread, const char* exception, Klass* caster_klass, Klass* target_klass))
   ResourceMark rm(thread);
   const char* message = SharedRuntime::generate_class_cast_message(caster_klass->external_name(), target_klass->external_name());
-  TempNewSymbol symbol = SymbolTable::lookup(exception, strlen(exception), thread);
-  if (!HAS_PENDING_EXCEPTION) {
-    SharedRuntime::throw_and_post_jvmti_exception(thread, symbol, message);
-  }
+  TempNewSymbol symbol = SymbolTable::new_symbol(exception, CHECK);
+  SharedRuntime::throw_and_post_jvmti_exception(thread, symbol, message);
 JRT_END
 
 JRT_LEAF(void, JVMCIRuntime::log_object(JavaThread* thread, oopDesc* obj, bool as_string, bool newline))