--- a/hotspot/src/share/vm/opto/compile.cpp	Thu Aug 06 13:00:44 2015 -0700
+++ b/hotspot/src/share/vm/opto/compile.cpp	Mon Aug 10 10:39:19 2015 -0700
@@ -3315,7 +3315,7 @@
 
   // Visit everybody reachable!
   // Allocate stack of size C->unique()/2 to avoid frequent realloc
-  Node_Stack nstack(unique() >> 1);
+  Node_Stack nstack(live_nodes() >> 1);
   final_graph_reshaping_walk(nstack, root(), frc);
 
   // Check for unreachable (from below) code (i.e., infinite loops).