comparison src/share/vm/c1x/c1x_CodeInstaller.cpp @ 1472:7641338cfc92

Small NPE fix. More detailed error in case of wrong bytecode in patching stub.
author Thomas Wuerthinger <wuerthinger@ssw.jku.at>
date Thu, 25 Nov 2010 19:21:22 +0100
parents cd18e3072ea5
children 1f81c0d18c75
comparison
equal deleted inserted replaced
1471:cd18e3072ea5 1472:7641338cfc92
482 _instructions->relocate(call->instruction_address(), virtual_call_Relocation::spec(_invoke_mark_pc), Assembler::call32_operand); 482 _instructions->relocate(call->instruction_address(), virtual_call_Relocation::spec(_invoke_mark_pc), Assembler::call32_operand);
483 break; 483 break;
484 } 484 }
485 case MARK_INVOKESTATIC: { 485 case MARK_INVOKESTATIC: {
486 assert(method == NULL || method->is_static(), "cannot call non-static method with invokestatic"); 486 assert(method == NULL || method->is_static(), "cannot call non-static method with invokestatic");
487
488 call->set_destination(SharedRuntime::get_resolve_static_call_stub()); 487 call->set_destination(SharedRuntime::get_resolve_static_call_stub());
489 _instructions->relocate(call->instruction_address(), relocInfo::static_call_type, Assembler::call32_operand); 488 _instructions->relocate(call->instruction_address(), relocInfo::static_call_type, Assembler::call32_operand);
490 break; 489 break;
491 } 490 }
492 case MARK_INVOKESPECIAL: { 491 case MARK_INVOKESPECIAL: {