Changeset 24873 in webkit

Timestamp:

Aug 4, 2007 10:20:35 PM (17 years ago)

Author:

mjs

Message:

Reviewed by Darin and Adam.

<rdar://problem/5368990> REGRESSION: newsgator.com sign-on 6x slower than Safari 3 beta due to GC changes (14808)

• kjs/string_object.cpp: (KJS::replace): if the string didn't change (very common in some cases) reuse the original string value. (KJS::StringProtoFunc::callAsFunction): Pass in the StringImp* when replacing, not just the UString.
• kjs/string_object.h: (KJS::StringInstance::internalValue): covariant override to return StringImp for convenience

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/string_object.cpp (modified) (7 diffs)
• kjs/string_object.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2007-08-04  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Darin and Adam.
+        
+        <rdar://problem/5368990> REGRESSION: newsgator.com sign-on 6x slower than Safari 3 beta due to GC changes (14808)
+
+        * kjs/string_object.cpp:
+        (KJS::replace): if the string didn't change (very common in some cases) reuse the original string value.
+        (KJS::StringProtoFunc::callAsFunction): Pass in the StringImp* when replacing, not just the UString.
+        * kjs/string_object.h:
+        (KJS::StringInstance::internalValue): covariant override to return StringImp for convenience
+
 2007-08-04  Mark Rowe  <mrowe@apple.com>
 

trunk/JavaScriptCore/kjs/string_object.cpp

@@ -314 +314 @@
 }
 
-static JSValue *replace(ExecState *exec, const UString &source, JSValue *pattern, JSValue *replacement)
-{
+static JSValue *replace(ExecState *exec, StringImp* sourceVal, JSValue *pattern, JSValue *replacement)
+{
+  UString source = sourceVal->value();
   JSObject *replacementFunction = 0;
   UString replacementString;
@@ -366 +367 @@
           
           args.append(jsNumber(completeMatchStart));
-          args.append(jsString(source));
+          args.append(sourceVal);
 
           substitutedReplacement = replacementFunction->call(exec, exec->dynamicInterpreter()->globalObject(), 
@@ -390 +391 @@
 
     UString result;
+
     if (sourceRanges)
         result = source.spliceSubstringsWithSeparators(sourceRanges, sourceRangeCount, replacements, replacementCount);
@@ -395 +397 @@
     delete [] sourceRanges;
     delete [] replacements;
+
+    if (result == source)
+      return sourceVal;
 
     return jsString(result);
@@ -405 +410 @@
   // Do the replacement
   if (matchPos == -1)
-    return jsString(source);
+    return sourceVal;
   
   if (replacementFunction) {
@@ -412 +417 @@
       args.append(jsString(source.substr(matchPos, matchLen)));
       args.append(jsNumber(matchPos));
-      args.append(jsString(source));
+      args.append(sourceVal);
       
       replacementString = replacementFunction->call(exec, exec->dynamicInterpreter()->globalObject(), 
@@ -563 +568 @@
   }
   case Replace:
-    result = replace(exec, s, a0, a1);
+    StringImp* sVal = thisObj->inherits(&StringInstance::info) ?
+      static_cast<StringInstance*>(thisObj)->internalValue() :
+      static_cast<StringImp*>(jsString(s));
+
+    result = replace(exec, sVal, a0, a1);
     break;
   case Slice:

trunk/JavaScriptCore/kjs/string_object.h

@@ -42 +42 @@
     virtual const ClassInfo *classInfo() const { return &info; }
     static const ClassInfo info;
+
+    StringImp* internalValue() const { return static_cast<StringImp*>(JSWrapperObject::internalValue());}
+
   private:
     static JSValue *lengthGetter(ExecState *exec, JSObject *, const Identifier&, const PropertySlot &slot);