[stubs] Gets rid of the Smi(Add/Sub)WithOverflow macros.

src/builtins/builtins-number.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-utils.h"
 #include "src/builtins/builtins.h"
 #include "src/code-factory.h"
 
 namespace v8 {
 namespace internal {
@@ skipping 506 matching lines @@
     assembler->Bind(&if_lhsissmi);
     {
       // Check if the {rhs} is also a Smi.
       Label if_rhsissmi(assembler), if_rhsisnotsmi(assembler);
       assembler->Branch(assembler->TaggedIsSmi(rhs), &if_rhsissmi,
                         &if_rhsisnotsmi);
 
       assembler->Bind(&if_rhsissmi);
       {
         // Try fast Smi addition first.
-        Node* pair = assembler->SmiAddWithOverflow(lhs, rhs);
+        Node* pair = assembler->IntPtrAddWithOverflow(
+            assembler->BitcastTaggedToWord(lhs),
+            assembler->BitcastTaggedToWord(rhs));
         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_overflow);
         {
           var_fadd_lhs.Bind(assembler->SmiToFloat64(lhs));
           var_fadd_rhs.Bind(assembler->SmiToFloat64(rhs));
           assembler->Goto(&do_fadd);
         }
 
         assembler->Bind(&if_notoverflow);
-        var_result.Bind(assembler->Projection(0, pair));
+        var_result.Bind(assembler->BitcastWordToTaggedSigned(
+            assembler->Projection(0, pair)));
         assembler->Goto(&end);
       }
 
       assembler->Bind(&if_rhsisnotsmi);
       {
         // Load the map of {rhs}.
         Node* rhs_map = assembler->LoadMap(rhs);
 
         // Check if the {rhs} is a HeapNumber.
         Label if_rhsisnumber(assembler),
@@ skipping 326 matching lines @@
     assembler->Bind(&if_lhsissmi);
     {
       // Check if the {rhs} is also a Smi.
       Label if_rhsissmi(assembler), if_rhsisnotsmi(assembler);
       assembler->Branch(assembler->TaggedIsSmi(rhs), &if_rhsissmi,
                         &if_rhsisnotsmi);
 
       assembler->Bind(&if_rhsissmi);
       {
         // Try a fast Smi subtraction first.
-        Node* pair = assembler->SmiSubWithOverflow(lhs, rhs);
+        Node* pair = assembler->IntPtrSubWithOverflow(
+            assembler->BitcastTaggedToWord(lhs),
+            assembler->BitcastTaggedToWord(rhs));
         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_overflow);
         {
           // The result doesn't fit into Smi range.
           var_fsub_lhs.Bind(assembler->SmiToFloat64(lhs));
           var_fsub_rhs.Bind(assembler->SmiToFloat64(rhs));
           assembler->Goto(&do_fsub);
         }
 
         assembler->Bind(&if_notoverflow);
-        var_result.Bind(assembler->Projection(0, pair));
+        var_result.Bind(assembler->BitcastWordToTaggedSigned(
+            assembler->Projection(0, pair)));
         assembler->Goto(&end);
       }
 
       assembler->Bind(&if_rhsisnotsmi);
       {
         // Load the map of the {rhs}.
         Node* rhs_map = assembler->LoadMap(rhs);
 
         // Check if {rhs} is a HeapNumber.
         Label if_rhsisnumber(assembler),
@@ skipping 788 matching lines @@
   compiler::Node* lhs = assembler->Parameter(0);
   compiler::Node* rhs = assembler->Parameter(1);
   compiler::Node* context = assembler->Parameter(2);
 
   assembler->Return(assembler->StrictEqual(CodeStubAssembler::kNegateResult,
                                            lhs, rhs, context));
 }
 
 }  // namespace internal
 }  // namespace v8