Make more use of the NumberInfo data....

src/register-allocator.cc

 // Copyright 2009 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 20 matching lines @@
 #include "register-allocator-inl.h"
 #include "virtual-frame-inl.h"
 
 namespace v8 {
 namespace internal {
 
 // -------------------------------------------------------------------------
 // Result implementation.
 
 
-Result::Result(Register reg, NumberInfo::Type info) {
+Result::Result(Register reg, NumberInfo info) {
   ASSERT(reg.is_valid() && !RegisterAllocator::IsReserved(reg));
   CodeGeneratorScope::Current()->allocator()->Use(reg);
   value_ = TypeField::encode(REGISTER)
-      | NumberInfoField::encode(info)
+      | NumberInfoField::encode(info.ToInt())
       | DataField::encode(reg.code_);
 }
 
 
 Result::ZoneObjectList* Result::ConstantList() {
   static ZoneObjectList list(10);
   return &list;
 }
 
 
-NumberInfo::Type Result::number_info() {
+NumberInfo Result::number_info() const {

[fschneider, 2010/03/05 15:01:07]

Move this to register-allocator-inl.h.

   ASSERT(is_valid());
-  if (!is_constant()) return NumberInfoField::decode(value_);
+  if (!is_constant()) return NumberInfo::FromInt(NumberInfoField::decode(value_));

[fschneider, 2010/03/05 15:01:07]

Long line.

   Handle<Object> value = handle();
-  if (value->IsSmi()) return NumberInfo::kSmi;
-  if (value->IsHeapNumber()) return NumberInfo::kHeapNumber;
-  return NumberInfo::kUnknown;
+  if (value->IsSmi()) return NumberInfo::Smi();
+  if (value->IsHeapNumber()) return NumberInfo::HeapNumber();
+  return NumberInfo::Unknown();
 }
 
 
-void Result::set_number_info(NumberInfo::Type info) {
+void Result::set_number_info(NumberInfo info) {

[fschneider, 2010/03/05 15:01:07]

Move this to register-allocator-inl.h.

   ASSERT(is_valid());
-  value_ = value_ & ~NumberInfoField::mask();
-  value_ = value_ | NumberInfoField::encode(info);
+  value_ &= ~NumberInfoField::mask();
+  value_ |= NumberInfoField::encode(info.ToInt());
 }
 
 
 // -------------------------------------------------------------------------
 // RegisterAllocator implementation.
 
 
 Result RegisterAllocator::AllocateWithoutSpilling() {
   // Return the first free register, if any.
   int num = registers_.ScanForFreeRegister();
@@ skipping 31 matching lines @@
     cgen_->frame()->Spill(target);
     ASSERT(!is_used(target));
     return Result(target);
   }
   // Otherwise (if it's referenced outside the frame) we cannot allocate it.
   return Result();
 }
 
 
 } }  // namespace v8::internal