Merge
authorkvn
Fri, 07 Jun 2013 11:43:53 -0700
changeset 18096 4a3ac88675ef
parent 18024 f9e300086063 (current diff)
parent 18095 0ca57ec93f20 (diff)
child 18097 acd70736bd60
Merge
--- a/hotspot/src/cpu/sparc/vm/macroAssembler_sparc.cpp	Fri Jun 07 09:33:01 2013 -0700
+++ b/hotspot/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!