--- old/src/share/vm/opto/macro.cpp	2016-04-26 13:47:37.586707035 +0200
+++ new/src/share/vm/opto/macro.cpp	2016-04-26 13:47:37.450707041 +0200
@@ -1897,7 +1897,7 @@
 
       Node *prefetch_adr;
       Node *prefetch;
-      uint lines = AllocatePrefetchDistance / AllocatePrefetchStepSize;
+      uint lines = (length != NULL) ? AllocatePrefetchLines : AllocateInstancePrefetchLines;
       uint step_size = AllocatePrefetchStepSize;
       uint distance = 0;
 
@@ -1926,12 +1926,8 @@
       contended_phi_rawmem = pf_phi_rawmem;
       i_o = pf_phi_abio;
    } else if( UseTLAB && AllocatePrefetchStyle == 3 ) {
-      // Insert a prefetch for each allocation.
-      // This code is used for Sparc with BIS.
-      Node *pf_region = new RegionNode(3);
-      Node *pf_phi_rawmem = new PhiNode( pf_region, Type::MEMORY,
-                                             TypeRawPtr::BOTTOM );
-      transform_later(pf_region);
+      // Insert a prefetch instruction for each allocation.
+      // This code is used for SPARC with BIS.
 
       // Generate several prefetch instructions.
       uint lines = (length != NULL) ? AllocatePrefetchLines : AllocateInstancePrefetchLines;
@@ -1944,7 +1940,8 @@
       transform_later(cache_adr);
       cache_adr = new CastP2XNode(needgc_false, cache_adr);
       transform_later(cache_adr);
-      Node* mask = _igvn.MakeConX(~(intptr_t)(step_size-1));
+      // BIS instructions require 8-byte aligned addresses
+      Node* mask = _igvn.MakeConX(~(intptr_t)(wordSize - 1));
       cache_adr = new AndXNode(cache_adr, mask);
       transform_later(cache_adr);
       cache_adr = new CastX2PNode(cache_adr);