Minor cleanup of CompareIC state

src/type-info.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 303 matching lines @@
 }
 
 
 static TypeInfo TypeFromCompareType(CompareIC::State state) {
   switch (state) {
     case CompareIC::UNINITIALIZED:
       // Uninitialized means never executed.
       return TypeInfo::Uninitialized();
     case CompareIC::SMI:
       return TypeInfo::Smi();
-    case CompareIC::HEAP_NUMBER:
+    case CompareIC::NUMBER:
       return TypeInfo::Number();
     case CompareIC::SYMBOL:
       return TypeInfo::Symbol();
     case CompareIC::STRING:
       return TypeInfo::String();
     case CompareIC::OBJECT:
-    case CompareIC::KNOWN_OBJECTS:
+    case CompareIC::KNOWN_OBJECT:
       // TODO(kasperl): We really need a type for JS objects here.
       return TypeInfo::NonPrimitive();
     case CompareIC::GENERIC:
     default:
       return TypeInfo::Unknown();
   }
 }
 
 
 void TypeFeedbackOracle::CompareType(CompareOperation* expr,
@@ skipping 21 matching lines @@
   *overall_type = TypeFromCompareType(handler_state);
 }
 
 
 Handle<Map> TypeFeedbackOracle::GetCompareMap(CompareOperation* expr) {
   Handle<Object> object = GetInfo(expr->CompareOperationFeedbackId());
   if (!object->IsCode()) return Handle<Map>::null();
   Handle<Code> code = Handle<Code>::cast(object);
   if (!code->is_compare_ic_stub()) return Handle<Map>::null();
   CompareIC::State state = ICCompareStub::CompareState(code->stub_info());
-  if (state != CompareIC::KNOWN_OBJECTS) {
+  if (state != CompareIC::KNOWN_OBJECT) {
     return Handle<Map>::null();
   }
   Map* first_map = code->FindFirstMap();
   ASSERT(first_map != NULL);
   return CanRetainOtherContext(first_map, *native_context_)
       ? Handle<Map>::null()
       : Handle<Map>(first_map);
 }
 
 
 TypeInfo TypeFeedbackOracle::UnaryType(UnaryOperation* expr) {
   Handle<Object> object = GetInfo(expr->UnaryOperationFeedbackId());
   TypeInfo unknown = TypeInfo::Unknown();
   if (!object->IsCode()) return unknown;
   Handle<Code> code = Handle<Code>::cast(object);
   ASSERT(code->is_unary_op_stub());
   UnaryOpIC::TypeInfo type = static_cast<UnaryOpIC::TypeInfo>(
       code->unary_op_type());
   switch (type) {
     case UnaryOpIC::SMI:
       return TypeInfo::Smi();
-    case UnaryOpIC::HEAP_NUMBER:
+    case UnaryOpIC::NUMBER:
       return TypeInfo::Double();
     default:
       return unknown;
   }
 }
 
 
 static TypeInfo TypeFromBinaryOpType(BinaryOpIC::TypeInfo binary_type) {
   switch (binary_type) {
     // Uninitialized means never executed.
     case BinaryOpIC::UNINITIALIZED:  return TypeInfo::Uninitialized();
     case BinaryOpIC::SMI:            return TypeInfo::Smi();
     case BinaryOpIC::INT32:          return TypeInfo::Integer32();
-    case BinaryOpIC::HEAP_NUMBER:    return TypeInfo::Double();
+    case BinaryOpIC::NUMBER:         return TypeInfo::Double();
     case BinaryOpIC::ODDBALL:        return TypeInfo::Unknown();
     case BinaryOpIC::STRING:         return TypeInfo::String();
     case BinaryOpIC::GENERIC:        return TypeInfo::Unknown();
   }
   UNREACHABLE();
   return TypeInfo::Unknown();
 }
 
 
 void TypeFeedbackOracle::BinaryType(BinaryOperation* expr,
@@ skipping 46 matching lines @@
   // CountOperations should always have +1 or -1 as their right input.
   ASSERT(right_type == BinaryOpIC::SMI ||
          right_type == BinaryOpIC::UNINITIALIZED);
 
   switch (left_type) {
     case BinaryOpIC::UNINITIALIZED:
     case BinaryOpIC::SMI:
       return TypeInfo::Smi();
     case BinaryOpIC::INT32:
       return TypeInfo::Integer32();
-    case BinaryOpIC::HEAP_NUMBER:
+    case BinaryOpIC::NUMBER:
       return TypeInfo::Double();
     case BinaryOpIC::STRING:
     case BinaryOpIC::GENERIC:
       return unknown;
     default:
       return unknown;
   }
   UNREACHABLE();
   return unknown;
 }
@@ skipping 225 matching lines @@
   USE(maybe_result);
 #ifdef DEBUG
   Object* result = NULL;
   // Dictionary has been allocated with sufficient size for all elements.
   ASSERT(maybe_result->ToObject(&result));
   ASSERT(*dictionary_ == result);
 #endif
 }
 
 } }  // namespace v8::internal