Changeset 26535 in webkit for trunk/JavaScriptCore/kjs/array_object.cpp

Timestamp:

Oct 12, 2007, 8:38:55 AM (18 years ago)

Author:

oliver

Message:

Reviewed by Eric.

• fix assertion failures on quit.

• kjs/array_object.cpp: (ArrayProtoFunc::callAsFunction): Dynamically alocate function-scope static UStrings to avoid the static destructor getting called later.
• kjs/lookup.h: Dynamically alocate function-scope static Identifiers to avoid the static destructor getting called later.

File:

• trunk/JavaScriptCore/kjs/array_object.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/array_object.cpp

@@ -536 +536 @@
   case Join: {
     static HashSet<JSObject*> visitedElems;
-    static const UString empty("");
-    static const UString comma(",");
+    static const UString* empty = new UString("");
+    static const UString* comma = new UString(",");
     bool alreadyVisited = !visitedElems.add(thisObj).second;
     if (alreadyVisited)
-        return jsString(empty);
-    UString separator = comma;
-    UString str = empty;
+        return jsString(*empty);
+    UString separator = *comma;
+    UString str = *empty;
 
     if (id == Join && !args[0]->isUndefined())