Changed the global object representation

src/property.h

 // Copyright 2006-2008 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 212 matching lines @@
     return details_.attributes();
   }
 
   PropertyDetails GetPropertyDetails() {
     return details_;
   }
 
   bool IsReadOnly() { return details_.IsReadOnly(); }
   bool IsDontDelete() { return details_.IsDontDelete(); }
   bool IsDontEnum() { return details_.IsDontEnum(); }
+  bool IsDeleted() { return details_.IsDeleted(); }
 
   bool IsValid() { return  lookup_type_ != NOT_FOUND; }
   bool IsNotFound() { return lookup_type_ == NOT_FOUND; }
 
   // Tells whether the result is a property.
   // Excluding transitions and the null descriptor.
   bool IsProperty() {
     return IsValid() && type() < FIRST_PHANTOM_PROPERTY_TYPE;
   }
 
   bool IsCacheable() { return cacheable_; }
   void DisallowCaching() { cacheable_ = false; }
 
   // Tells whether the value needs to be loaded.
   bool IsLoaded() {
     if (lookup_type_ == DESCRIPTOR_TYPE || lookup_type_ == DICTIONARY_TYPE) {
       Object* target = GetLazyValue();
       return !target->IsJSObject() || JSObject::cast(target)->IsLoaded();
     }
     return true;
   }
 
   Object* GetLazyValue() {
     switch (type()) {
       case FIELD:
         return holder()->FastPropertyAt(GetFieldIndex());
-      case NORMAL:
-        return holder()->property_dictionary()->ValueAt(GetDictionaryEntry());
+      case NORMAL: {
+        Object* value;
+        value = holder()->property_dictionary()->ValueAt(GetDictionaryEntry());
+        if (holder()->IsJSGlobalObject()) {
+          value = JSGlobalPropertyCell::cast(value)->value();
+        }
+        return value;
+      }
       case CONSTANT_FUNCTION:
         return GetConstantFunction();
       default:
         return Smi::FromInt(0);
     }
   }
 
   Map* GetTransitionMap() {
     ASSERT(lookup_type_ == DESCRIPTOR_TYPE);
     ASSERT(type() == MAP_TRANSITION);
@@ skipping 28 matching lines @@
   void Print();
 #endif
 
   Object* GetValue() {
     if (lookup_type_ == DESCRIPTOR_TYPE) {
       DescriptorArray* descriptors = holder()->map()->instance_descriptors();
       return descriptors->GetValue(number_);
     }
     // In the dictionary case, the data is held in the value field.
     ASSERT(lookup_type_ == DICTIONARY_TYPE);
-    return holder()->property_dictionary()->ValueAt(GetDictionaryEntry());
+    return holder()->GetNormalizedProperty(this);
   }
 
  private:
   JSObject* holder_;
   int number_;
   bool cacheable_;
   PropertyDetails details_;
 };
 
 
@@ skipping 79 matching lines @@
 
   // Append a descriptor to this stream.
   void Write(Descriptor* desc);
   // Read a descriptor from the reader and append it to this stream.
   void WriteFrom(DescriptorReader* reader);
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_PROPERTY_H_