nodejs
diff --git a/Collapse file
‎src/node.h‎
Copy file name to clipboardExpand all lines: src/node.h
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file
‎src/node.h‎
Copy file name to clipboardExpand all lines: src/node.h
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/Collapse file
‎test/addons/async-resource/binding.cc‎
Copy file name to clipboardExpand all lines: test/addons/async-resource/binding.cc
+22Lines changed: 22 additions & 0 deletions b/Collapse file
‎test/addons/async-resource/binding.cc‎
Copy file name to clipboardExpand all lines: test/addons/async-resource/binding.cc
+22Lines changed: 22 additions & 0 deletions
diff --git a/Collapse file
‎test/addons/async-resource/test.js‎
Copy file name to clipboardExpand all lines: test/addons/async-resource/test.js
+2Lines changed: 2 additions & 0 deletions b/Collapse file
‎test/addons/async-resource/test.js‎
Copy file name to clipboardExpand all lines: test/addons/async-resource/test.js
+2Lines changed: 2 additions & 0 deletions
@@ -712,7 +712,7 @@ class AsyncResource {
                                      trigger_async_id);
     }
 
-    ~AsyncResource() {
+    virtual ~AsyncResource() {
       EmitAsyncDestroy(isolate_, async_context_);
     }
 
 
@@ -17,6 +17,17 @@ using v8::Object;
 using v8::String;
 using v8::Value;
 
+int custom_async_resource_destructor_calls = 0;
+
+class CustomAsyncResource : public AsyncResource {
+ public:
+  CustomAsyncResource(Isolate* isolate, Local<Object> resource)
+      : AsyncResource(isolate, resource, "CustomAsyncResource") {}
+  ~CustomAsyncResource() {
+    custom_async_resource_destructor_calls++;
+  }
+};
+
 void CreateAsyncResource(const FunctionCallbackInfo<Value>& args) {
   Isolate* isolate = args.GetIsolate();
   assert(args[0]->IsObject());
@@ -98,6 +109,16 @@ void GetResource(const FunctionCallbackInfo<Value>& args) {
   args.GetReturnValue().Set(r->get_resource());
 }
 
+void RunSubclassTest(const FunctionCallbackInfo<Value>& args) {
+  Isolate* isolate = args.GetIsolate();
+  Local<Object> obj = Object::New(isolate);
+
+  assert(custom_async_resource_destructor_calls == 0);
+  CustomAsyncResource* resource = new CustomAsyncResource(isolate, obj);
+  delete static_cast<AsyncResource*>(resource);
+  assert(custom_async_resource_destructor_calls == 1);
+}
+
 void Initialize(Local<Object> exports) {
   NODE_SET_METHOD(exports, "createAsyncResource", CreateAsyncResource);
   NODE_SET_METHOD(exports, "destroyAsyncResource", DestroyAsyncResource);
@@ -107,6 +128,7 @@ void Initialize(Local<Object> exports) {
   NODE_SET_METHOD(exports, "getAsyncId", GetAsyncId);
   NODE_SET_METHOD(exports, "getTriggerAsyncId", GetTriggerAsyncId);
   NODE_SET_METHOD(exports, "getResource", GetResource);
+  NODE_SET_METHOD(exports, "runSubclassTest", RunSubclassTest);
 }
 
 }  // anonymous namespace
 
@@ -5,6 +5,8 @@ const assert = require('assert');
 const binding = require(`./build/${common.buildType}/binding`);
 const async_hooks = require('async_hooks');
 
+binding.runSubclassTest();
+
 const kObjectTag = Symbol('kObjectTag');
 const rootAsyncId = async_hooks.executionAsyncId();
Original file line number	Diff line number	Diff line change
`@@ -712,7 +712,7 @@ class AsyncResource {`
`712`	`712`	`trigger_async_id);`
`713`	`713`	`}`
`714`	`714`
`715`		`- ~AsyncResource() {`
	`715`	`+ virtual ~AsyncResource() {`
`716`	`716`	`EmitAsyncDestroy(isolate_, async_context_);`
`717`	`717`	`}`
`718`	`718`