HConstant::InNewSpace() should be a constant function

src/hydrogen-instructions.h

 // 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 3233 matching lines @@
             Handle<Object> optional_handle = Handle<Object>::null());
   HConstant(Handle<Object> handle,
             UniqueValueId unique_id,
             Representation r,
             HType type,
             bool is_internalized_string,
             bool boolean_value);
 
   Handle<Object> handle() {
     if (handle_.is_null()) {
-      handle_ = FACTORY->NewNumber(double_value_, TENURED);
+      handle_ = FACTORY->NewNumber(double_value_, pretenure());
     }
     ALLOW_HANDLE_DEREF(Isolate::Current(), "smi check");
     ASSERT(has_int32_value_ || !handle_->IsSmi());
     return handle_;
   }
 
   bool IsSpecialDouble() const {
     return has_double_value_ &&
         (BitCast<int64_t>(double_value_) == BitCast<int64_t>(-0.0) ||
          FixedDoubleArray::is_the_hole_nan(double_value_) ||
          std::isnan(double_value_));
   }
 
-  bool InNewSpace() {
-    if (handle().is_null()) return false;
-    ALLOW_HANDLE_DEREF(isolate(), "using raw address");
-    return isolate()->heap()->InNewSpace(*handle());
+  bool InNewSpace() const {
+    if (!handle_.is_null()) {
+      ALLOW_HANDLE_DEREF(isolate(), "using raw address");
+      return isolate()->heap()->InNewSpace(*handle_);
+    }
+    // If the handle wasn't created yet, then we have a number.
+    // If the handle is created it'll be tenured in old space.
+    ASSERT(pretenure() == TENURED);
+    return false;
   }
 
   bool ImmortalImmovable() const {
     if (has_int32_value_) {
       return false;
     }
     if (has_double_value_) {
       if (IsSpecialDouble()) {
         return true;
       }
@@ skipping 117 matching lines @@
 
  private:
   void Initialize(Representation r);
 
   virtual bool IsDeletable() const { return true; }
 
   // If this is a numerical constant, handle_ either points to to the
   // HeapObject the constant originated from or is null.  If the
   // constant is non-numeric, handle_ always points to a valid
   // constant HeapObject.
+  static PretenureFlag pretenure() { return TENURED; }

[Michael Starzinger, 2013/04/29 11:16:44]

I don't understand this function, wouldn't a comment in the handle() accessor
suffice? Also why place this function between "handle_" and the comment that
explains "handle_"? Can we drop this function?

+
   Handle<Object> handle_;
   UniqueValueId unique_id_;
 
   // We store the HConstant in the most specific form safely possible.
   // The two flags, has_int32_value_ and has_double_value_ tell us if
   // int32_value_ and double_value_ hold valid, safe representations
   // of the constant.  has_int32_value_ implies has_double_value_ but
   // not the converse.
   bool has_int32_value_ : 1;
   bool has_double_value_ : 1;
@@ skipping 3162 matching lines @@
   virtual bool IsDeletable() const { return true; }
 };
 
 
 #undef DECLARE_INSTRUCTION
 #undef DECLARE_CONCRETE_INSTRUCTION
 
 } }  // namespace v8::internal
 
 #endif  // V8_HYDROGEN_INSTRUCTIONS_H_