src: make AsyncWrap constructors delegate

Currently, there is an AsyncWrap constructor that is only used by PromiseWrap. This constructor has a body which is very similar to the other AsyncWrap constructor. This commit suggests updating the private constructor that is used by PromiseWrap and also have the second constructor delegate to this one to avoid the code duplication. PR-URL: #19366 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Minwoo Jung <[email protected]> Reviewed-By: Anna Henningsen <[email protected]>
nodejs · Oct 18, 2018 · 5b2f650 · 5b2f650
1 parent b407060
commit 5b2f650
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 18 deletions.
diff --git a/src/async_wrap.cc b/src/async_wrap.cc
@@ -254,7 +254,7 @@ void AsyncWrap::EmitAfter(Environment* env, double async_id) {
 class PromiseWrap : public AsyncWrap {
  public:
   PromiseWrap(Environment* env, Local<Object> object, bool silent)
-      : AsyncWrap(env, object, silent) {
+      : AsyncWrap(env, object, PROVIDER_PROMISE, -1, silent) {
     MakeWeak(this);
   }
   size_t self_size() const override { return sizeof(*this); }
@@ -626,32 +626,23 @@ AsyncWrap::AsyncWrap(Environment* env,
                      Local<Object> object,
                      ProviderType provider,
                      double execution_async_id)
-    : BaseObject(env, object),
-      provider_type_(provider) {
-  CHECK_NE(provider, PROVIDER_NONE);
-  CHECK_GE(object->InternalFieldCount(), 1);
+    : AsyncWrap(env, object, provider, execution_async_id, false) {}
 
-  // Shift provider value over to prevent id collision.
-  persistent().SetWrapperClassId(NODE_ASYNC_ID_OFFSET + provider);
-
-  // Use AsyncReset() call to execute the init() callbacks.
-  AsyncReset(execution_async_id);
-}
-
-
-// This is specifically used by the PromiseWrap constructor.
 AsyncWrap::AsyncWrap(Environment* env,
                      Local<Object> object,
+                     ProviderType provider,
+                     double execution_async_id,
                      bool silent)
     : BaseObject(env, object),
-      provider_type_(PROVIDER_PROMISE) {
+      provider_type_(provider) {
+  CHECK_NE(provider, PROVIDER_NONE);
   CHECK_GE(object->InternalFieldCount(), 1);
 
   // Shift provider value over to prevent id collision.
   persistent().SetWrapperClassId(NODE_ASYNC_ID_OFFSET + provider_type_);
 
   // Use AsyncReset() call to execute the init() callbacks.
-  AsyncReset(-1, silent);
+  AsyncReset(execution_async_id, silent);
 }
 
 

diff --git a/src/async_wrap.h b/src/async_wrap.h
@@ -173,8 +173,11 @@ class AsyncWrap : public BaseObject {
  private:
   friend class PromiseWrap;
 
-  // This is specifically used by the PromiseWrap constructor.
-  AsyncWrap(Environment* env, v8::Local<v8::Object> promise, bool silent);
+  AsyncWrap(Environment* env,
+            v8::Local<v8::Object> promise,
+            ProviderType provider,
+            double execution_async_id,
+            bool silent);
   inline AsyncWrap();
   const ProviderType provider_type_;
   // Because the values may be Reset(), cannot be made const.