changeset 8703:57bdf5c8e371

Merge
author coleenp
date Tue, 14 Jul 2015 20:51:50 +0000
parents a7aec5716aea 6c9f9f286c31
children 389bc4aa3295
files
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/cpu/x86/vm/sharedRuntime_x86_32.cpp	Tue Jul 14 18:34:11 2015 +0000
+++ b/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;