[Interpreter] Inline Inc/Dec code stubs into bytecode handlers.

src/code-stubs.cc

 // Copyright 2012 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/code-stubs.h"
 
 #include <sstream>
 
 #include "src/bootstrapper.h"
 #include "src/code-factory.h"
@@ skipping 1633 matching lines @@
                                          compiler::Node* context) {
   using compiler::Node;
 
   Node* lhs_value = assembler->TruncateTaggedToWord32(context, left);
   Node* rhs_value = assembler->TruncateTaggedToWord32(context, right);
   Node* value = assembler->Word32Xor(lhs_value, rhs_value);
   Node* result = assembler->ChangeInt32ToTagged(value);
   return result;
 }
 
-void IncStub::GenerateAssembly(CodeStubAssembler* assembler) const {
+// static
+compiler::Node* IncStub::Generate(CodeStubAssembler* assembler,
+                                  compiler::Node* value,
+                                  compiler::Node* context) {
   typedef CodeStubAssembler::Label Label;
   typedef compiler::Node Node;
   typedef CodeStubAssembler::Variable Variable;
 
-  Node* context = assembler->Parameter(1);
-
   // Shared entry for floating point increment.
-  Label do_finc(assembler);
+  Label do_finc(assembler), end(assembler);
   Variable var_finc_value(assembler, MachineRepresentation::kFloat64);
 
   // We might need to try again due to ToNumber conversion.
   Variable value_var(assembler, MachineRepresentation::kTagged);
+  Variable result_var(assembler, MachineRepresentation::kTagged);
   Label start(assembler, &value_var);
-  value_var.Bind(assembler->Parameter(0));
+  value_var.Bind(value);
   assembler->Goto(&start);
   assembler->Bind(&start);
   {
-    Node* value = value_var.value();
+    value = value_var.value();
 
     Label if_issmi(assembler), if_isnotsmi(assembler);
     assembler->Branch(assembler->WordIsSmi(value), &if_issmi, &if_isnotsmi);
 
     assembler->Bind(&if_issmi);
     {
       // Try fast Smi addition first.
       Node* one = assembler->SmiConstant(Smi::FromInt(1));
       Node* pair = assembler->SmiAddWithOverflow(value, one);
       Node* overflow = assembler->Projection(1, pair);
 
       // Check if the Smi additon overflowed.
       Label if_overflow(assembler), if_notoverflow(assembler);
       assembler->Branch(overflow, &if_overflow, &if_notoverflow);
 
       assembler->Bind(&if_notoverflow);
-      assembler->Return(assembler->Projection(0, pair));
+      result_var.Bind(assembler->Projection(0, pair));
+      assembler->Goto(&end);
 
       assembler->Bind(&if_overflow);
       {
         var_finc_value.Bind(assembler->SmiToFloat64(value));
         assembler->Goto(&do_finc);
       }
     }
 
     assembler->Bind(&if_isnotsmi);
     {
       // Check if the value is a HeapNumber.
       Label if_valueisnumber(assembler),
           if_valuenotnumber(assembler, Label::kDeferred);
       Node* value_map = assembler->LoadMap(value);
       Node* number_map = assembler->HeapNumberMapConstant();
       assembler->Branch(assembler->WordEqual(value_map, number_map),
                         &if_valueisnumber, &if_valuenotnumber);
 
       assembler->Bind(&if_valueisnumber);
       {
         // Load the HeapNumber value.
         var_finc_value.Bind(assembler->LoadHeapNumberValue(value));
         assembler->Goto(&do_finc);
       }
 
       assembler->Bind(&if_valuenotnumber);
       {
         // Convert to a Number first and try again.
-        Callable callable = CodeFactory::NonNumberToNumber(isolate());
+        Callable callable =
+            CodeFactory::NonNumberToNumber(assembler->isolate());
         value_var.Bind(assembler->CallStub(callable, context, value));
         assembler->Goto(&start);
       }
     }
   }
 
   assembler->Bind(&do_finc);
   {
     Node* finc_value = var_finc_value.value();
     Node* one = assembler->Float64Constant(1.0);
     Node* finc_result = assembler->Float64Add(finc_value, one);
-    Node* result = assembler->ChangeFloat64ToTagged(finc_result);
-    assembler->Return(result);
+    result_var.Bind(assembler->ChangeFloat64ToTagged(finc_result));
+    assembler->Goto(&end);
   }
+
+  assembler->Bind(&end);
+  return result_var.value();
 }
 
-void DecStub::GenerateAssembly(CodeStubAssembler* assembler) const {
+// static
+compiler::Node* DecStub::Generate(CodeStubAssembler* assembler,
+                                  compiler::Node* value,
+                                  compiler::Node* context) {
   typedef CodeStubAssembler::Label Label;
   typedef compiler::Node Node;
   typedef CodeStubAssembler::Variable Variable;
 
-  Node* context = assembler->Parameter(1);
-
   // Shared entry for floating point decrement.
-  Label do_fdec(assembler);
+  Label do_fdec(assembler), end(assembler);
   Variable var_fdec_value(assembler, MachineRepresentation::kFloat64);
 
   // We might need to try again due to ToNumber conversion.
   Variable value_var(assembler, MachineRepresentation::kTagged);
+  Variable result_var(assembler, MachineRepresentation::kTagged);
   Label start(assembler, &value_var);
-  value_var.Bind(assembler->Parameter(0));
+  value_var.Bind(value);
   assembler->Goto(&start);
   assembler->Bind(&start);
   {
-    Node* value = value_var.value();
+    value = value_var.value();
 
     Label if_issmi(assembler), if_isnotsmi(assembler);
     assembler->Branch(assembler->WordIsSmi(value), &if_issmi, &if_isnotsmi);
 
     assembler->Bind(&if_issmi);
     {
       // Try fast Smi subtraction first.
       Node* one = assembler->SmiConstant(Smi::FromInt(1));
       Node* pair = assembler->SmiSubWithOverflow(value, one);
       Node* overflow = assembler->Projection(1, pair);
 
       // Check if the Smi subtraction overflowed.
       Label if_overflow(assembler), if_notoverflow(assembler);
       assembler->Branch(overflow, &if_overflow, &if_notoverflow);
 
       assembler->Bind(&if_notoverflow);
-      assembler->Return(assembler->Projection(0, pair));
+      result_var.Bind(assembler->Projection(0, pair));
+      assembler->Goto(&end);
 
       assembler->Bind(&if_overflow);
       {
         var_fdec_value.Bind(assembler->SmiToFloat64(value));
         assembler->Goto(&do_fdec);
       }
     }
 
     assembler->Bind(&if_isnotsmi);
     {
       // Check if the value is a HeapNumber.
       Label if_valueisnumber(assembler),
           if_valuenotnumber(assembler, Label::kDeferred);
       Node* value_map = assembler->LoadMap(value);
       Node* number_map = assembler->HeapNumberMapConstant();
       assembler->Branch(assembler->WordEqual(value_map, number_map),
                         &if_valueisnumber, &if_valuenotnumber);
 
       assembler->Bind(&if_valueisnumber);
       {
         // Load the HeapNumber value.
         var_fdec_value.Bind(assembler->LoadHeapNumberValue(value));
         assembler->Goto(&do_fdec);
       }
 
       assembler->Bind(&if_valuenotnumber);
       {
         // Convert to a Number first and try again.
-        Callable callable = CodeFactory::NonNumberToNumber(isolate());
+        Callable callable =
+            CodeFactory::NonNumberToNumber(assembler->isolate());
         value_var.Bind(assembler->CallStub(callable, context, value));
         assembler->Goto(&start);
       }
     }
   }
 
   assembler->Bind(&do_fdec);
   {
     Node* fdec_value = var_fdec_value.value();
     Node* one = assembler->Float64Constant(1.0);
     Node* fdec_result = assembler->Float64Sub(fdec_value, one);
-    Node* result = assembler->ChangeFloat64ToTagged(fdec_result);
-    assembler->Return(result);
+    result_var.Bind(assembler->ChangeFloat64ToTagged(fdec_result));
+    assembler->Goto(&end);
   }
+
+  assembler->Bind(&end);
+  return result_var.value();
 }
 
 void InstanceOfStub::GenerateAssembly(CodeStubAssembler* assembler) const {
   typedef CodeStubAssembler::Label Label;
   typedef compiler::Node Node;
 
   Node* object = assembler->Parameter(0);
   Node* callable = assembler->Parameter(1);
   Node* context = assembler->Parameter(2);
 
@@ skipping 2695 matching lines @@
   if (type->Is(Type::UntaggedPointer())) {
     return Representation::External();
   }
 
   DCHECK(!type->Is(Type::Untagged()));
   return Representation::Tagged();
 }
 
 }  // namespace internal
 }  // namespace v8