src/share/vm/runtime/advancedThresholdPolicy.cpp

changeset 7302
41dcdd636080
parent 7179
7301840ea20e
child 7365
600c44255e5f
     1.1 --- a/src/share/vm/runtime/advancedThresholdPolicy.cpp	Thu Oct 30 10:51:06 2014 +0100
     1.2 +++ b/src/share/vm/runtime/advancedThresholdPolicy.cpp	Tue Apr 29 07:59:22 2014 +0200
     1.3 @@ -451,7 +451,7 @@
     1.4    if (should_create_mdo(mh(), level)) {
     1.5      create_mdo(mh, thread);
     1.6    }
     1.7 -  if (is_compilation_enabled() && !CompileBroker::compilation_is_in_queue(mh, InvocationEntryBci)) {
     1.8 +  if (is_compilation_enabled() && !CompileBroker::compilation_is_in_queue(mh)) {
     1.9      CompLevel next_level = call_event(mh(), level);
    1.10      if (next_level != level) {
    1.11        compile(mh, InvocationEntryBci, next_level, thread);
    1.12 @@ -475,7 +475,7 @@
    1.13      CompLevel next_osr_level = loop_event(imh(), level);
    1.14      CompLevel max_osr_level = (CompLevel)imh->highest_osr_comp_level();
    1.15      // At the very least compile the OSR version
    1.16 -    if (!CompileBroker::compilation_is_in_queue(imh, bci) && next_osr_level != level) {
    1.17 +    if (!CompileBroker::compilation_is_in_queue(imh) && (next_osr_level != level)) {
    1.18        compile(imh, bci, next_osr_level, thread);
    1.19      }
    1.20  
    1.21 @@ -509,7 +509,7 @@
    1.22            nm->make_not_entrant();
    1.23          }
    1.24        }
    1.25 -      if (!CompileBroker::compilation_is_in_queue(mh, InvocationEntryBci)) {
    1.26 +      if (!CompileBroker::compilation_is_in_queue(mh)) {
    1.27          // Fix up next_level if necessary to avoid deopts
    1.28          if (next_level == CompLevel_limited_profile && max_osr_level == CompLevel_full_profile) {
    1.29            next_level = CompLevel_full_profile;
    1.30 @@ -521,7 +521,7 @@
    1.31      } else {
    1.32        cur_level = comp_level(imh());
    1.33        next_level = call_event(imh(), cur_level);
    1.34 -      if (!CompileBroker::compilation_is_in_queue(imh, bci) && next_level != cur_level) {
    1.35 +      if (!CompileBroker::compilation_is_in_queue(imh) && (next_level != cur_level)) {
    1.36          compile(imh, InvocationEntryBci, next_level, thread);
    1.37        }
    1.38      }

mercurial