comparison src/share/vm/interpreter/interpreterRuntime.cpp @ 6988:2cb439954abf

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Gilles Duboscq <duboscq@ssw.jku.at>
date Mon, 19 Nov 2012 15:36:13 +0100
parents e522a00b91aa 80e866b1d053
children 5d0bb7d52783
comparison
equal deleted inserted replaced
6963:dd0dd0321e2a 6988:2cb439954abf
310 IRT_END 310 IRT_END
311 311
312 312
313 IRT_ENTRY(void, InterpreterRuntime::create_klass_exception(JavaThread* thread, char* name, oopDesc* obj)) 313 IRT_ENTRY(void, InterpreterRuntime::create_klass_exception(JavaThread* thread, char* name, oopDesc* obj))
314 ResourceMark rm(thread); 314 ResourceMark rm(thread);
315 const char* klass_name = Klass::cast(obj->klass())->external_name(); 315 const char* klass_name = obj->klass()->external_name();
316 // lookup exception klass 316 // lookup exception klass
317 TempNewSymbol s = SymbolTable::new_symbol(name, CHECK); 317 TempNewSymbol s = SymbolTable::new_symbol(name, CHECK);
318 if (ProfileTraps) { 318 if (ProfileTraps) {
319 note_trap(thread, Deoptimization::Reason_class_check, CHECK); 319 note_trap(thread, Deoptimization::Reason_class_check, CHECK);
320 } 320 }
339 IRT_ENTRY(void, InterpreterRuntime::throw_ClassCastException( 339 IRT_ENTRY(void, InterpreterRuntime::throw_ClassCastException(
340 JavaThread* thread, oopDesc* obj)) 340 JavaThread* thread, oopDesc* obj))
341 341
342 ResourceMark rm(thread); 342 ResourceMark rm(thread);
343 char* message = SharedRuntime::generate_class_cast_message( 343 char* message = SharedRuntime::generate_class_cast_message(
344 thread, Klass::cast(obj->klass())->external_name()); 344 thread, obj->klass()->external_name());
345 345
346 if (ProfileTraps) { 346 if (ProfileTraps) {
347 note_trap(thread, Deoptimization::Reason_class_check, CHECK); 347 note_trap(thread, Deoptimization::Reason_class_check, CHECK);
348 } 348 }
349 349