Merge

Fri, 26 Apr 2013 14:41:10 -0700

author
jiangli
date
Fri, 26 Apr 2013 14:41:10 -0700
changeset 5037
62b683108582
parent 5035
fd49109d0d88
parent 5036
487d442ef257
child 5038
0cfa93c2fcc4

Merge

     1.1 --- a/src/share/vm/runtime/simpleThresholdPolicy.cpp	Fri Apr 26 14:50:23 2013 -0400
     1.2 +++ b/src/share/vm/runtime/simpleThresholdPolicy.cpp	Fri Apr 26 14:41:10 2013 -0700
     1.3 @@ -154,9 +154,10 @@
     1.4  // Set carry flags on the counters if necessary
     1.5  void SimpleThresholdPolicy::handle_counter_overflow(Method* method) {
     1.6    MethodCounters *mcs = method->method_counters();
     1.7 -  assert(mcs != NULL, "");
     1.8 -  set_carry_if_necessary(mcs->invocation_counter());
     1.9 -  set_carry_if_necessary(mcs->backedge_counter());
    1.10 +  if (mcs != NULL) {
    1.11 +    set_carry_if_necessary(mcs->invocation_counter());
    1.12 +    set_carry_if_necessary(mcs->backedge_counter());
    1.13 +  }
    1.14    MethodData* mdo = method->method_data();
    1.15    if (mdo != NULL) {
    1.16      set_carry_if_necessary(mdo->invocation_counter());

mercurial