From 0bb99b44ef9f7cc6bc84264be4421e07792a06c0 Mon Sep 17 00:00:00 2001 From: "Y. Srinivas Ramakrishna" Date: Tue, 20 Oct 2009 00:00:23 -0700 Subject: [PATCH] 6892749: assert(UseParNewGC || UseSerialGC || UseConcMarkSweepGC, "...") fails Removed the assert: UseSerialGC is not necessarily always set when serial gc is being used. Reviewed-by: jcoomes, jmasa, tonyp --- hotspot/src/share/vm/memory/genCollectedHeap.hpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hotspot/src/share/vm/memory/genCollectedHeap.hpp b/hotspot/src/share/vm/memory/genCollectedHeap.hpp index 8ac974e0a38..9004e0d842c 100644 --- a/hotspot/src/share/vm/memory/genCollectedHeap.hpp +++ b/hotspot/src/share/vm/memory/genCollectedHeap.hpp @@ -266,8 +266,11 @@ public: // only and may need to be re-examined in case other // kinds of collectors are implemented in the future. virtual bool can_elide_initializing_store_barrier(oop new_obj) { - assert(UseParNewGC || UseSerialGC || UseConcMarkSweepGC, - "Check can_elide_initializing_store_barrier() for this collector"); + // We wanted to assert that:- + // assert(UseParNewGC || UseSerialGC || UseConcMarkSweepGC, + // "Check can_elide_initializing_store_barrier() for this collector"); + // but unfortunately the flag UseSerialGC need not necessarily always + // be set when DefNew+Tenured are being used. return is_in_youngest((void*)new_obj); }