[csa] Refactor promises API

src/builtins/builtins-promise.cc

 // Copyright 2016 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/builtins/builtins-promise.h"
 #include "src/builtins/builtins-utils.h"
 #include "src/builtins/builtins.h"
 #include "src/code-factory.h"
 #include "src/code-stub-assembler.h"
 #include "src/promise-utils.h"
 
 namespace v8 {
 namespace internal {
 
 typedef compiler::Node Node;
 typedef CodeStubAssembler::ParameterMode ParameterMode;
 typedef compiler::CodeAssemblerState CodeAssemblerState;
 
-Node* PromiseBuiltinsAssembler::AllocateAndInitPromise(Node* context,
-                                                       Node* parent) {
-  Node* const instance = AllocateJSPromise(context);
-  PromiseInit(instance);
+Node* PromiseBuiltinsAssembler::AllocateAndInitJSPromise(Node* context,
+                                                         Node* parent) {
+  Node* const instance = CodeStubAssembler::AllocateAndInitJSPromise(context);
 
   Label out(this);
   GotoUnless(IsPromiseHookEnabled(), &out);
+  CallRuntime(Runtime::kPromiseHookInit, context, instance, parent);
+  Goto(&out);
+
+  Bind(&out);
+  return instance;
+}
+
+Node* PromiseBuiltinsAssembler::AllocateAndSetJSPromise(Node* context,
+                                                        Node* status,
+                                                        Node* result,
+                                                        Node* parent) {
+  Node* const instance =
+      CodeStubAssembler::AllocateAndSetJSPromise(context, status, result);
+
+  Label out(this);
+  GotoUnless(IsPromiseHookEnabled(), &out);
   CallRuntime(Runtime::kPromiseHookInit, context, instance, parent);
   Goto(&out);
 
   Bind(&out);
   return instance;
 }
 
 Node* PromiseBuiltinsAssembler::CreatePromiseResolvingFunctionsContext(
     Node* promise, Node* debug_event, Node* native_context) {
   Node* const context =
@@ skipping 181 matching lines @@
       perform_promise_then(this);
   Variable var_deferred_promise(this, MachineRepresentation::kTagged),
       var_deferred_on_resolve(this, MachineRepresentation::kTagged),
       var_deferred_on_reject(this, MachineRepresentation::kTagged);
 
   Branch(WordEqual(promise_fun, constructor), &fast_promise_capability,
          &promise_capability);
 
   Bind(&fast_promise_capability);
   {
-    Node* const deferred_promise = AllocateAndInitPromise(context, promise);
+    Node* const deferred_promise = AllocateAndInitJSPromise(context, promise);
     var_deferred_promise.Bind(deferred_promise);
     var_deferred_on_resolve.Bind(UndefinedConstant());
     var_deferred_on_reject.Bind(UndefinedConstant());
     Goto(&perform_promise_then);
   }
 
   Bind(&promise_capability);
   {
     // TODO(gsathya): Move this to TF.
     Node* const new_promise_capability = LoadContextElement(
@@ skipping 479 matching lines @@
 
   Node* const executor_map = LoadMap(executor);
   GotoUnless(IsCallableMap(executor_map), &if_notcallable);
 
   Node* const native_context = LoadNativeContext(context);
   Node* const promise_fun =
       LoadContextElement(native_context, Context::PROMISE_FUNCTION_INDEX);
   Node* const is_debug_active = IsDebugActive();
   Label if_targetisnotmodified(this),
       if_targetismodified(this, Label::kDeferred), run_executor(this),
-      debug_push(this), init(this);
+      debug_push(this);
 
   Branch(WordEqual(promise_fun, new_target), &if_targetisnotmodified,
          &if_targetismodified);
 
   Variable var_result(this, MachineRepresentation::kTagged),
       var_reject_call(this, MachineRepresentation::kTagged),
       var_reason(this, MachineRepresentation::kTagged);
 
   Bind(&if_targetisnotmodified);
   {
-    Node* const instance = AllocateJSPromise(context);
+    Node* const instance =
+        AllocateAndInitJSPromise(context, UndefinedConstant());
     var_result.Bind(instance);
-    Goto(&init);
+    Goto(&debug_push);
   }
 
   Bind(&if_targetismodified);
   {
     Callable fast_new_object_stub = CodeFactory::FastNewObject(isolate);
     Node* const instance =
         CallStub(fast_new_object_stub, context, promise_fun, new_target);
+    JSPromiseInit(instance);
+    var_result.Bind(instance);
 
-    var_result.Bind(instance);
-    Goto(&init);
-  }
-
-  Bind(&init);
-  {
-    PromiseInit(var_result.value());
     GotoUnless(IsPromiseHookEnabled(), &debug_push);
-    CallRuntime(Runtime::kPromiseHookInit, context, var_result.value(),
+    CallRuntime(Runtime::kPromiseHookInit, context, instance,
                 UndefinedConstant());
     Goto(&debug_push);
   }
 
   Bind(&debug_push);
   {
     GotoUnless(is_debug_active, &run_executor);
     CallRuntime(Runtime::kDebugPushPromise, context, var_result.value());
     Goto(&run_executor);
   }
@@ skipping 44 matching lines @@
     Node* const message_id =
         SmiConstant(MessageTemplate::kResolverNotAFunction);
     CallRuntime(Runtime::kThrowTypeError, context, message_id, executor);
     Return(UndefinedConstant());  // Never reached.
   }
 }
 
 TF_BUILTIN(PromiseInternalConstructor, PromiseBuiltinsAssembler) {
   Node* const parent = Parameter(1);
   Node* const context = Parameter(4);
-  Return(AllocateAndInitPromise(context, parent));
+  Return(AllocateAndInitJSPromise(context, parent));
 }
 
 TF_BUILTIN(PromiseCreateAndSet, PromiseBuiltinsAssembler) {
   Node* const status = Parameter(1);
   Node* const result = Parameter(2);
   Node* const context = Parameter(5);
 
-  Node* const instance = AllocateJSPromise(context);
-  PromiseSet(instance, status, result);
-
-  Label out(this);
-  GotoUnless(IsPromiseHookEnabled(), &out);
-  CallRuntime(Runtime::kPromiseHookInit, context, instance,
-              UndefinedConstant());
-  Goto(&out);
-  Bind(&out);
+  Node* const instance =
+      AllocateAndSetJSPromise(context, status, result, UndefinedConstant());
   Return(instance);
 }
 
 TF_BUILTIN(IsPromise, PromiseBuiltinsAssembler) {
   Node* const maybe_promise = Parameter(1);
   Label if_notpromise(this, Label::kDeferred);
 
   GotoIf(TaggedIsSmi(maybe_promise), &if_notpromise);
 
   Node* const result =
@@ skipping 214 matching lines @@
         CallStub(getproperty_callable, context, promise, then_str);
     Callable call_callable = CodeFactory::Call(isolate);
     Node* const result =
         CallJS(call_callable, context, then, promise, on_resolve, on_reject);
     Return(result);
   }
 }
 
 }  // namespace internal
 }  // namespace v8