Mercurial > hg > graal-compiler

diff src/share/vm/memory/referenceProcessor.cpp @ 1190:4788266644c1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6895236: CMS: cmsOopClosures.inline.hpp:43 assert(..., "Should remember klasses in this context") Summary: Adjust assertion checking for ExplicitGCInvokesConcurrentAndUnloadsClasses as a reason for class unloading Reviewed-by: ysr
author jmasa
date Thu, 21 Jan 2010 11:33:32 -0800
parents 9b9c1ee9b3f6
children c18cbe5936b8
line wrap: on
line diff
--- a/src/share/vm/memory/referenceProcessor.cpp	Sat Jan 16 23:51:50 2010 -0800
+++ b/src/share/vm/memory/referenceProcessor.cpp	Thu Jan 21 11:33:32 2010 -0800
@@ -1227,13 +1227,16 @@
   BoolObjectClosure* is_alive,
   OopClosure* keep_alive,
   VoidClosure* complete_gc,
-  YieldClosure* yield) {
+  YieldClosure* yield,
+  bool should_unload_classes) {
 
   NOT_PRODUCT(verify_ok_to_handle_reflists());
 
 #ifdef ASSERT
   bool must_remember_klasses = ClassUnloading && !UseConcMarkSweepGC ||
-                               CMSClassUnloadingEnabled && UseConcMarkSweepGC;
+                               CMSClassUnloadingEnabled && UseConcMarkSweepGC ||
+                               ExplicitGCInvokesConcurrentAndUnloadsClasses &&
+                                 UseConcMarkSweepGC && should_unload_classes;
   RememberKlassesChecker mx(must_remember_klasses);
 #endif
   // Soft references