Mercurial > people > andrew > aarch32 > hotspot

changeset 9030:63b6d8a45261

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8169872: incremental CMS always crashes VM Reviewed-by: enevill Contributed-by: andrey.petushkov@gmail.com
author snazarki
date Thu, 17 Nov 2016 18:53:34 +0300
parents ad0ce4e6fc1b
children ef75b507ae87
files src/cpu/aarch32/vm/macroAssembler_aarch32.cpp src/cpu/aarch32/vm/templateTable_aarch32.cpp
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/cpu/aarch32/vm/macroAssembler_aarch32.cpp	Mon Nov 14 12:47:36 2016 +0300
+++ b/src/cpu/aarch32/vm/macroAssembler_aarch32.cpp	Thu Nov 17 18:53:34 2016 +0300
@@ -2119,7 +2119,7 @@
   assert_different_registers(top, rthread, t1, t2, /* preserve: */ r6, r3);
   Label do_refill, discard_tlab;
 
-  if (!Universe::heap()->supports_inline_contig_alloc()) {
+  if (CMSIncrementalMode || !Universe::heap()->supports_inline_contig_alloc()) {
     // No allocation in the shared eden.
     b(slow_case);
   }
@@ -2229,7 +2229,7 @@
                                    Register t1,
                                    Label& slow_case) {
   assert_different_registers(obj, var_size_in_bytes, t1);
-  if (!Universe::heap()->supports_inline_contig_alloc()) {
+  if (CMSIncrementalMode || !Universe::heap()->supports_inline_contig_alloc()) {
     b(slow_case);
   } else {
     Register end = t1;
--- a/src/cpu/aarch32/vm/templateTable_aarch32.cpp	Mon Nov 14 12:47:36 2016 +0300
+++ b/src/cpu/aarch32/vm/templateTable_aarch32.cpp	Thu Nov 17 18:53:34 2016 +0300
@@ -3829,7 +3829,7 @@
   // (creates a new TLAB, etc.)
 
   const bool allow_shared_alloc =
-    Universe::heap()->supports_inline_contig_alloc();
+    !CMSIncrementalMode && Universe::heap()->supports_inline_contig_alloc();
 
   if (UseTLAB) {
     __ tlab_allocate(r0, r3, 0, noreg, r1,