src: add callback scope for native immediates

This ensures that microtasks scheduled by native immediates are run after the tasks are done. In particular, this affects the inspector integration since 6f9f546. Fixes: #33002 Refs: #32523 Backport-PR-URL: #35241 PR-URL: #34366 Reviewed-By: Benjamin Gruenbaum <[email protected]> Reviewed-By: Gerhard Stöbich <[email protected]> Reviewed-By: James M Snell <[email protected]>

Author: addaleax

src/env.cc

@@ -708,6 +708,9 @@ void Environment::RunAndClearInterrupts(){
 voidEnvironment::RunAndClearNativeImmediates(bool only_refed){
  TraceEventScope trace_scope(TRACING_CATEGORY_NODE1(environment),
 "RunAndClearNativeImmediates", this);
+ HandleScope handle_scope(isolate_);
+ InternalCallbackScope cb_scope(this, Object::New(isolate_),{0, 0 });
+
 size_t ref_count = 0;
 
 // Handle interrupts first. These functions are not allowed to throw

test/async-hooks/test-late-hook-enable.js

@@ -17,14 +17,16 @@ const fnsToTest = [setTimeout, (cb) =>{
 });
 });
 },(cb)=>{
-process.nextTick(()=>{
-cb();
+setImmediate(()=>{
+process.nextTick(()=>{
+cb();
 
-// We need to keep the event loop open for this to actually work
-// since destroy hooks are triggered in unrefed Immediates
-setImmediate(()=>{
-hook.disable();
-assert.strictEqual(fnsToTest.length,0);
+// We need to keep the event loop open for this to actually work
+// since destroy hooks are triggered in unrefed Immediates
+setImmediate(()=>{
+hook.disable();
+assert.strictEqual(fnsToTest.length,0);
+});
 });
 });
 }];

test/cctest/test_environment.cc

@@ -466,3 +466,29 @@ TEST_F(EnvironmentTest, ExitHandlerTest){
 node::LoadEnvironment(*env, "process.exit(42)").ToLocalChecked();
 EXPECT_EQ(callback_calls, 1);
 }
+
+TEST_F(EnvironmentTest, SetImmediateMicrotasks){
+int called = 0;
+
+{
+const v8::HandleScope handle_scope(isolate_);
+const Argv argv;
+ Env env{handle_scope, argv};
+
+node::LoadEnvironment(*env,
+ [&](const node::StartExecutionCallbackInfo& info)
+ -> v8::MaybeLocal<v8::Value>{
+returnv8::Object::New(isolate_);
+ });
+
+ (*env)->SetImmediate([&](node::Environment* env_arg){
+EXPECT_EQ(env_arg, *env);
+ isolate_->EnqueueMicrotask([](void* arg){
+ ++*static_cast<int*>(arg);
+ }, &called);
+ });
+uv_run(&current_loop, UV_RUN_DEFAULT);
+ }
+
+EXPECT_EQ(called, 1);
+}