Mercurial > hg > truffle

diff src/share/vm/memory/genCollectedHeap.cpp @ 1681:126ea7725993

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6953477: Increase portability and flexibility of building Hotspot Summary: A collection of portability improvements including shared code support for PPC, ARM platforms, software floating point, cross compilation support and improvements in error crash detail. Reviewed-by: phh, never, coleenp, dholmes
author bobv
date Tue, 03 Aug 2010 08:13:38 -0400
parents 1a11430e0326
children 8b10f48633dc
line wrap: on
line diff
--- a/src/share/vm/memory/genCollectedHeap.cpp	Wed Jul 28 17:57:43 2010 -0400
+++ b/src/share/vm/memory/genCollectedHeap.cpp	Tue Aug 03 08:13:38 2010 -0400
@@ -941,7 +941,9 @@
             VerifyBeforeExit ||
             PrintAssembly    ||
             tty->count() != 0 ||   // already printing
-            VerifyAfterGC, "too expensive");
+            VerifyAfterGC    ||
+    VMError::fatal_error_in_progress(), "too expensive");
+
   #endif
   // This might be sped up with a cache of the last generation that
   // answered yes.