nodejs
diff --git a/‎src/env-inl.h‎
Lines changed: 9 additions & 2 deletions b/‎src/env-inl.h‎
Lines changed: 9 additions & 2 deletions
diff --git a/‎src/env.cc‎
Lines changed: 2 additions & 0 deletions b/‎src/env.cc‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎src/env.h‎
Lines changed: 6 additions & 1 deletion b/‎src/env.h‎
Lines changed: 6 additions & 1 deletion
@@ -541,8 +541,15 @@ Environment::scheduled_immediate_count() {
   return scheduled_immediate_count_;
 }
 
-void Environment::SetImmediate(native_immediate_callback cb, void* data) {
-  native_immediate_callbacks_.push_back({ cb, data });
+void Environment::SetImmediate(native_immediate_callback cb,
+                               void* data,
+                               v8::Local<v8::Object> obj) {
+  native_immediate_callbacks_.push_back({
+    cb,
+    data,
+    std::unique_ptr<v8::Persistent<v8::Object>>(
+        obj.IsEmpty() ? nullptr : new v8::Persistent<v8::Object>(isolate_, obj))
+  });
   if (scheduled_immediate_count_[0] == 0)
     ActivateImmediateCheck();
   scheduled_immediate_count_[0] = scheduled_immediate_count_[0] + 1;
 
@@ -224,6 +224,8 @@ void Environment::RunAndClearNativeImmediates() {
     native_immediate_callbacks_.swap(list);
     for (const auto& cb : list) {
       cb.cb_(this, cb.data_);
+      if (cb.keep_alive_)
+        cb.keep_alive_->Reset();
     }
 
 #ifdef DEBUG
 
@@ -688,7 +688,11 @@ class Environment {
   bool EmitNapiWarning();
 
   typedef void (*native_immediate_callback)(Environment* env, void* data);
-  inline void SetImmediate(native_immediate_callback cb, void* data);
+  // cb will be called as cb(env, data) on the next event loop iteration.
+  // obj will be kept alive between now and after the callback has run.
+  inline void SetImmediate(native_immediate_callback cb,
+                           void* data,
+                           v8::Local<v8::Object> obj = v8::Local<v8::Object>());
   // This needs to be available for the JS-land setImmediate().
   void ActivateImmediateCheck();
 
@@ -756,6 +760,7 @@ class Environment {
   struct NativeImmediateCallback {
     native_immediate_callback cb_;
     void* data_;
+    std::unique_ptr<v8::Persistent<v8::Object>> keep_alive_;
   };
   std::vector<NativeImmediateCallback> native_immediate_callbacks_;
   void RunAndClearNativeImmediates();
Original file line number	Diff line number	Diff line change
@@ -224,6 +224,8 @@ void Environment::RunAndClearNativeImmediates() {
224	224	native_immediate_callbacks_.swap(list);
225	225	for (const auto& cb : list) {
226	226	cb.cb_(this, cb.data_);
	227	+ if (cb.keep_alive_)
	228	+ cb.keep_alive_->Reset();
227	229	}
228	230
229	231	#ifdef DEBUG