Fix Smi vs. HeapObject confusion in HConstants.

src/hydrogen-types.cc

 // Copyright 2014 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/hydrogen-types.h"
 
 #include "src/ostreams.h"
 #include "src/types-inl.h"
 
 
@@ skipping 24 matching lines @@
 
 // static
 template
 HType HType::FromType<HeapType>(Handle<HeapType> type);
 
 
 // static
 HType HType::FromValue(Handle<Object> value) {
   if (value->IsSmi()) return HType::Smi();
   if (value->IsNull()) return HType::Null();
-  if (value->IsHeapNumber()) return HType::HeapNumber();
+  if (value->IsHeapNumber()) {
+    double n = Handle<v8::internal::HeapNumber>::cast(value)->value();
+    return IsSmiDouble(n) ? HType::Smi() : HType::HeapNumber();
+  }
   if (value->IsString()) return HType::String();
   if (value->IsBoolean()) return HType::Boolean();
   if (value->IsUndefined()) return HType::Undefined();
   if (value->IsJSArray()) return HType::JSArray();
   if (value->IsJSObject()) return HType::JSObject();
   DCHECK(value->IsHeapObject());
   return HType::HeapObject();
 }
 
 
 OStream& operator<<(OStream& os, const HType& t) {
   // Note: The c1visualizer syntax for locals allows only a sequence of the
   // following characters: A-Za-z0-9_-|:
   switch (t.kind_) {
 #define DEFINE_CASE(Name, mask) \
   case HType::k##Name:          \
     return os << #Name;
     HTYPE_LIST(DEFINE_CASE)
 #undef DEFINE_CASE
   }
   UNREACHABLE();
   return os;
 }
 
 } }  // namespace v8::internal