Mercurial > hg > graal-compiler

comparison src/share/vm/graal/graalCodeInstaller.cpp @ 7070:c2a3b92c9e79

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Christian Haeubl <haeubl@ssw.jku.at>
date Mon, 26 Nov 2012 10:57:02 +0100
parents 263bc2349f15 17eeac928874
children 3e61ffb9ce29
comparison
equal deleted inserted replaced
7069:e5ec98288b91 7070:c2a3b92c9e79
623 _instructions->relocate((address)inst, runtime_call_Relocation::spec(), Assembler::call32_operand); 623 _instructions->relocate((address)inst, runtime_call_Relocation::spec(), Assembler::call32_operand);
624 } 624 }
625 TRACE_graal_3("relocating (stub) at %p", inst); 625 TRACE_graal_3("relocating (stub) at %p", inst);
626 } else { // method != NULL 626 } else { // method != NULL
627 assert(hotspot_method != NULL, "unexpected JavaMethod"); 627 assert(hotspot_method != NULL, "unexpected JavaMethod");
628 assert(debug_info != NULL, "debug info expected"); 628 #ifdef ASSERT
629
630 Method* method = NULL; 629 Method* method = NULL;
631 // we need to check, this might also be an unresolved method 630 // we need to check, this might also be an unresolved method
632 if (hotspot_method->is_a(HotSpotResolvedJavaMethod::klass())) { 631 if (hotspot_method->is_a(HotSpotResolvedJavaMethod::klass())) {
633 method = getMethodFromHotSpotMethod(hotspot_method); 632 method = getMethodFromHotSpotMethod(hotspot_method);
634 } 633 }
635 634 #endif
636 assert(debug_info != NULL, "debug info expected"); 635 assert(debug_info != NULL, "debug info expected");
637 636
638 TRACE_graal_3("method call"); 637 TRACE_graal_3("method call");
639 switch (_next_call_type) { 638 switch (_next_call_type) {
640 case MARK_INLINE_INVOKEVIRTUAL: { 639 case MARK_INLINE_INVOKEVIRTUAL: {