Merge
authorcoleenp
Tue, 14 Jul 2015 20:51:50 +0000
changeset 31787 49aabaabe03e
parent 31785 5ada9299325a (current diff)
parent 31786 eb497c0e1ddc (diff)
child 31788 04af91b7fadd
Merge
--- 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;