--- a/hotspot/src/share/vm/opto/memnode.cpp	Thu Sep 22 18:23:15 2016 +0200
+++ b/hotspot/src/share/vm/opto/memnode.cpp	Thu Sep 22 18:29:15 2016 +0200
@@ -2717,9 +2717,9 @@
 
 //------------------------------Idealize---------------------------------------
 // Clearing a short array is faster with stores
-Node *ClearArrayNode::Ideal(PhaseGVN *phase, bool can_reshape){
+Node *ClearArrayNode::Ideal(PhaseGVN *phase, bool can_reshape) {
   // Already know this is a large node, do not try to ideal it
-  if (_is_large) return NULL;
+  if (!IdealizeClearArrayNode || _is_large) return NULL;
 
   const int unit = BytesPerLong;
   const TypeX* t = phase->type(in(2))->isa_intptr_t();