comparison 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
comparison
equal deleted inserted replaced
16427:84a14e69fa8b 16428:78ddecd6255f
131 JavaCallArguments args; 131 JavaCallArguments args;
132 args.push_long((jlong) (address) method()); 132 args.push_long((jlong) (address) method());
133 args.push_int(entry_bci); 133 args.push_int(entry_bci);
134 args.push_long((jlong) (address) task); 134 args.push_long((jlong) (address) task);
135 args.push_int(task->compile_id()); 135 args.push_int(task->compile_id());
136 JavaCalls::call_static(&result, SystemDictionary::CompilationTask_klass(), vmSymbols::compileMetaspaceMethod_name(), vmSymbols::compileMetaspaceMethod_signature(), &args, THREAD); 136 JavaCalls::call_static(&result, SystemDictionary::CompilationTask_klass(), vmSymbols::compileMetaspaceMethod_name(), vmSymbols::compileMetaspaceMethod_signature(), &args, CHECK_ABORT);
137 GUARANTEE_NO_PENDING_EXCEPTION("Error while calling compile_method");
138 137
139 _methodsCompiled++; 138 _methodsCompiled++;
140 } 139 }
141 140
142 141
157 // We turn off CompileTheWorld so that Graal can 156 // We turn off CompileTheWorld so that Graal can
158 // be compiled by C1/C2 when Graal does a CTW. 157 // be compiled by C1/C2 when Graal does a CTW.
159 CompileTheWorld = false; 158 CompileTheWorld = false;
160 159
161 JavaThread* THREAD = JavaThread::current(); 160 JavaThread* THREAD = JavaThread::current();
162 TempNewSymbol name = SymbolTable::new_symbol("com/oracle/graal/hotspot/HotSpotGraalRuntime", THREAD); 161 TempNewSymbol name = SymbolTable::new_symbol("com/oracle/graal/hotspot/HotSpotGraalRuntime", CHECK_ABORT);
163 KlassHandle klass = GraalRuntime::load_required_class(name); 162 KlassHandle klass = GraalRuntime::load_required_class(name);
164 TempNewSymbol compileTheWorld = SymbolTable::new_symbol("compileTheWorld", THREAD); 163 TempNewSymbol compileTheWorld = SymbolTable::new_symbol("compileTheWorld", CHECK_ABORT);
165 JavaValue result(T_VOID); 164 JavaValue result(T_VOID);
166 JavaCallArguments args; 165 JavaCallArguments args;
167 args.push_oop(GraalRuntime::get_HotSpotGraalRuntime()); 166 args.push_oop(GraalRuntime::get_HotSpotGraalRuntime());
168 JavaCalls::call_special(&result, klass, compileTheWorld, vmSymbols::void_method_signature(), &args, THREAD); 167 JavaCalls::call_special(&result, klass, compileTheWorld, vmSymbols::void_method_signature(), &args, CHECK_ABORT);
169 GUARANTEE_NO_PENDING_EXCEPTION("Error while calling compile_the_world");
170 } 168 }
171 #endif 169 #endif