- Added a map cache for literal objects. This will...

src/objects.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 601 matching lines @@
   inline bool IsSharedFunctionInfo();
   inline bool IsJSValue();
   inline bool IsProxy();
   inline bool IsBoolean();
   inline bool IsJSArray();
   inline bool IsJSRegExp();
   inline bool IsHashTable();
   inline bool IsDictionary();
   inline bool IsSymbolTable();
   inline bool IsCompilationCacheTable();
+  inline bool IsMapCache();
   inline bool IsPrimitive();
   inline bool IsGlobalObject();
   inline bool IsJSGlobalObject();
   inline bool IsJSBuiltinsObject();
   inline bool IsUndetectableObject();
   inline bool IsAccessCheckNeeded();
 
   // Returns true if this object is an instance of the specified
   // function template.
   bool IsInstanceOf(FunctionTemplateInfo* type);
@@ skipping 1197 matching lines @@
   Object* Lookup(String* src);
   Object* Put(String* src, Object* value);
 
   static inline CompilationCacheTable* cast(Object* obj);
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(CompilationCacheTable);
 };
 
 
+// MapCache.
+//
+// Maps keys that are a fixed array of symbols to a map.
+// Used for canonicalize maps for object literals.
+class MapCache: public HashTable<0, 2> {
+ public:
+  // Find cached value for a string key, otherwise return null.
+  Object* Lookup(FixedArray* key);
+  Object* Put(FixedArray* key, Map* value);
+  static inline MapCache* cast(Object* obj);
+
+ private:
+  DISALLOW_IMPLICIT_CONSTRUCTORS(MapCache);
+};
+
+
 // Dictionary for keeping properties and elements in slow case.
 //
 // One element in the prefix is used for storing non-element
 // information about the dictionary.
 //
 // The rest of the array embeds triples of (key, value, details).
 // if key == undefined the triple is empty.
 // if key == null the triple has been deleted.
 // otherwise key contains the name of a property.
 class DictionaryBase: public HashTable<2, 3> {};
@@ skipping 815 matching lines @@
 
   // Dispatched behavior.
 #ifdef DEBUG
   void JSFunctionPrint();
   void JSFunctionVerify();
 #endif
 
   // Returns the number of allocated literals.
   int NumberOfLiterals();
 
+  // Retrieve the global context from a function's literal array.
+  static Context* GlobalContextFromLiterals(FixedArray* literals);
+
   // Layout descriptors.
   static const int kPrototypeOrInitialMapOffset = JSObject::kHeaderSize;
   static const int kSharedFunctionInfoOffset =
       kPrototypeOrInitialMapOffset + kPointerSize;
   static const int kContextOffset = kSharedFunctionInfoOffset + kPointerSize;
   static const int kLiteralsOffset = kContextOffset + kPointerSize;
   static const int kSize = kLiteralsOffset + kPointerSize;
 
   // Layout of the literals array.
-  static const int kLiteralsPrefixSize = 3;
-  static const int kLiteralObjectFunctionIndex = 0;
-  static const int kLiteralRegExpFunctionIndex = 1;
-  static const int kLiteralArrayFunctionIndex = 2;
-
+  static const int kLiteralsPrefixSize = 1;
+  static const int kLiteralGlobalContextIndex = 0;
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(JSFunction);
 };
 
 
 // Forward declaration.
 class JSBuiltinsObject;
 
 // Common super class for JavaScript global objects and the special
 // builtins global objects.
@@ skipping 1194 matching lines @@
     } else {
       value &= ~(1 << bit_position);
     }
     return value;
   }
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_OBJECTS_H_