Mercurial > hg > graal-jvmci-8
diff src/cpu/x86/vm/compiledIC_x86.cpp @ 10409:36bcc10e01c0
merge fixes
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Wed, 19 Jun 2013 15:37:32 +0200 |
parents | a6e09d6dd8e5 |
children | 359f7e70ae7f |
line wrap: on
line diff
--- a/src/cpu/x86/vm/compiledIC_x86.cpp Wed Jun 19 10:45:56 2013 +0200 +++ b/src/cpu/x86/vm/compiledIC_x86.cpp Wed Jun 19 15:37:32 2013 +0200 @@ -117,6 +117,12 @@ void CompiledStaticCall::set_to_interpreted(methodHandle callee, address entry) { address stub = find_stub(); +#ifdef GRAAL + if (stub == NULL) { + set_destination_mt_safe(entry); + return; + } +#endif guarantee(stub != NULL, "stub not found"); if (TraceICs) { @@ -168,10 +174,12 @@ // Verify stub. address stub = find_stub(); +#ifndef GRAAL assert(stub != NULL, "no stub found for static call"); // Creation also verifies the object. NativeMovConstReg* method_holder = nativeMovConstReg_at(stub); NativeJump* jump = nativeJump_at(method_holder->next_instruction_address()); +#endif // Verify state. assert(is_clean() || is_call_to_compiled() || is_call_to_interpreted(), "sanity check");