src/hotspot/share/runtime/synchronizer.cpp

rev 54697 : imported patch 8221734-v2-merge

@@ -1312,11 +1312,11 @@
                                            oop object,
                                            const InflateCause cause) {
   // Inflate mutates the heap ...
   // Relaxing assertion for bug 6320749.
   assert(Universe::verify_in_progress() ||
-         !SafepointSynchronize::is_at_safepoint(), "invariant");
+         !Universe::heap()->is_gc_active(), "invariant");
 
   EventJavaMonitorInflate event;
 
   for (;;) {
     const markOop mark = object->mark();

@@ -1441,11 +1441,11 @@
 
       // Hopefully the performance counters are allocated on distinct cache lines
       // to avoid false sharing on MP systems ...
       OM_PERFDATA_OP(Inflations, inc());
       if (log_is_enabled(Trace, monitorinflation)) {
-        ResourceMark rm(Self);
+        ResourceMark rm;
         lsh.print_cr("inflate(has_locker): object=" INTPTR_FORMAT ", mark="
                      INTPTR_FORMAT ", type='%s'", p2i(object),
                      p2i(object->mark()), object->klass()->external_name());
       }
       if (event.should_commit()) {

@@ -1491,11 +1491,11 @@
 
     // Hopefully the performance counters are allocated on distinct
     // cache lines to avoid false sharing on MP systems ...
     OM_PERFDATA_OP(Inflations, inc());
     if (log_is_enabled(Trace, monitorinflation)) {
-      ResourceMark rm(Self);
+      ResourceMark rm;
       lsh.print_cr("inflate(neutral): object=" INTPTR_FORMAT ", mark="
                    INTPTR_FORMAT ", type='%s'", p2i(object),
                    p2i(object->mark()), object->klass()->external_name());
     }
     if (event.should_commit()) {