# HG changeset patch
# User ysr
# Date 1289500963 28800
# Node ID 8d81b4a1d3e1c2d166e8de09e02163f3b637f7ec
# Parent  4df7f8cba52439a9e5352eaf1e255ebe4bbb8699
6998802: ScavengeALot: assert(!gch->incremental_collection_failed()) failed: Twice in a row
Summary: Weaken assert by excluding scavenges resulting from -XX:+ScavengeALot stress-testing option.
Reviewed-by: jmasa, tonyp

diff -r 4df7f8cba524 -r 8d81b4a1d3e1 src/share/vm/memory/defNewGeneration.cpp
--- a/src/share/vm/memory/defNewGeneration.cpp	Tue Nov 09 10:47:20 2010 -0800
+++ b/src/share/vm/memory/defNewGeneration.cpp	Thu Nov 11 10:42:43 2010 -0800
@@ -838,7 +838,9 @@
         gch->incremental_collection_failed()) {
       seen_incremental_collection_failed = true;
     } else if (seen_incremental_collection_failed) {
-      assert(!gch->incremental_collection_failed(), "Twice in a row");
+      assert(gch->gc_cause() == GCCause::_scavenge_alot || !gch->incremental_collection_failed(),
+             "Twice in a row");
+
       seen_incremental_collection_failed = false;
     }
 #endif // ASSERT