[ignition] Use Smis directly for type feedback

src/interpreter/interpreter.cc

 // Copyright 2015 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/interpreter/interpreter.h"
 
 #include <fstream>
 #include <memory>
 
 #include "src/ast/prettyprinter.h"
@@ skipping 1026 matching lines @@
   // TODO(interpreter): the only reason this check is here is because we
   // sometimes emit comparisons that shouldn't collect feedback (e.g.
   // try-finally blocks and generators), and we could get rid of this by
   // introducing Smi equality tests.
   Label gather_type_feedback(assembler), do_compare(assembler);
   __ Branch(__ WordEqual(slot_index, __ IntPtrConstant(0)), &do_compare,
             &gather_type_feedback);
 
   __ Bind(&gather_type_feedback);
   {
-    Variable var_type_feedback(assembler, MachineRepresentation::kWord32);
+    Variable var_type_feedback(assembler, MachineRepresentation::kTaggedSigned);
     Label lhs_is_not_smi(assembler), lhs_is_not_number(assembler),
         lhs_is_not_string(assembler), gather_rhs_type(assembler),
         update_feedback(assembler);
 
     __ GotoUnless(__ TaggedIsSmi(lhs), &lhs_is_not_smi);
 
     var_type_feedback.Bind(
-        __ Int32Constant(CompareOperationFeedback::kSignedSmall));
+        __ SmiConstant(CompareOperationFeedback::kSignedSmall));
     __ Goto(&gather_rhs_type);
 
     __ Bind(&lhs_is_not_smi);
     {
       Node* lhs_map = __ LoadMap(lhs);
       __ GotoUnless(__ IsHeapNumberMap(lhs_map), &lhs_is_not_number);
 
-      var_type_feedback.Bind(
-          __ Int32Constant(CompareOperationFeedback::kNumber));
+      var_type_feedback.Bind(__ SmiConstant(CompareOperationFeedback::kNumber));
       __ Goto(&gather_rhs_type);
 
       __ Bind(&lhs_is_not_number);
       {
         Node* lhs_instance_type = __ LoadInstanceType(lhs);
         if (Token::IsOrderedRelationalCompareOp(compare_op)) {
           Label lhs_is_not_oddball(assembler);
           __ GotoUnless(
               __ Word32Equal(lhs_instance_type, __ Int32Constant(ODDBALL_TYPE)),
               &lhs_is_not_oddball);
 
           var_type_feedback.Bind(
-              __ Int32Constant(CompareOperationFeedback::kNumberOrOddball));
+              __ SmiConstant(CompareOperationFeedback::kNumberOrOddball));
           __ Goto(&gather_rhs_type);
 
           __ Bind(&lhs_is_not_oddball);
         }
 
         Label lhs_is_not_string(assembler);
         __ GotoUnless(__ IsStringInstanceType(lhs_instance_type),
                       &lhs_is_not_string);
 
         if (Token::IsOrderedRelationalCompareOp(compare_op)) {
           var_type_feedback.Bind(
-              __ Int32Constant(CompareOperationFeedback::kString));
+              __ SmiConstant(CompareOperationFeedback::kString));
         } else {
-          var_type_feedback.Bind(__ SelectInt32Constant(
+          var_type_feedback.Bind(__ SelectSmiConstant(
               __ Word32Equal(
                   __ Word32And(lhs_instance_type,
                                __ Int32Constant(kIsNotInternalizedMask)),
                   __ Int32Constant(kInternalizedTag)),
               CompareOperationFeedback::kInternalizedString,
               CompareOperationFeedback::kString));
         }
         __ Goto(&gather_rhs_type);
 
         __ Bind(&lhs_is_not_string);
-        var_type_feedback.Bind(
-            __ Int32Constant(CompareOperationFeedback::kAny));
+        var_type_feedback.Bind(__ SmiConstant(CompareOperationFeedback::kAny));
         __ Goto(&gather_rhs_type);
       }
     }
 
     __ Bind(&gather_rhs_type);
     {
       Label rhs_is_not_smi(assembler), rhs_is_not_number(assembler);
 
       __ GotoUnless(__ TaggedIsSmi(rhs), &rhs_is_not_smi);
 
-      var_type_feedback.Bind(__ Word32Or(
-          var_type_feedback.value(),
-          __ Int32Constant(CompareOperationFeedback::kSignedSmall)));
+      var_type_feedback.Bind(
+          __ SmiOr(var_type_feedback.value(),
+                   __ SmiConstant(CompareOperationFeedback::kSignedSmall)));
       __ Goto(&update_feedback);
 
       __ Bind(&rhs_is_not_smi);
       {
         Node* rhs_map = __ LoadMap(rhs);
         __ GotoUnless(__ IsHeapNumberMap(rhs_map), &rhs_is_not_number);
 
         var_type_feedback.Bind(
-            __ Word32Or(var_type_feedback.value(),
-                        __ Int32Constant(CompareOperationFeedback::kNumber)));
+            __ SmiOr(var_type_feedback.value(),
+                     __ SmiConstant(CompareOperationFeedback::kNumber)));
         __ Goto(&update_feedback);
 
         __ Bind(&rhs_is_not_number);
         {
           Node* rhs_instance_type = __ LoadInstanceType(rhs);
           if (Token::IsOrderedRelationalCompareOp(compare_op)) {
             Label rhs_is_not_oddball(assembler);
             __ GotoUnless(__ Word32Equal(rhs_instance_type,
                                          __ Int32Constant(ODDBALL_TYPE)),
                           &rhs_is_not_oddball);
 
-            var_type_feedback.Bind(__ Word32Or(
+            var_type_feedback.Bind(__ SmiOr(
                 var_type_feedback.value(),
-                __ Int32Constant(CompareOperationFeedback::kNumberOrOddball)));
+                __ SmiConstant(CompareOperationFeedback::kNumberOrOddball)));
             __ Goto(&update_feedback);
 
             __ Bind(&rhs_is_not_oddball);
           }
 
           Label rhs_is_not_string(assembler);
           __ GotoUnless(__ IsStringInstanceType(rhs_instance_type),
                         &rhs_is_not_string);
 
           if (Token::IsOrderedRelationalCompareOp(compare_op)) {
-            var_type_feedback.Bind(__ Word32Or(
+            var_type_feedback.Bind(
+                __ SmiOr(var_type_feedback.value(),
+                         __ SmiConstant(CompareOperationFeedback::kString)));
+          } else {
+            var_type_feedback.Bind(__ SmiOr(
                 var_type_feedback.value(),
-                __ Int32Constant(CompareOperationFeedback::kString)));
-          } else {
-            var_type_feedback.Bind(__ Word32Or(
-                var_type_feedback.value(),
-                __ SelectInt32Constant(
+                __ SelectSmiConstant(
                     __ Word32Equal(
                         __ Word32And(rhs_instance_type,
                                      __ Int32Constant(kIsNotInternalizedMask)),
                         __ Int32Constant(kInternalizedTag)),
                     CompareOperationFeedback::kInternalizedString,
                     CompareOperationFeedback::kString)));
           }
           __ Goto(&update_feedback);
 
           __ Bind(&rhs_is_not_string);
           var_type_feedback.Bind(
-              __ Int32Constant(CompareOperationFeedback::kAny));
+              __ SmiConstant(CompareOperationFeedback::kAny));
           __ Goto(&update_feedback);
         }
       }
     }
 
     __ Bind(&update_feedback);
     {
       __ UpdateFeedback(var_type_feedback.value(), type_feedback_vector,
                         slot_index);
       __ Goto(&do_compare);
@@ skipping 75 matching lines @@
 
 void Interpreter::DoBitwiseBinaryOp(Token::Value bitwise_op,
                                     InterpreterAssembler* assembler) {
   Node* reg_index = __ BytecodeOperandReg(0);
   Node* lhs = __ LoadRegister(reg_index);
   Node* rhs = __ GetAccumulator();
   Node* context = __ GetContext();
   Node* slot_index = __ BytecodeOperandIdx(1);
   Node* type_feedback_vector = __ LoadTypeFeedbackVector();
 
-  Variable var_lhs_type_feedback(assembler, MachineRepresentation::kWord32),
-      var_rhs_type_feedback(assembler, MachineRepresentation::kWord32);
+  Variable var_lhs_type_feedback(assembler,
+                                 MachineRepresentation::kTaggedSigned),
+      var_rhs_type_feedback(assembler, MachineRepresentation::kTaggedSigned);
   Node* lhs_value = __ TruncateTaggedToWord32WithFeedback(
       context, lhs, &var_lhs_type_feedback);
   Node* rhs_value = __ TruncateTaggedToWord32WithFeedback(
       context, rhs, &var_rhs_type_feedback);
   Node* result = nullptr;
 
   switch (bitwise_op) {
     case Token::BIT_OR: {
       Node* value = __ Word32Or(lhs_value, rhs_value);
       result = __ ChangeInt32ToTagged(value);
@@ skipping 18 matching lines @@
     } break;
     case Token::SAR: {
       Node* value = __ Word32Sar(
           lhs_value, __ Word32And(rhs_value, __ Int32Constant(0x1f)));
       result = __ ChangeInt32ToTagged(value);
     } break;
     default:
       UNREACHABLE();
   }
 
-  Node* result_type = __ SelectInt32Constant(
+  Node* result_type = __ SelectSmiConstant(
       __ TaggedIsSmi(result), BinaryOperationFeedback::kSignedSmall,
       BinaryOperationFeedback::kNumber);
 
   if (FLAG_debug_code) {
     Label ok(assembler);
     __ GotoIf(__ TaggedIsSmi(result), &ok);
     Node* result_map = __ LoadMap(result);
     __ AbortIfWordNotEqual(result_map, __ HeapNumberMapConstant(),
                            kExpectedHeapNumber);
     __ Goto(&ok);
     __ Bind(&ok);
   }
 
   Node* input_feedback =
-      __ Word32Or(var_lhs_type_feedback.value(), var_rhs_type_feedback.value());
-  __ UpdateFeedback(__ Word32Or(result_type, input_feedback),
-                    type_feedback_vector, slot_index);
+      __ SmiOr(var_lhs_type_feedback.value(), var_rhs_type_feedback.value());
+  __ UpdateFeedback(__ SmiOr(result_type, input_feedback), type_feedback_vector,
+                    slot_index);
   __ SetAccumulator(result);
   __ Dispatch();
 }
 
 // BitwiseOr <src>
 //
 // BitwiseOr register <src> to accumulator.
 void Interpreter::DoBitwiseOr(InterpreterAssembler* assembler) {
   DoBitwiseBinaryOp(Token::BIT_OR, assembler);
 }
@@ skipping 65 matching lines @@
     // Try fast Smi addition first.
     Node* pair = __ IntPtrAddWithOverflow(__ BitcastTaggedToWord(left),
                                           __ BitcastTaggedToWord(right));
     Node* overflow = __ Projection(1, pair);
 
     // Check if the Smi additon overflowed.
     Label if_notoverflow(assembler);
     __ Branch(overflow, &slowpath, &if_notoverflow);
     __ Bind(&if_notoverflow);
     {
-      __ UpdateFeedback(__ Int32Constant(BinaryOperationFeedback::kSignedSmall),
+      __ UpdateFeedback(__ SmiConstant(BinaryOperationFeedback::kSignedSmall),
                         type_feedback_vector, slot_index);
       var_result.Bind(__ BitcastWordToTaggedSigned(__ Projection(0, pair)));
       __ Goto(&end);
     }
   }
   __ Bind(&slowpath);
   {
     Node* context = __ GetContext();
     AddWithFeedbackStub stub(__ isolate());
     Callable callable =
@@ skipping 33 matching lines @@
     // Try fast Smi subtraction first.
     Node* pair = __ IntPtrSubWithOverflow(__ BitcastTaggedToWord(left),
                                           __ BitcastTaggedToWord(right));
     Node* overflow = __ Projection(1, pair);
 
     // Check if the Smi subtraction overflowed.
     Label if_notoverflow(assembler);
     __ Branch(overflow, &slowpath, &if_notoverflow);
     __ Bind(&if_notoverflow);
     {
-      __ UpdateFeedback(__ Int32Constant(BinaryOperationFeedback::kSignedSmall),
+      __ UpdateFeedback(__ SmiConstant(BinaryOperationFeedback::kSignedSmall),
                         type_feedback_vector, slot_index);
       var_result.Bind(__ BitcastWordToTaggedSigned(__ Projection(0, pair)));
       __ Goto(&end);
     }
   }
   __ Bind(&slowpath);
   {
     Node* context = __ GetContext();
     SubtractWithFeedbackStub stub(__ isolate());
     Callable callable = Callable(
@@ skipping 14 matching lines @@
 //
 // BitwiseOr <reg> with <imm>. For this operation <reg> is the lhs
 // operand and <imm> is the rhs operand.
 void Interpreter::DoBitwiseOrSmi(InterpreterAssembler* assembler) {
   Node* reg_index = __ BytecodeOperandReg(1);
   Node* left = __ LoadRegister(reg_index);
   Node* right = __ BytecodeOperandImmSmi(0);
   Node* context = __ GetContext();
   Node* slot_index = __ BytecodeOperandIdx(2);
   Node* type_feedback_vector = __ LoadTypeFeedbackVector();
-  Variable var_lhs_type_feedback(assembler, MachineRepresentation::kWord32);
+  Variable var_lhs_type_feedback(assembler,
+                                 MachineRepresentation::kTaggedSigned);
   Node* lhs_value = __ TruncateTaggedToWord32WithFeedback(
       context, left, &var_lhs_type_feedback);
   Node* rhs_value = __ SmiToWord32(right);
   Node* value = __ Word32Or(lhs_value, rhs_value);
   Node* result = __ ChangeInt32ToTagged(value);
-  Node* result_type = __ SelectInt32Constant(
+  Node* result_type = __ SelectSmiConstant(
       __ TaggedIsSmi(result), BinaryOperationFeedback::kSignedSmall,
       BinaryOperationFeedback::kNumber);
-  __ UpdateFeedback(__ Word32Or(result_type, var_lhs_type_feedback.value()),
+  __ UpdateFeedback(__ SmiOr(result_type, var_lhs_type_feedback.value()),
                     type_feedback_vector, slot_index);
   __ SetAccumulator(result);
   __ Dispatch();
 }
 
 // BitwiseAnd <imm> <reg>
 //
 // BitwiseAnd <reg> with <imm>. For this operation <reg> is the lhs
 // operand and <imm> is the rhs operand.
 void Interpreter::DoBitwiseAndSmi(InterpreterAssembler* assembler) {
   Node* reg_index = __ BytecodeOperandReg(1);
   Node* left = __ LoadRegister(reg_index);
   Node* right = __ BytecodeOperandImmSmi(0);
   Node* context = __ GetContext();
   Node* slot_index = __ BytecodeOperandIdx(2);
   Node* type_feedback_vector = __ LoadTypeFeedbackVector();
-  Variable var_lhs_type_feedback(assembler, MachineRepresentation::kWord32);
+  Variable var_lhs_type_feedback(assembler,
+                                 MachineRepresentation::kTaggedSigned);
   Node* lhs_value = __ TruncateTaggedToWord32WithFeedback(
       context, left, &var_lhs_type_feedback);
   Node* rhs_value = __ SmiToWord32(right);
   Node* value = __ Word32And(lhs_value, rhs_value);
   Node* result = __ ChangeInt32ToTagged(value);
-  Node* result_type = __ SelectInt32Constant(
+  Node* result_type = __ SelectSmiConstant(
       __ TaggedIsSmi(result), BinaryOperationFeedback::kSignedSmall,
       BinaryOperationFeedback::kNumber);
-  __ UpdateFeedback(__ Word32Or(result_type, var_lhs_type_feedback.value()),
+  __ UpdateFeedback(__ SmiOr(result_type, var_lhs_type_feedback.value()),
                     type_feedback_vector, slot_index);
   __ SetAccumulator(result);
   __ Dispatch();
 }
 
 // ShiftLeftSmi <imm> <reg>
 //
 // Left shifts register <src> by the count specified in <imm>.
 // Register <src> is converted to an int32 before the operation. The 5
 // lsb bits from <imm> are used as count i.e. <src> << (<imm> & 0x1F).
 void Interpreter::DoShiftLeftSmi(InterpreterAssembler* assembler) {
   Node* reg_index = __ BytecodeOperandReg(1);
   Node* left = __ LoadRegister(reg_index);
   Node* right = __ BytecodeOperandImmSmi(0);
   Node* context = __ GetContext();
   Node* slot_index = __ BytecodeOperandIdx(2);
   Node* type_feedback_vector = __ LoadTypeFeedbackVector();
-  Variable var_lhs_type_feedback(assembler, MachineRepresentation::kWord32);
+  Variable var_lhs_type_feedback(assembler,
+                                 MachineRepresentation::kTaggedSigned);
   Node* lhs_value = __ TruncateTaggedToWord32WithFeedback(
       context, left, &var_lhs_type_feedback);
   Node* rhs_value = __ SmiToWord32(right);
   Node* shift_count = __ Word32And(rhs_value, __ Int32Constant(0x1f));
   Node* value = __ Word32Shl(lhs_value, shift_count);
   Node* result = __ ChangeInt32ToTagged(value);
-  Node* result_type = __ SelectInt32Constant(
+  Node* result_type = __ SelectSmiConstant(
       __ TaggedIsSmi(result), BinaryOperationFeedback::kSignedSmall,
       BinaryOperationFeedback::kNumber);
-  __ UpdateFeedback(__ Word32Or(result_type, var_lhs_type_feedback.value()),
+  __ UpdateFeedback(__ SmiOr(result_type, var_lhs_type_feedback.value()),
                     type_feedback_vector, slot_index);
   __ SetAccumulator(result);
   __ Dispatch();
 }
 
 // ShiftRightSmi <imm> <reg>
 //
 // Right shifts register <src> by the count specified in <imm>.
 // Register <src> is converted to an int32 before the operation. The 5
 // lsb bits from <imm> are used as count i.e. <src> << (<imm> & 0x1F).
 void Interpreter::DoShiftRightSmi(InterpreterAssembler* assembler) {
   Node* reg_index = __ BytecodeOperandReg(1);
   Node* left = __ LoadRegister(reg_index);
   Node* right = __ BytecodeOperandImmSmi(0);
   Node* context = __ GetContext();
   Node* slot_index = __ BytecodeOperandIdx(2);
   Node* type_feedback_vector = __ LoadTypeFeedbackVector();
-  Variable var_lhs_type_feedback(assembler, MachineRepresentation::kWord32);
+  Variable var_lhs_type_feedback(assembler,
+                                 MachineRepresentation::kTaggedSigned);
   Node* lhs_value = __ TruncateTaggedToWord32WithFeedback(
       context, left, &var_lhs_type_feedback);
   Node* rhs_value = __ SmiToWord32(right);
   Node* shift_count = __ Word32And(rhs_value, __ Int32Constant(0x1f));
   Node* value = __ Word32Sar(lhs_value, shift_count);
   Node* result = __ ChangeInt32ToTagged(value);
-  Node* result_type = __ SelectInt32Constant(
+  Node* result_type = __ SelectSmiConstant(
       __ TaggedIsSmi(result), BinaryOperationFeedback::kSignedSmall,
       BinaryOperationFeedback::kNumber);
-  __ UpdateFeedback(__ Word32Or(result_type, var_lhs_type_feedback.value()),
+  __ UpdateFeedback(__ SmiOr(result_type, var_lhs_type_feedback.value()),
                     type_feedback_vector, slot_index);
   __ SetAccumulator(result);
   __ Dispatch();
 }
 
 Node* Interpreter::BuildUnaryOp(Callable callable,
                                 InterpreterAssembler* assembler) {
   Node* target = __ HeapConstant(callable.code());
   Node* accumulator = __ GetAccumulator();
   Node* context = __ GetContext();
@@ skipping 56 matching lines @@
   Node* slot_index = __ BytecodeOperandIdx(0);
   Node* type_feedback_vector = __ LoadTypeFeedbackVector();
 
   // Shared entry for floating point increment.
   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);
-  Variable var_type_feedback(assembler, MachineRepresentation::kWord32);
+  Variable var_type_feedback(assembler, MachineRepresentation::kTaggedSigned);
   Variable* loop_vars[] = {&value_var, &var_type_feedback};
   Label start(assembler, 2, loop_vars);
   value_var.Bind(value);
   var_type_feedback.Bind(
-      assembler->Int32Constant(BinaryOperationFeedback::kNone));
+      assembler->SmiConstant(BinaryOperationFeedback::kNone));
   assembler->Goto(&start);
   assembler->Bind(&start);
   {
     value = value_var.value();
 
     Label if_issmi(assembler), if_isnotsmi(assembler);
     assembler->Branch(assembler->TaggedIsSmi(value), &if_issmi, &if_isnotsmi);
 
     assembler->Bind(&if_issmi);
     {
       // Try fast Smi addition first.
       Node* one = assembler->SmiConstant(Smi::FromInt(1));
       Node* pair = assembler->IntPtrAddWithOverflow(
           assembler->BitcastTaggedToWord(value),
           assembler->BitcastTaggedToWord(one));
       Node* overflow = assembler->Projection(1, pair);
 
       // Check if the Smi addition overflowed.
       Label if_overflow(assembler), if_notoverflow(assembler);
       assembler->Branch(overflow, &if_overflow, &if_notoverflow);
 
       assembler->Bind(&if_notoverflow);
-      var_type_feedback.Bind(assembler->Word32Or(
+      var_type_feedback.Bind(assembler->SmiOr(
           var_type_feedback.value(),
-          assembler->Int32Constant(BinaryOperationFeedback::kSignedSmall)));
+          assembler->SmiConstant(BinaryOperationFeedback::kSignedSmall)));
       result_var.Bind(
           assembler->BitcastWordToTaggedSigned(assembler->Projection(0, pair)));
       assembler->Goto(&end);
 
       assembler->Bind(&if_overflow);
       {
         var_finc_value.Bind(assembler->SmiToFloat64(value));
         assembler->Goto(&do_finc);
       }
     }
@@ skipping 13 matching lines @@
         var_finc_value.Bind(assembler->LoadHeapNumberValue(value));
         assembler->Goto(&do_finc);
       }
 
       assembler->Bind(&if_valuenotnumber);
       {
         // We do not require an Or with earlier feedback here because once we
         // convert the value to a number, we cannot reach this path. We can
         // only reach this path on the first pass when the feedback is kNone.
         CSA_ASSERT(assembler,
-                   assembler->Word32Equal(var_type_feedback.value(),
-                                          assembler->Int32Constant(
-                                              BinaryOperationFeedback::kNone)));
+                   assembler->SmiEqual(
+                       var_type_feedback.value(),
+                       assembler->SmiConstant(BinaryOperationFeedback::kNone)));
 
         Label if_valueisoddball(assembler), if_valuenotoddball(assembler);
         Node* instance_type = assembler->LoadMapInstanceType(value_map);
         Node* is_oddball = assembler->Word32Equal(
             instance_type, assembler->Int32Constant(ODDBALL_TYPE));
         assembler->Branch(is_oddball, &if_valueisoddball, &if_valuenotoddball);
 
         assembler->Bind(&if_valueisoddball);
         {
           // Convert Oddball to Number and check again.
           value_var.Bind(
               assembler->LoadObjectField(value, Oddball::kToNumberOffset));
-          var_type_feedback.Bind(assembler->Int32Constant(
+          var_type_feedback.Bind(assembler->SmiConstant(
               BinaryOperationFeedback::kNumberOrOddball));
           assembler->Goto(&start);
         }
 
         assembler->Bind(&if_valuenotoddball);
         {
           // Convert to a Number first and try again.
           Callable callable =
               CodeFactory::NonNumberToNumber(assembler->isolate());
           var_type_feedback.Bind(
-              assembler->Int32Constant(BinaryOperationFeedback::kAny));
+              assembler->SmiConstant(BinaryOperationFeedback::kAny));
           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);
-    var_type_feedback.Bind(assembler->Word32Or(
+    var_type_feedback.Bind(assembler->SmiOr(
         var_type_feedback.value(),
-        assembler->Int32Constant(BinaryOperationFeedback::kNumber)));
+        assembler->SmiConstant(BinaryOperationFeedback::kNumber)));
     result_var.Bind(assembler->AllocateHeapNumberWithValue(finc_result));
     assembler->Goto(&end);
   }
 
   assembler->Bind(&end);
   assembler->UpdateFeedback(var_type_feedback.value(), type_feedback_vector,
                             slot_index);
 
   __ SetAccumulator(result_var.value());
   __ Dispatch();
@@ skipping 12 matching lines @@
   Node* slot_index = __ BytecodeOperandIdx(0);
   Node* type_feedback_vector = __ LoadTypeFeedbackVector();
 
   // Shared entry for floating point decrement.
   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);
-  Variable var_type_feedback(assembler, MachineRepresentation::kWord32);
+  Variable var_type_feedback(assembler, MachineRepresentation::kTaggedSigned);
   Variable* loop_vars[] = {&value_var, &var_type_feedback};
   Label start(assembler, 2, loop_vars);
   var_type_feedback.Bind(
-      assembler->Int32Constant(BinaryOperationFeedback::kNone));
+      assembler->SmiConstant(BinaryOperationFeedback::kNone));
   value_var.Bind(value);
   assembler->Goto(&start);
   assembler->Bind(&start);
   {
     value = value_var.value();
 
     Label if_issmi(assembler), if_isnotsmi(assembler);
     assembler->Branch(assembler->TaggedIsSmi(value), &if_issmi, &if_isnotsmi);
 
     assembler->Bind(&if_issmi);
     {
       // Try fast Smi subtraction first.
       Node* one = assembler->SmiConstant(Smi::FromInt(1));
       Node* pair = assembler->IntPtrSubWithOverflow(
           assembler->BitcastTaggedToWord(value),
           assembler->BitcastTaggedToWord(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);
-      var_type_feedback.Bind(assembler->Word32Or(
+      var_type_feedback.Bind(assembler->SmiOr(
           var_type_feedback.value(),
-          assembler->Int32Constant(BinaryOperationFeedback::kSignedSmall)));
+          assembler->SmiConstant(BinaryOperationFeedback::kSignedSmall)));
       result_var.Bind(
           assembler->BitcastWordToTaggedSigned(assembler->Projection(0, pair)));
       assembler->Goto(&end);
 
       assembler->Bind(&if_overflow);
       {
         var_fdec_value.Bind(assembler->SmiToFloat64(value));
         assembler->Goto(&do_fdec);
       }
     }
@@ skipping 13 matching lines @@
         var_fdec_value.Bind(assembler->LoadHeapNumberValue(value));
         assembler->Goto(&do_fdec);
       }
 
       assembler->Bind(&if_valuenotnumber);
       {
         // We do not require an Or with earlier feedback here because once we
         // convert the value to a number, we cannot reach this path. We can
         // only reach this path on the first pass when the feedback is kNone.
         CSA_ASSERT(assembler,
-                   assembler->Word32Equal(var_type_feedback.value(),
-                                          assembler->Int32Constant(
-                                              BinaryOperationFeedback::kNone)));
+                   assembler->SmiEqual(
+                       var_type_feedback.value(),
+                       assembler->SmiConstant(BinaryOperationFeedback::kNone)));
 
         Label if_valueisoddball(assembler), if_valuenotoddball(assembler);
         Node* instance_type = assembler->LoadMapInstanceType(value_map);
         Node* is_oddball = assembler->Word32Equal(
             instance_type, assembler->Int32Constant(ODDBALL_TYPE));
         assembler->Branch(is_oddball, &if_valueisoddball, &if_valuenotoddball);
 
         assembler->Bind(&if_valueisoddball);
         {
           // Convert Oddball to Number and check again.
           value_var.Bind(
               assembler->LoadObjectField(value, Oddball::kToNumberOffset));
-          var_type_feedback.Bind(assembler->Int32Constant(
+          var_type_feedback.Bind(assembler->SmiConstant(
               BinaryOperationFeedback::kNumberOrOddball));
           assembler->Goto(&start);
         }
 
         assembler->Bind(&if_valuenotoddball);
         {
           // Convert to a Number first and try again.
           Callable callable =
               CodeFactory::NonNumberToNumber(assembler->isolate());
           var_type_feedback.Bind(
-              assembler->Int32Constant(BinaryOperationFeedback::kAny));
+              assembler->SmiConstant(BinaryOperationFeedback::kAny));
           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);
-    var_type_feedback.Bind(assembler->Word32Or(
+    var_type_feedback.Bind(assembler->SmiOr(
         var_type_feedback.value(),
-        assembler->Int32Constant(BinaryOperationFeedback::kNumber)));
+        assembler->SmiConstant(BinaryOperationFeedback::kNumber)));
     result_var.Bind(assembler->AllocateHeapNumberWithValue(fdec_result));
     assembler->Goto(&end);
   }
 
   assembler->Bind(&end);
   assembler->UpdateFeedback(var_type_feedback.value(), type_feedback_vector,
                             slot_index);
 
   __ SetAccumulator(result_var.value());
   __ Dispatch();
@@ skipping 1332 matching lines @@
   __ StoreObjectField(generator, JSGeneratorObject::kContinuationOffset,
       __ SmiTag(new_state));
   __ SetAccumulator(old_state);
 
   __ Dispatch();
 }
 
 }  // namespace interpreter
 }  // namespace internal
 }  // namespace v8