nodejs
diff --git a/Collapse file
‎test/addons/at-exit/binding.cc‎
Copy file name to clipboardExpand all lines: test/addons/at-exit/binding.cc
-59Lines changed: 0 additions & 59 deletions b/Collapse file
‎test/addons/at-exit/binding.cc‎
Copy file name to clipboardExpand all lines: test/addons/at-exit/binding.cc
-59Lines changed: 0 additions & 59 deletions
diff --git a/Collapse file
‎test/addons/at-exit/binding.gyp‎
Copy file name to clipboardExpand all lines: test/addons/at-exit/binding.gyp
-9Lines changed: 0 additions & 9 deletions b/Collapse file
‎test/addons/at-exit/binding.gyp‎
Copy file name to clipboardExpand all lines: test/addons/at-exit/binding.gyp
-9Lines changed: 0 additions & 9 deletions
diff --git a/Collapse file
‎test/addons/at-exit/test.js‎
Copy file name to clipboardExpand all lines: test/addons/at-exit/test.js
-3Lines changed: 0 additions & 3 deletions b/Collapse file
‎test/addons/at-exit/test.js‎
Copy file name to clipboardExpand all lines: test/addons/at-exit/test.js
-3Lines changed: 0 additions & 3 deletions
diff --git a/Collapse file
‎test/cctest/test_environment.cc‎
Copy file name to clipboardExpand all lines: test/cctest/test_environment.cc
+22Lines changed: 22 additions & 0 deletions b/Collapse file
‎test/cctest/test_environment.cc‎
Copy file name to clipboardExpand all lines: test/cctest/test_environment.cc
+22Lines changed: 22 additions & 0 deletions
@@ -12,10 +12,12 @@ static bool called_cb_1 = false;
 static bool called_cb_2 = false;
 static bool called_cb_ordered_1 = false;
 static bool called_cb_ordered_2 = false;
+static bool called_at_exit_js = false;
 static void at_exit_callback1(void* arg);
 static void at_exit_callback2(void* arg);
 static void at_exit_callback_ordered1(void* arg);
 static void at_exit_callback_ordered2(void* arg);
+static void at_exit_js(void* arg);
 static std::string cb_1_arg;  // NOLINT(runtime/string)
 
 class EnvironmentTest : public EnvironmentTestFixture {
@@ -91,6 +93,17 @@ TEST_F(EnvironmentTest, AtExitWithArgument) {
   EXPECT_EQ(arg, cb_1_arg);
 }
 
+TEST_F(EnvironmentTest, AtExitRunsJS) {
+  const v8::HandleScope handle_scope(isolate_);
+  const Argv argv;
+  Env env {handle_scope, argv};
+
+  AtExit(*env, at_exit_js, static_cast<void*>(isolate_));
+  EXPECT_FALSE(called_at_exit_js);
+  RunAtExit(*env);
+  EXPECT_TRUE(called_at_exit_js);
+}
+
 TEST_F(EnvironmentTest, MultipleEnvironmentsPerIsolate) {
   const v8::HandleScope handle_scope(isolate_);
   const Argv argv;
@@ -163,3 +176,12 @@ static void at_exit_callback_ordered2(void* arg) {
   EXPECT_FALSE(called_cb_ordered_1);
   called_cb_ordered_2 = true;
 }
+
+static void at_exit_js(void* arg) {
+  v8::Isolate* isolate = static_cast<v8::Isolate*>(arg);
+  v8::HandleScope handle_scope(isolate);
+  v8::Local<v8::Object> obj = v8::Object::New(isolate);
+  assert(!obj.IsEmpty());  // Assert VM is still alive.
+  assert(obj->IsObject());
+  called_at_exit_js = true;
+}