--- a/hotspot/src/share/vm/opto/cfgnode.cpp	Thu Aug 06 13:00:44 2015 -0700
+++ b/hotspot/src/share/vm/opto/cfgnode.cpp	Mon Aug 10 10:39:19 2015 -0700
@@ -802,7 +802,7 @@
   Compile *C = igvn->C;
   Arena *a = Thread::current()->resource_area();
   Node_Array node_map = new Node_Array(a);
-  Node_Stack stack(a, C->unique() >> 4);
+  Node_Stack stack(a, C->live_nodes() >> 4);
   PhiNode *nphi = slice_memory(at);
   igvn->register_new_node_with_optimizer( nphi );
   node_map.map(_idx, nphi);