# HG changeset patch
# User jiangli
# Date 1367012470 25200
# Node ID 62b6831085825f26708cd638008e5f07862eb3af
# Parent  fd49109d0d88514e84607d04f7849d7949ad13fe# Parent  487d442ef25700f881789c4da6f4ceddcfae0e6f
Merge

diff -r fd49109d0d88 -r 62b683108582 src/share/vm/runtime/simpleThresholdPolicy.cpp
--- a/src/share/vm/runtime/simpleThresholdPolicy.cpp	Fri Apr 26 14:50:23 2013 -0400
+++ b/src/share/vm/runtime/simpleThresholdPolicy.cpp	Fri Apr 26 14:41:10 2013 -0700
@@ -154,9 +154,10 @@
 // Set carry flags on the counters if necessary
 void SimpleThresholdPolicy::handle_counter_overflow(Method* method) {
   MethodCounters *mcs = method->method_counters();
-  assert(mcs != NULL, "");
-  set_carry_if_necessary(mcs->invocation_counter());
-  set_carry_if_necessary(mcs->backedge_counter());
+  if (mcs != NULL) {
+    set_carry_if_necessary(mcs->invocation_counter());
+    set_carry_if_necessary(mcs->backedge_counter());
+  }
   MethodData* mdo = method->method_data();
   if (mdo != NULL) {
     set_carry_if_necessary(mdo->invocation_counter());