[cleanup] Refactor remaining builtins-*.cc to use TF_BUILTIN macro

src/builtins/builtins-global.cc

Index: src/builtins/builtins-global.cc
diff --git a/src/builtins/builtins-global.cc b/src/builtins/builtins-global.cc
index 2af6e99730a6300ad37b4e0ca4f71cdfcd8795af..2bbd7c78b557d7705cae5598fd4be375686b4ce7 100644
--- a/src/builtins/builtins-global.cc
+++ b/src/builtins/builtins-global.cc
@@ -104,110 +104,98 @@ BUILTIN(GlobalEval) {
 }
 
 // ES6 section 18.2.2 isFinite ( number )
-void Builtins::Generate_GlobalIsFinite(compiler::CodeAssemblerState* state) {
-  typedef CodeStubAssembler::Label Label;
-  typedef compiler::Node Node;
-  typedef CodeStubAssembler::Variable Variable;
-  CodeStubAssembler assembler(state);
+TF_BUILTIN(GlobalIsFinite, CodeStubAssembler) {
+  Node* context = Parameter(4);
 
-  Node* context = assembler.Parameter(4);
-
-  Label return_true(&assembler), return_false(&assembler);
+  Label return_true(this), return_false(this);
 
   // We might need to loop once for ToNumber conversion.
-  Variable var_num(&assembler, MachineRepresentation::kTagged);
-  Label loop(&assembler, &var_num);
-  var_num.Bind(assembler.Parameter(1));
-  assembler.Goto(&loop);
-  assembler.Bind(&loop);
+  Variable var_num(this, MachineRepresentation::kTagged);
+  Label loop(this, &var_num);
+  var_num.Bind(Parameter(1));
+  Goto(&loop);
+  Bind(&loop);
   {
-    // Load the current {num} value.
     Node* num = var_num.value();
 
     // Check if {num} is a Smi or a HeapObject.
-    assembler.GotoIf(assembler.TaggedIsSmi(num), &return_true);
+    GotoIf(TaggedIsSmi(num), &return_true);
 
     // Check if {num} is a HeapNumber.
-    Label if_numisheapnumber(&assembler),
-        if_numisnotheapnumber(&assembler, Label::kDeferred);
-    assembler.Branch(assembler.IsHeapNumberMap(assembler.LoadMap(num)),
-                     &if_numisheapnumber, &if_numisnotheapnumber);
+    Label if_numisheapnumber(this),
+        if_numisnotheapnumber(this, Label::kDeferred);
+    Branch(IsHeapNumberMap(LoadMap(num)), &if_numisheapnumber,
+           &if_numisnotheapnumber);
 
-    assembler.Bind(&if_numisheapnumber);
+    Bind(&if_numisheapnumber);
     {
       // Check if {num} contains a finite, non-NaN value.
-      Node* num_value = assembler.LoadHeapNumberValue(num);
-      assembler.BranchIfFloat64IsNaN(assembler.Float64Sub(num_value, num_value),
-                                     &return_false, &return_true);
+      Node* num_value = LoadHeapNumberValue(num);
+      BranchIfFloat64IsNaN(Float64Sub(num_value, num_value), &return_false,
+                           &return_true);
     }
 
-    assembler.Bind(&if_numisnotheapnumber);
+    Bind(&if_numisnotheapnumber);
     {
       // Need to convert {num} to a Number first.
-      Callable callable = CodeFactory::NonNumberToNumber(assembler.isolate());
-      var_num.Bind(assembler.CallStub(callable, context, num));
-      assembler.Goto(&loop);
+      Callable callable = CodeFactory::NonNumberToNumber(isolate());
+      var_num.Bind(CallStub(callable, context, num));
+      Goto(&loop);
     }
   }
 
-  assembler.Bind(&return_true);
-  assembler.Return(assembler.BooleanConstant(true));
+  Bind(&return_true);
+  Return(BooleanConstant(true));
 
-  assembler.Bind(&return_false);
-  assembler.Return(assembler.BooleanConstant(false));
+  Bind(&return_false);
+  Return(BooleanConstant(false));
 }
 
 // ES6 section 18.2.3 isNaN ( number )
-void Builtins::Generate_GlobalIsNaN(compiler::CodeAssemblerState* state) {
-  typedef CodeStubAssembler::Label Label;
-  typedef compiler::Node Node;
-  typedef CodeStubAssembler::Variable Variable;
-  CodeStubAssembler assembler(state);
-
-  Node* context = assembler.Parameter(4);
+TF_BUILTIN(GlobalIsNaN, CodeStubAssembler) {
+  Node* context = Parameter(4);
 
-  Label return_true(&assembler), return_false(&assembler);
+  Label return_true(this), return_false(this);
 
   // We might need to loop once for ToNumber conversion.
-  Variable var_num(&assembler, MachineRepresentation::kTagged);
-  Label loop(&assembler, &var_num);
-  var_num.Bind(assembler.Parameter(1));
-  assembler.Goto(&loop);
-  assembler.Bind(&loop);
+  Variable var_num(this, MachineRepresentation::kTagged);
+  Label loop(this, &var_num);
+  var_num.Bind(Parameter(1));
+  Goto(&loop);
+  Bind(&loop);
   {
-    // Load the current {num} value.
     Node* num = var_num.value();
 
     // Check if {num} is a Smi or a HeapObject.
-    assembler.GotoIf(assembler.TaggedIsSmi(num), &return_false);
+    GotoIf(TaggedIsSmi(num), &return_false);
 
     // Check if {num} is a HeapNumber.
-    Label if_numisheapnumber(&assembler),
-        if_numisnotheapnumber(&assembler, Label::kDeferred);
-    assembler.Branch(assembler.IsHeapNumberMap(assembler.LoadMap(num)),
-                     &if_numisheapnumber, &if_numisnotheapnumber);
+    Label if_numisheapnumber(this),
+        if_numisnotheapnumber(this, Label::kDeferred);
+    Branch(IsHeapNumberMap(LoadMap(num)), &if_numisheapnumber,
+           &if_numisnotheapnumber);
 
-    assembler.Bind(&if_numisheapnumber);
+    Bind(&if_numisheapnumber);
     {
       // Check if {num} contains a NaN.
-      Node* num_value = assembler.LoadHeapNumberValue(num);
-      assembler.BranchIfFloat64IsNaN(num_value, &return_true, &return_false);
+      Node* num_value = LoadHeapNumberValue(num);
+      BranchIfFloat64IsNaN(num_value, &return_true, &return_false);
     }
 
-    assembler.Bind(&if_numisnotheapnumber);
+    Bind(&if_numisnotheapnumber);
     {
       // Need to convert {num} to a Number first.
-      Callable callable = CodeFactory::NonNumberToNumber(assembler.isolate());
-      var_num.Bind(assembler.CallStub(callable, context, num));
-      assembler.Goto(&loop);
+      Callable callable = CodeFactory::NonNumberToNumber(isolate());
+      var_num.Bind(CallStub(callable, context, num));
+      Goto(&loop);
     }
   }
 
-  assembler.Bind(&return_true);
-  assembler.Return(assembler.BooleanConstant(true));
+  Bind(&return_true);
+  Return(BooleanConstant(true));
 
-  assembler.Bind(&return_false);
-  assembler.Return(assembler.BooleanConstant(false));
+  Bind(&return_false);
+  Return(BooleanConstant(false));
 }
 
 }  // namespace internal