nodejs
diff --git a/‎deps/v8/src/objects/contexts.cc‎
Lines changed: 9 additions & 1 deletion b/‎deps/v8/src/objects/contexts.cc‎
Lines changed: 9 additions & 1 deletion
diff --git a/‎deps/v8/test/mjsunit/promise-hooks.js‎
Lines changed: 8 additions & 0 deletions b/‎deps/v8/test/mjsunit/promise-hooks.js‎
Lines changed: 8 additions & 0 deletions
@@ -547,7 +547,15 @@ void NativeContext::RunPromiseHook(PromiseHookType type,
 
   Handle<Object> receiver = isolate->global_proxy();
 
-  if (Execution::Call(isolate, hook, receiver, argc, argv).is_null()) {
+  StackLimitCheck check(isolate);
+  bool failed = false;
+  if (check.HasOverflowed()) {
+    isolate->StackOverflow();
+    failed = true;
+  } else {
+    failed = Execution::Call(isolate, hook, receiver, argc, argv).is_null();
+  }
+  if (failed) {
     DCHECK(isolate->has_pending_exception());
     Handle<Object> exception(isolate->pending_exception(), isolate);
 
 
@@ -273,3 +273,11 @@ exceptions();
 
   d8.promise.setHooks();
 })();
+
+(function overflow(){
+  d8.promise.setHooks(() => { new Promise(()=>{}) });
+  // Trigger overflow from JS code:
+  Promise.all([Promise.resolve(1)]);
+  %PerformMicrotaskCheckpoint();
+  d8.promise.setHooks();
+});