# HG changeset patch
# User poonam
# Date 1435240325 25200
# Node ID 6158239655bc3d4549255c8c104340f48ca81fb9
# Parent  d48b9b0a06bf62343800cf498f682271b96798a7
8129108: nmethod related crash in CMS
Summary: Add SO_AllCodeCache to root scanning options when not unloading classes with a CMS collection cycle
Reviewed-by: mgerdin, jwilhelm

diff -r d48b9b0a06bf -r 6158239655bc hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp
--- a/hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp	Thu Jun 25 10:52:37 2015 +0000
+++ b/hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp	Thu Jun 25 06:52:05 2015 -0700
@@ -2702,9 +2702,11 @@
   // Not unloading classes this cycle
   assert(!should_unload_classes(), "Inconsistency!");
 
+  // If we are not unloading classes then add SO_AllCodeCache to root
+  // scanning options.
+  add_root_scanning_option(rso);
+
   if ((!verifying() || unloaded_classes_last_cycle()) && should_verify) {
-    // Include symbols, strings and code cache elements to prevent their resurrection.
-    add_root_scanning_option(rso);
     set_verifying(true);
   } else if (verifying() && !should_verify) {
     // We were verifying, but some verification flags got disabled.