changeset 4847:ea60d1de6735

Merge
author kvn
date Fri, 07 Jun 2013 11:43:53 -0700
parents d0add7016434 8d52e305a777
children 46c544b8fbfc
files
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/cpu/sparc/vm/macroAssembler_sparc.cpp	Fri Jun 07 09:33:01 2013 -0700
+++ b/src/cpu/sparc/vm/macroAssembler_sparc.cpp	Fri Jun 07 11:43:53 2013 -0700
@@ -3540,7 +3540,8 @@
 
   if (CMSIncrementalMode || !Universe::heap()->supports_inline_contig_alloc()) {
     // No allocation in the shared eden.
-    ba_short(slow_case);
+    ba(slow_case);
+    delayed()->nop();
   } else {
     // get eden boundaries
     // note: we need both top & top_addr!