# HG changeset patch
# User jiangli
# Date 1367012470 25200
# Node ID 37e5d5c5cc5a07b8795f361ebba480f022f4a941
# Parent  60fbb5114bd18668dfeee7314afe0ef04d521883# Parent  6853aae617cb41dd849fd3502a9c74f3fb369604
Merge

diff -r 60fbb5114bd1 -r 37e5d5c5cc5a hotspot/src/share/vm/runtime/simpleThresholdPolicy.cpp
--- a/hotspot/src/share/vm/runtime/simpleThresholdPolicy.cpp	Fri Apr 26 14:50:23 2013 -0400
+++ b/hotspot/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());