# HG changeset patch
# User coleenp
# Date 1436907110 0
# Node ID 49aabaabe03ecc55b9105bb723382a372f5cf805
# Parent  5ada9299325a070c59df16ea961caea8fdbe9790# Parent  eb497c0e1ddc7d731c35448f152d65ed61669d05
Merge

diff -r 5ada9299325a -r 49aabaabe03e hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp
--- a/hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp	Tue Jul 14 18:34:11 2015 +0000
+++ b/hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp	Tue Jul 14 20:51:50 2015 +0000
@@ -2456,7 +2456,8 @@
   // allocate space for the code
   ResourceMark rm;
   // setup code generation tools
-  CodeBuffer   buffer("deopt_blob", 1024, 1024);
+  // note: the buffer code size must account for StackShadowPages=50
+  CodeBuffer   buffer("deopt_blob", 1536, 1024);
   MacroAssembler* masm = new MacroAssembler(&buffer);
   int frame_size_in_words;
   OopMap* map = NULL;