src/share/vm/memory/freeList.cpp

rev 7214 : imported patch rev3
rev 7216 : [mq]: rev5

@@ -285,13 +285,13 @@
     curFC = curFC->next();
   }
   return false;
 }
 
-template <class Chunk>
-void FreeList<Chunk>::assert_proper_lock_protection() const {
 #ifdef ASSERT
+template <class Chunk>
+void FreeList<Chunk>::assert_proper_lock_protection_work() const {
   // Nothing to do if the list has no assigned protecting lock
   if (protecting_lock() == NULL) {
     return;
   }
 

@@ -303,12 +303,12 @@
   } else if (thr->is_Java_thread()) {
     assert(!SafepointSynchronize::is_at_safepoint(), "Should not be executing");
   } else {
     ShouldNotReachHere();  // unaccounted thread type?
   }
-#endif
 }
+#endif
 
 // Print the "label line" for free list stats.
 template <class Chunk>
 void FreeList<Chunk>::print_labels_on(outputStream* st, const char* c) {
   st->print("%16s\t", c);