Mercurial > hg > graal-compiler
diff src/share/vm/graal/graalCompiler.cpp @ 16428:78ddecd6255f
added CHECK macros in uses of SymbolTable::new_symbol; added CHECK_ABORT macros for TRAPS functions that must abort the VM if they throw an exception
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Tue, 08 Jul 2014 21:38:21 +0200 |
| parents | 4481cf549cfc |
| children | 7404e1113697 |
line wrap: on
line diff
--- a/src/share/vm/graal/graalCompiler.cpp Tue Jul 08 21:35:46 2014 +0200 +++ b/src/share/vm/graal/graalCompiler.cpp Tue Jul 08 21:38:21 2014 +0200 @@ -133,8 +133,7 @@ args.push_int(entry_bci); args.push_long((jlong) (address) task); args.push_int(task->compile_id()); - JavaCalls::call_static(&result, SystemDictionary::CompilationTask_klass(), vmSymbols::compileMetaspaceMethod_name(), vmSymbols::compileMetaspaceMethod_signature(), &args, THREAD); - GUARANTEE_NO_PENDING_EXCEPTION("Error while calling compile_method"); + JavaCalls::call_static(&result, SystemDictionary::CompilationTask_klass(), vmSymbols::compileMetaspaceMethod_name(), vmSymbols::compileMetaspaceMethod_signature(), &args, CHECK_ABORT); _methodsCompiled++; } @@ -159,13 +158,12 @@ CompileTheWorld = false; JavaThread* THREAD = JavaThread::current(); - TempNewSymbol name = SymbolTable::new_symbol("com/oracle/graal/hotspot/HotSpotGraalRuntime", THREAD); + TempNewSymbol name = SymbolTable::new_symbol("com/oracle/graal/hotspot/HotSpotGraalRuntime", CHECK_ABORT); KlassHandle klass = GraalRuntime::load_required_class(name); - TempNewSymbol compileTheWorld = SymbolTable::new_symbol("compileTheWorld", THREAD); + TempNewSymbol compileTheWorld = SymbolTable::new_symbol("compileTheWorld", CHECK_ABORT); JavaValue result(T_VOID); JavaCallArguments args; args.push_oop(GraalRuntime::get_HotSpotGraalRuntime()); - JavaCalls::call_special(&result, klass, compileTheWorld, vmSymbols::void_method_signature(), &args, THREAD); - GUARANTEE_NO_PENDING_EXCEPTION("Error while calling compile_the_world"); + JavaCalls::call_special(&result, klass, compileTheWorld, vmSymbols::void_method_signature(), &args, CHECK_ABORT); } #endif