Pass the complete number type information into the GenericBinaryOpStub....

src/x64/codegen-x64.h

Index: src/x64/codegen-x64.h
===================================================================
--- src/x64/codegen-x64.h	(revision 3862)
+++ src/x64/codegen-x64.h	(working copy)
@@ -656,14 +656,14 @@
   GenericBinaryOpStub(Token::Value op,
                       OverwriteMode mode,
                       GenericBinaryFlags flags,
-                      bool only_numbers = false)
+                      NumberInfo::Type operands_type = NumberInfo::kUnknown)
       : op_(op),
         mode_(mode),
         flags_(flags),
         args_in_registers_(false),
         args_reversed_(false),
         name_(NULL),
-        only_numbers_in_stub_(only_numbers) {
+        operands_type_(operands_type) {
     use_sse3_ = CpuFeatures::IsSupported(SSE3);
     ASSERT(OpBits::is_valid(Token::NUM_TOKENS));
   }
@@ -688,32 +688,32 @@
   bool args_reversed_;  // Left and right argument are swapped.
   bool use_sse3_;
   char* name_;
-  bool only_numbers_in_stub_;
+  NumberInfo::Type operands_type_;
 
   const char* GetName();
 
 #ifdef DEBUG
   void Print() {
     PrintF("GenericBinaryOpStub %d (op %s), "
-           "(mode %d, flags %d, registers %d, reversed %d, only_numbers %d)\n",
+           "(mode %d, flags %d, registers %d, reversed %d, only_numbers %s)\n",
            MinorKey(),
            Token::String(op_),
            static_cast<int>(mode_),
            static_cast<int>(flags_),
            static_cast<int>(args_in_registers_),
            static_cast<int>(args_reversed_),
-           static_cast<int>(only_numbers_in_stub_));
+           NumberInfo::ToString(operands_type_));
   }
 #endif
 
-  // Minor key encoding in 16 bits NFRASOOOOOOOOOMM.
+  // Minor key encoding in 16 bits NNNFRASOOOOOOOMM.
   class ModeBits: public BitField<OverwriteMode, 0, 2> {};
-  class OpBits: public BitField<Token::Value, 2, 9> {};
-  class SSE3Bits: public BitField<bool, 11, 1> {};
-  class ArgsInRegistersBits: public BitField<bool, 12, 1> {};
-  class ArgsReversedBits: public BitField<bool, 13, 1> {};
-  class FlagBits: public BitField<GenericBinaryFlags, 14, 1> {};
-  class OnlyNumberBits: public BitField<bool, 15, 1> {};
+  class OpBits: public BitField<Token::Value, 2, 7> {};
+  class SSE3Bits: public BitField<bool, 9, 1> {};
+  class ArgsInRegistersBits: public BitField<bool, 10, 1> {};
+  class ArgsReversedBits: public BitField<bool, 11, 1> {};
+  class FlagBits: public BitField<GenericBinaryFlags, 12, 1> {};
+  class NumberInfoBits: public BitField<NumberInfo::Type, 13, 3> {};
 
   Major MajorKey() { return GenericBinaryOp; }
   int MinorKey() {
@@ -724,7 +724,7 @@
            | SSE3Bits::encode(use_sse3_)
            | ArgsInRegistersBits::encode(args_in_registers_)
            | ArgsReversedBits::encode(args_reversed_)
-           | OnlyNumberBits::encode(only_numbers_in_stub_);
+           | NumberInfoBits::encode(operands_type_);
   }
 
   void Generate(MacroAssembler* masm);