Mercurial > hg > graal-jvmci-8
comparison src/share/vm/jvmci/jvmciRuntime.cpp @ 23372:1c7bac3f1f20
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 | 24505bf61633 |
comparison
equal
deleted
inserted
replaced
23371:a657931445ab | 23372:1c7bac3f1f20 |
---|---|
410 tty->flush(); | 410 tty->flush(); |
411 } | 411 } |
412 JRT_END | 412 JRT_END |
413 | 413 |
414 JRT_ENTRY(void, JVMCIRuntime::throw_and_post_jvmti_exception(JavaThread* thread, const char* exception, const char* message)) | 414 JRT_ENTRY(void, JVMCIRuntime::throw_and_post_jvmti_exception(JavaThread* thread, const char* exception, const char* message)) |
415 TempNewSymbol symbol = SymbolTable::new_symbol(exception, thread); | 415 TempNewSymbol symbol = SymbolTable::new_symbol(exception, CHECK); |
416 if (!HAS_PENDING_EXCEPTION) { | 416 SharedRuntime::throw_and_post_jvmti_exception(thread, symbol, message); |
417 SharedRuntime::throw_and_post_jvmti_exception(thread, symbol, message); | |
418 } | |
419 JRT_END | 417 JRT_END |
420 | 418 |
421 JRT_ENTRY(void, JVMCIRuntime::throw_klass_external_name_exception(JavaThread* thread, const char* exception, Klass* klass)) | 419 JRT_ENTRY(void, JVMCIRuntime::throw_klass_external_name_exception(JavaThread* thread, const char* exception, Klass* klass)) |
422 ResourceMark rm(thread); | 420 ResourceMark rm(thread); |
423 TempNewSymbol symbol = SymbolTable::new_symbol(exception, thread); | 421 TempNewSymbol symbol = SymbolTable::new_symbol(exception, CHECK); |
424 if (!HAS_PENDING_EXCEPTION) { | 422 SharedRuntime::throw_and_post_jvmti_exception(thread, symbol, klass->external_name()); |
425 SharedRuntime::throw_and_post_jvmti_exception(thread, symbol, klass->external_name()); | |
426 } | |
427 JRT_END | 423 JRT_END |
428 | 424 |
429 JRT_ENTRY(void, JVMCIRuntime::throw_class_cast_exception(JavaThread* thread, const char* exception, Klass* caster_klass, Klass* target_klass)) | 425 JRT_ENTRY(void, JVMCIRuntime::throw_class_cast_exception(JavaThread* thread, const char* exception, Klass* caster_klass, Klass* target_klass)) |
430 ResourceMark rm(thread); | 426 ResourceMark rm(thread); |
431 const char* message = SharedRuntime::generate_class_cast_message(caster_klass->external_name(), target_klass->external_name()); | 427 const char* message = SharedRuntime::generate_class_cast_message(caster_klass->external_name(), target_klass->external_name()); |
432 TempNewSymbol symbol = SymbolTable::lookup(exception, strlen(exception), thread); | 428 TempNewSymbol symbol = SymbolTable::new_symbol(exception, CHECK); |
433 if (!HAS_PENDING_EXCEPTION) { | 429 SharedRuntime::throw_and_post_jvmti_exception(thread, symbol, message); |
434 SharedRuntime::throw_and_post_jvmti_exception(thread, symbol, message); | |
435 } | |
436 JRT_END | 430 JRT_END |
437 | 431 |
438 JRT_LEAF(void, JVMCIRuntime::log_object(JavaThread* thread, oopDesc* obj, bool as_string, bool newline)) | 432 JRT_LEAF(void, JVMCIRuntime::log_object(JavaThread* thread, oopDesc* obj, bool as_string, bool newline)) |
439 ttyLocker ttyl; | 433 ttyLocker ttyl; |
440 | 434 |