changeset 17131:37e5d5c5cc5a

Merge
author jiangli
date Fri, 26 Apr 2013 14:41:10 -0700
parents 60fbb5114bd1 6853aae617cb
children dffd513b2a8c
files
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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());