Revert of [Interpreter] Collect feedback about Oddballs in Subtract Stub.

src/type-info.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/type-info.h"
 
 #include "src/ast/ast.h"
 #include "src/code-stubs.h"
 #include "src/ic/ic.h"
 #include "src/ic/stub-cache.h"
@@ skipping 192 matching lines @@
       return AstType::Number();
     case CompareOperationHint::kNumberOrOddball:
       return AstType::NumberOrOddball();
     case CompareOperationHint::kAny:
       return AstType::Any();
   }
   UNREACHABLE();
   return AstType::None();
 }
 
-AstType* BinaryOpFeedbackToType(int hint) {
+AstType* BinaryOpHintToType(BinaryOperationHint hint) {
   switch (hint) {
-    case BinaryOperationFeedback::kNone:
+    case BinaryOperationHint::kNone:
       return AstType::None();
-    case BinaryOperationFeedback::kSignedSmall:
+    case BinaryOperationHint::kSignedSmall:
       return AstType::SignedSmall();
-    case BinaryOperationFeedback::kNumber:
+    case BinaryOperationHint::kSigned32:
+      return AstType::Signed32();
+    case BinaryOperationHint::kNumberOrOddball:
       return AstType::Number();
-    case BinaryOperationFeedback::kString:
+    case BinaryOperationHint::kString:
       return AstType::String();
-    // TODO(mythria): Merge Number and NumberOrOddball feedback, after
-    // fixing crankshaft to handle Oddballs along with Numbers.
-    case BinaryOperationFeedback::kNumberOrOddball:
-    case BinaryOperationFeedback::kAny:
-    default:
+    case BinaryOperationHint::kAny:
       return AstType::Any();
   }
   UNREACHABLE();
   return AstType::None();
 }
 
 }  // end anonymous namespace
 
 void TypeFeedbackOracle::CompareType(TypeFeedbackId id, FeedbackVectorSlot slot,
                                      AstType** left_type, AstType** right_type,
@@ skipping 56 matching lines @@
     *allocation_site = Handle<AllocationSite>::null();
     return;
   }
 
   // Feedback from Ignition. The feedback slot will be allocated and initialized
   // to AstType::None() even when ignition is not enabled. So it is safe to get
   // feedback from the type feedback vector.
   DCHECK(!slot.IsInvalid());
   BinaryOpICNexus nexus(feedback_vector_, slot);
   *left = *right = *result =
-      BinaryOpFeedbackToType(Smi::cast(nexus.GetFeedback())->value());
+      BinaryOpHintToType(nexus.GetBinaryOperationFeedback());
   *fixed_right_arg = Nothing<int>();
   *allocation_site = Handle<AllocationSite>::null();
 
   if (!object->IsCode()) return;
 
   // Merge the feedback from full-codegen if available.
   Handle<Code> code = Handle<Code>::cast(object);
   DCHECK_EQ(Code::BINARY_OP_IC, code->kind());
   BinaryOpICState state(isolate(), code->extra_ic_state());
   DCHECK_EQ(op, state.op());
@@ skipping 14 matching lines @@
 AstType* TypeFeedbackOracle::CountType(TypeFeedbackId id,
                                        FeedbackVectorSlot slot) {
   Handle<Object> object = GetInfo(id);
   if (slot.IsInvalid()) {
     DCHECK(!object->IsCode());
     return AstType::None();
   }
 
   DCHECK(!slot.IsInvalid());
   BinaryOpICNexus nexus(feedback_vector_, slot);
-  AstType* type =
-      BinaryOpFeedbackToType(Smi::cast(nexus.GetFeedback())->value());
+  AstType* type = BinaryOpHintToType(nexus.GetBinaryOperationFeedback());
 
   if (!object->IsCode()) return type;
 
   Handle<Code> code = Handle<Code>::cast(object);
   DCHECK_EQ(Code::BINARY_OP_IC, code->kind());
   BinaryOpICState state(isolate(), code->extra_ic_state());
   return AstType::Union(type, state.GetLeftType(), zone());
 }
 
 
@@ skipping 197 matching lines @@
   // Dictionary has been allocated with sufficient size for all elements.
   DisallowHeapAllocation no_need_to_resize_dictionary;
   HandleScope scope(isolate());
   USE(UnseededNumberDictionary::AtNumberPut(
       dictionary_, IdToKey(ast_id), handle(target, isolate())));
 }
 
 
 }  // namespace internal
 }  // namespace v8