Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/c1/c1_GraphBuilder.cpp	Wed Nov 16 09:13:57 2011 -0800
     1.2 +++ b/src/share/vm/c1/c1_GraphBuilder.cpp	Wed Nov 16 19:42:58 2011 -0800
     1.3 @@ -3495,9 +3495,6 @@
     1.4      if (profile_calls()) {
     1.5        profile_call(recv, holder_known ? callee->holder() : NULL);
     1.6      }
     1.7 -    if (profile_inlined_calls()) {
     1.8 -      profile_invocation(callee, copy_state_before());
     1.9 -    }
    1.10    }
    1.11  
    1.12    // Introduce a new callee continuation point - if the callee has
    1.13 @@ -3571,6 +3568,10 @@
    1.14      append(new RuntimeCall(voidType, "dtrace_method_entry", CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_entry), args));
    1.15    }
    1.16  
    1.17 +  if (profile_inlined_calls()) {
    1.18 +    profile_invocation(callee, copy_state_before_with_bci(SynchronizationEntryBCI));
    1.19 +  }
    1.20 +
    1.21    BlockBegin* callee_start_block = block_at(0);
    1.22    if (callee_start_block != NULL) {
    1.23      assert(callee_start_block->is_set(BlockBegin::parser_loop_header_flag), "must be loop header");