Changeset 10265 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Aug 19, 2005, 1:24:17 PM (20 years ago)

Author:

darin

Message:

Reviewed by Maciej.

• fixed ​http://bugzilla.opendarwin.org/show_bug.cgi?id=4435 speed up JavaScript by tweaking the Identifier class

• kjs/identifier.h: Add a new global nullIdentifier and make Identifier::null a function that returns it.
• kjs/identifier.cpp: (KJS::Identifier::init): Initialize a global for the null identifier as well as all the other globals for special identifiers.

• kjs/ustring.h: (KJS::UString::UString): Make this empty constructor inline.
• kjs/ustring.cpp: Remove the old non-inline version.

Location:

trunk/JavaScriptCore/kjs

Files:

• identifier.cpp (modified) (3 diffs)
• identifier.h (modified) (3 diffs)
• ustring.cpp (modified) (2 diffs)
• ustring.h (modified) (2 diffs)

trunk/JavaScriptCore/kjs/identifier.cpp

@@ -295 +295 @@
 }
 
-const Identifier &Identifier::null()
-{
-    static Identifier null;
-    return null;
-}
-
 // Global constants for property name strings.
 
@@ -310 +304 @@
     // Use an array of pointers instead of an array of char in case there is some alignment issue.
     #define DEFINE_GLOBAL(name, string) \
-        void * name ## PropertyName[(sizeof(Identifier) + sizeof(void *) - 1) / sizeof(void *)];
-#endif
-
-#define CALL_DEFINE_GLOBAL(name) DEFINE_GLOBAL(name, #name)
-KJS_IDENTIFIER_EACH_GLOBAL(CALL_DEFINE_GLOBAL)
-DEFINE_GLOBAL(specialPrototype, "__proto__")
+        void * name[(sizeof(Identifier) + sizeof(void *) - 1) / sizeof(void *)];
+#endif
+
+const char * const nullCString = 0;
+
+DEFINE_GLOBAL(nullIdentifier, nullCString)
+DEFINE_GLOBAL(specialPrototypePropertyName, "__proto__")
+
+#define DEFINE_PROPERTY_NAME_GLOBAL(name) DEFINE_GLOBAL(name ## PropertyName, #name)
+KJS_IDENTIFIER_EACH_PROPERTY_NAME_GLOBAL(DEFINE_PROPERTY_NAME_GLOBAL)
 
 void Identifier::init()
@@ -323 +321 @@
     if (!initialized) {
         // Use placement new to initialize the globals.
-        #define PLACEMENT_NEW_GLOBAL(name, string) new (&name ## PropertyName) Identifier(string);
-        #define CALL_PLACEMENT_NEW_GLOBAL(name) PLACEMENT_NEW_GLOBAL(name, #name)
-        KJS_IDENTIFIER_EACH_GLOBAL(CALL_PLACEMENT_NEW_GLOBAL)
-        PLACEMENT_NEW_GLOBAL(specialPrototype, "__proto__")
+
+        new (&nullIdentifier) Identifier(nullCString);
+        new (&specialPrototypePropertyName) Identifier("__proto__");
+
+        #define PLACEMENT_NEW_PROPERTY_NAME_GLOBAL(name) new(&name ## PropertyName) Identifier(#name);
+        KJS_IDENTIFIER_EACH_PROPERTY_NAME_GLOBAL(PLACEMENT_NEW_PROPERTY_NAME_GLOBAL)
+
         initialized = true;
     }

trunk/JavaScriptCore/kjs/identifier.h

@@ -94 +94 @@
     };
     
+#if !KJS_IDENTIFIER_HIDE_GLOBALS
+    extern const Identifier nullIdentifier;
+
+    inline const Identifier &Identifier::null()
+        { return nullIdentifier; }
+#endif
+
     inline bool operator==(const Identifier &a, const Identifier &b)
         { return Identifier::equal(a, b); }
@@ -105 +112 @@
     // List of property names, passed to a macro so we can do set them up various
     // ways without repeating the list.
-    #define KJS_IDENTIFIER_EACH_GLOBAL(macro) \
+    #define KJS_IDENTIFIER_EACH_PROPERTY_NAME_GLOBAL(macro) \
         macro(arguments) \
         macro(callee) \
@@ -122 +129 @@
     // Define external global variables for all property names above (and one more).
 #if !KJS_IDENTIFIER_HIDE_GLOBALS
-    #define KJS_IDENTIFIER_DECLARE_GLOBAL(name) extern const Identifier name ## PropertyName;
-    KJS_IDENTIFIER_EACH_GLOBAL(KJS_IDENTIFIER_DECLARE_GLOBAL)
-    KJS_IDENTIFIER_DECLARE_GLOBAL(specialPrototype)
-    #undef KJS_IDENTIFIER_DECLARE_GLOBAL
+    extern const Identifier specialPrototypePropertyName;
+
+    #define KJS_IDENTIFIER_DECLARE_PROPERTY_NAME_GLOBAL(name) extern const Identifier name ## PropertyName;
+    KJS_IDENTIFIER_EACH_PROPERTY_NAME_GLOBAL(KJS_IDENTIFIER_DECLARE_PROPERTY_NAME_GLOBAL)
+    #undef KJS_IDENTIFIER_DECLARE_PROPERTY_NAME_GLOBAL
 #endif
 

trunk/JavaScriptCore/kjs/ustring.cpp

@@ -389 +389 @@
 }
 
-
-UString::UString()
-{
-  attach(&Rep::null);
-}
 
 UString::UString(char c)
@@ -1127 +1122 @@
     return *this;
 
-  UString::Rep *newRep = Rep::create(rep, pos, len);
+  Rep *newRep = Rep::create(rep, pos, len);
   UString result(newRep);
   newRep->deref();

trunk/JavaScriptCore/kjs/ustring.h

@@ -205 +205 @@
      */
     struct Rep {
-      friend class UString;
-      friend bool operator==(const UString&, const UString&);
-      
       static Rep *create(UChar *d, int l);
       static Rep *createCopying(const UChar *d, int l);
@@ -518 +515 @@
   int decodeUTF8Sequence(const char *);
 
+inline UString::UString()
+{
+    attach(&Rep::null);
+}
+
 } // namespace