[runtime] Reserve more stack space for compilation.

isheludko · Commit Bot · commit 69aa868bb717 · 2017-05-31T09:26:03.000Z
... to properly handle stack overflows near the hard stack limit. Bug: chromium:716522 Change-Id: I6acdb29f039b9835bdf45b087d6561a05ed837bb Reviewed-on: https://chromium-review.googlesource.com/517799 Commit-Queue: Jakob Kummerow <jkummerow@chromium.org> Reviewed-by: Jakob Kummerow <jkummerow@chromium.org> Cr-Commit-Position: refs/heads/master@{#45619}
diff --git a/src/bootstrapper.cc b/src/bootstrapper.cc
@@ -3341,7 +3341,7 @@ bool Bootstrapper::CompileNative(Isolate* isolate, Vector<const char> name,
   // environment has been at least partially initialized. Add a stack check
   // before entering JS code to catch overflow early.
   StackLimitCheck check(isolate);
-  if (check.JsHasOverflowed(4 * KB)) {
+  if (check.JsHasOverflowed(kStackSpaceRequiredForCompilation * KB)) {
     isolate->StackOverflow();
     return false;
   }
diff --git a/src/globals.h b/src/globals.h
@@ -110,6 +110,8 @@ namespace internal {
 #define V8_DEFAULT_STACK_SIZE_KB 984
 #endif
 
+// Minimum stack size in KB required by compilers.
+const int kStackSpaceRequiredForCompilation = 40;
 
 // Determine whether double field unboxing feature is enabled.
 #if V8_TARGET_ARCH_64_BIT
diff --git a/src/runtime/runtime-compiler.cc b/src/runtime/runtime-compiler.cc
@@ -33,7 +33,9 @@ RUNTIME_FUNCTION(Runtime_CompileLazy) {
 #endif
 
   StackLimitCheck check(isolate);
-  if (check.JsHasOverflowed(1 * KB)) return isolate->StackOverflow();
+  if (check.JsHasOverflowed(kStackSpaceRequiredForCompilation * KB)) {
+    return isolate->StackOverflow();
+  }
   if (!Compiler::Compile(function, Compiler::KEEP_EXCEPTION)) {
     return isolate->heap()->exception();
   }
@@ -46,7 +48,9 @@ RUNTIME_FUNCTION(Runtime_CompileOptimized_Concurrent) {
   DCHECK_EQ(1, args.length());
   CONVERT_ARG_HANDLE_CHECKED(JSFunction, function, 0);
   StackLimitCheck check(isolate);
-  if (check.JsHasOverflowed(1 * KB)) return isolate->StackOverflow();
+  if (check.JsHasOverflowed(kStackSpaceRequiredForCompilation * KB)) {
+    return isolate->StackOverflow();
+  }
   if (!Compiler::CompileOptimized(function, Compiler::CONCURRENT)) {
     return isolate->heap()->exception();
   }
@@ -60,7 +64,9 @@ RUNTIME_FUNCTION(Runtime_CompileOptimized_NotConcurrent) {
   DCHECK_EQ(1, args.length());
   CONVERT_ARG_HANDLE_CHECKED(JSFunction, function, 0);
   StackLimitCheck check(isolate);
-  if (check.JsHasOverflowed(1 * KB)) return isolate->StackOverflow();
+  if (check.JsHasOverflowed(kStackSpaceRequiredForCompilation * KB)) {
+    return isolate->StackOverflow();
+  }
   if (!Compiler::CompileOptimized(function, Compiler::NOT_CONCURRENT)) {
     return isolate->heap()->exception();
   }

Original file line number	Diff line number	Diff line change
`@@ -3341,7 +3341,7 @@ bool Bootstrapper::CompileNative(Isolate* isolate, Vector<const char> name,`
`3341`	`3341`	`// environment has been at least partially initialized. Add a stack check`
`3342`	`3342`	`// before entering JS code to catch overflow early.`
`3343`	`3343`	`StackLimitCheck check(isolate);`
`3344`		`- if (check.JsHasOverflowed(4 * KB)) {`
	`3344`	`+ if (check.JsHasOverflowed(kStackSpaceRequiredForCompilation * KB)) {`
`3345`	`3345`	`isolate->StackOverflow();`
`3346`	`3346`	`return false;`
`3347`	`3347`	`}`