Fixing tagged binary operation input type feedback.

src/code-stubs.cc

Index: src/code-stubs.cc
diff --git a/src/code-stubs.cc b/src/code-stubs.cc
index 75b880712c9fc66236a6e897cc6bd50df40fac86..ec2804ff3e8ce40c0c4d713606c81d4e984c6b7d 100644
--- a/src/code-stubs.cc
+++ b/src/code-stubs.cc
@@ -568,14 +568,12 @@ void BinaryOpStub::UpdateStatus(Handle<Object> left,
 
   State max_input = Max(left_state_, right_state_);
 
-  // Avoid unnecessary Representation changes.
+  // TODO(olivf) Instead of doing this normalization we should have a Hydrogen
+  // version of the LookupNumberStringCache to avoid a converting StringAddStub.
   if (left_state_ == STRING && right_state_ < STRING) {
     right_state_ = GENERIC;
   } else if (right_state_ == STRING && left_state_ < STRING) {
     left_state_ = GENERIC;
-  } else if ((right_state_ == GENERIC && left_state_ != STRING) ||
-             (left_state_ == GENERIC && right_state_ != STRING)) {
-    left_state_ = right_state_ = GENERIC;
   } else if (!has_int_result() && op_ != Token::SHR &&
              max_input <= NUMBER && max_input > result_state_) {
     result_state_ = max_input;