Changeset 29508 in webkit for trunk/JavaScriptCore/kjs/string_object.cpp

Timestamp:

Jan 15, 2008, 10:43:15 PM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

Reviewed by Geoffrey Garen.

Fix <rdar://problem/5595552> r27608 introduced a 20% increase in JS binary size, 4% increase in WebCore binary size

• This changes the way JS functions that use Lookup tables are handled. Instead using one class per function, which allowed specialization of the virtual callAsFunction method, we now use on class, PrototypeFunction, which takes a pointer to a static function to use as the implementation. This significantly decreases the binary size of JavaScriptCore (about 145k on an Intel only build) while still keeping some of the speedup r27608 garnered (SunSpider says this is 1.005x as slow, which should leave some wiggle room from the original 1% speedup) and keeps the functions implementations in separate functions to help with optimizations.

• JavaScriptCore.exp:
• JavaScriptCore.xcodeproj/project.pbxproj:
• kjs/array_object.cpp: (KJS::arrayProtoFuncToString): (KJS::arrayProtoFuncToLocaleString): (KJS::arrayProtoFuncJoin): (KJS::arrayProtoFuncConcat): (KJS::arrayProtoFuncPop): (KJS::arrayProtoFuncPush): (KJS::arrayProtoFuncReverse): (KJS::arrayProtoFuncShift): (KJS::arrayProtoFuncSlice): (KJS::arrayProtoFuncSort): (KJS::arrayProtoFuncSplice): (KJS::arrayProtoFuncUnShift): (KJS::arrayProtoFuncFilter): (KJS::arrayProtoFuncMap): (KJS::arrayProtoFuncEvery): (KJS::arrayProtoFuncForEach): (KJS::arrayProtoFuncSome): (KJS::arrayProtoFuncIndexOf): (KJS::arrayProtoFuncLastIndexOf):
• kjs/array_object.h:
• kjs/date_object.cpp: (KJS::DatePrototype::getOwnPropertySlot): (KJS::dateProtoFuncToString): (KJS::dateProtoFuncToUTCString): (KJS::dateProtoFuncToDateString): (KJS::dateProtoFuncToTimeString): (KJS::dateProtoFuncToLocaleString): (KJS::dateProtoFuncToLocaleDateString): (KJS::dateProtoFuncToLocaleTimeString): (KJS::dateProtoFuncValueOf): (KJS::dateProtoFuncGetTime): (KJS::dateProtoFuncGetFullYear): (KJS::dateProtoFuncGetUTCFullYear): (KJS::dateProtoFuncToGMTString): (KJS::dateProtoFuncGetMonth): (KJS::dateProtoFuncGetUTCMonth): (KJS::dateProtoFuncGetDate): (KJS::dateProtoFuncGetUTCDate): (KJS::dateProtoFuncGetDay): (KJS::dateProtoFuncGetUTCDay): (KJS::dateProtoFuncGetHours): (KJS::dateProtoFuncGetUTCHours): (KJS::dateProtoFuncGetMinutes): (KJS::dateProtoFuncGetUTCMinutes): (KJS::dateProtoFuncGetSeconds): (KJS::dateProtoFuncGetUTCSeconds): (KJS::dateProtoFuncGetMilliSeconds): (KJS::dateProtoFuncGetUTCMilliseconds): (KJS::dateProtoFuncGetTimezoneOffset): (KJS::dateProtoFuncSetTime): (KJS::dateProtoFuncSetMilliSeconds): (KJS::dateProtoFuncSetUTCMilliseconds): (KJS::dateProtoFuncSetSeconds): (KJS::dateProtoFuncSetUTCSeconds): (KJS::dateProtoFuncSetMinutes): (KJS::dateProtoFuncSetUTCMinutes): (KJS::dateProtoFuncSetHours): (KJS::dateProtoFuncSetUTCHours): (KJS::dateProtoFuncSetDate): (KJS::dateProtoFuncSetUTCDate): (KJS::dateProtoFuncSetMonth): (KJS::dateProtoFuncSetUTCMonth): (KJS::dateProtoFuncSetFullYear): (KJS::dateProtoFuncSetUTCFullYear): (KJS::dateProtoFuncSetYear): (KJS::dateProtoFuncGetYear):
• kjs/date_object.h:
• kjs/function.cpp: (KJS::PrototypeFunction::PrototypeFunction): (KJS::PrototypeFunction::callAsFunction):
• kjs/function.h:
• kjs/lookup.h: (KJS::HashEntry::): (KJS::staticFunctionGetter):
• kjs/math_object.cpp: (KJS::mathProtoFuncAbs): (KJS::mathProtoFuncACos): (KJS::mathProtoFuncASin): (KJS::mathProtoFuncATan): (KJS::mathProtoFuncATan2): (KJS::mathProtoFuncCeil): (KJS::mathProtoFuncCos): (KJS::mathProtoFuncExp): (KJS::mathProtoFuncFloor): (KJS::mathProtoFuncLog): (KJS::mathProtoFuncMax): (KJS::mathProtoFuncMin): (KJS::mathProtoFuncPow): (KJS::mathProtoFuncRandom): (KJS::mathProtoFuncRound): (KJS::mathProtoFuncSin): (KJS::mathProtoFuncSqrt): (KJS::mathProtoFuncTan):
• kjs/math_object.h:
• kjs/string_object.cpp: (KJS::stringProtoFuncToString): (KJS::stringProtoFuncValueOf): (KJS::stringProtoFuncCharAt): (KJS::stringProtoFuncCharCodeAt): (KJS::stringProtoFuncConcat): (KJS::stringProtoFuncIndexOf): (KJS::stringProtoFuncLastIndexOf): (KJS::stringProtoFuncMatch): (KJS::stringProtoFuncSearch): (KJS::stringProtoFuncReplace): (KJS::stringProtoFuncSlice): (KJS::stringProtoFuncSplit): (KJS::stringProtoFuncSubstr): (KJS::stringProtoFuncSubstring): (KJS::stringProtoFuncToLowerCase): (KJS::stringProtoFuncToUpperCase): (KJS::stringProtoFuncToLocaleLowerCase): (KJS::stringProtoFuncToLocaleUpperCase): (KJS::stringProtoFuncLocaleCompare): (KJS::stringProtoFuncBig): (KJS::stringProtoFuncSmall): (KJS::stringProtoFuncBlink): (KJS::stringProtoFuncBold): (KJS::stringProtoFuncFixed): (KJS::stringProtoFuncItalics): (KJS::stringProtoFuncStrike): (KJS::stringProtoFuncSub): (KJS::stringProtoFuncSup): (KJS::stringProtoFuncFontcolor): (KJS::stringProtoFuncFontsize): (KJS::stringProtoFuncAnchor): (KJS::stringProtoFuncLink):
• kjs/string_object.h:

WebCore:

Reviewed by Geoffrey Garen.

Fix <rdar://problem/5595552> r27608 introduced a 20% increase in JS binary size, 4% increase in WebCore binary size

• Update JS Function implementations to use a static function based method. This decreases the binary size of an Intel only build by 1013.5K.

• WebCore.xcodeproj/project.pbxproj:
• bindings/js/JSDOMWindowCustom.cpp: (WebCore::JSDOMWindow::customGetOwnPropertySlot):
• bindings/js/JSEventTargetBase.cpp: (WebCore::jsEventTargetAddEventListener): (WebCore::jsEventTargetRemoveEventListener): (WebCore::jsEventTargetDispatchEvent): (WebCore::retrieveEventTargetAndCorrespondingNode):
• bindings/js/JSEventTargetBase.h:
• bindings/js/JSHTMLInputElementBase.cpp: (WebCore::jsHTMLInputElementBaseFunctionSetSelectionRange): (WebCore::JSHTMLInputElementBase::getOwnPropertySlot):
• bindings/js/JSHTMLInputElementBase.h:
• bindings/js/JSLocation.cpp: (WebCore::JSLocation::getOwnPropertySlot): (WebCore::jsLocationProtoFuncReplace): (WebCore::jsLocationProtoFuncReload): (WebCore::jsLocationProtoFuncAssign): (WebCore::jsLocationProtoFuncToString):
• bindings/js/JSLocation.h:
• bindings/js/JSXMLHttpRequest.cpp: (KJS::jsXMLHttpRequestPrototypeFunctionAbort): (KJS::jsXMLHttpRequestPrototypeFunctionGetAllResponseHeaders): (KJS::jsXMLHttpRequestPrototypeFunctionGetResponseHeader): (KJS::jsXMLHttpRequestPrototypeFunctionOpen): (KJS::jsXMLHttpRequestPrototypeFunctionSend): (KJS::jsXMLHttpRequestPrototypeFunctionSetRequestHeader): (KJS::jsXMLHttpRequestPrototypeFunctionOverrideMIMEType): (KJS::jsXMLHttpRequestPrototypeFunctionAddEventListener): (KJS::jsXMLHttpRequestPrototypeFunctionRemoveEventListener): (KJS::jsXMLHttpRequestPrototypeFunctionDispatchEvent):
• bindings/js/JSXMLHttpRequest.h:
• bindings/js/JSXSLTProcessor.cpp: (KJS::jsXSLTProcessorPrototypeFunctionImportStylesheet): (KJS::jsXSLTProcessorPrototypeFunctionTransformToFragment): (KJS::jsXSLTProcessorPrototypeFunctionTransformToDocument): (KJS::jsXSLTProcessorPrototypeFunctionSetParameter): (KJS::jsXSLTProcessorPrototypeFunctionGetParameter): (KJS::jsXSLTProcessorPrototypeFunctionRemoveParameter): (KJS::jsXSLTProcessorPrototypeFunctionClearParameters): (KJS::jsXSLTProcessorPrototypeFunctionReset):
• bindings/js/JSXSLTProcessor.h:
• bindings/js/kjs_events.cpp: (WebCore::jsClipboardPrototypeFunctionClearData): (WebCore::jsClipboardPrototypeFunctionGetData): (WebCore::jsClipboardPrototypeFunctionSetData): (WebCore::jsClipboardPrototypeFunctionSetDragImage):
• bindings/js/kjs_events.h:
• bindings/js/kjs_navigator.cpp: (KJS::pluginsFunctionRefresh): (KJS::navigatorProtoFuncJavaEnabled):
• bindings/js/kjs_navigator.h:
• bindings/js/kjs_window.cpp: (KJS::Window::getOwnPropertySlot): (KJS::windowProtoFuncAToB): (KJS::windowProtoFuncBToA): (KJS::windowProtoFuncOpen): (KJS::windowProtoFuncSetTimeout): (KJS::windowProtoFuncClearTimeout): (KJS::windowProtoFuncSetInterval): (KJS::windowProtoFuncAddEventListener): (KJS::windowProtoFuncRemoveEventListener): (KJS::windowProtoFuncShowModalDialog): (KJS::windowProtoFuncNotImplemented):
• bindings/js/kjs_window.h:
• bindings/scripts/CodeGenerator.pm:
• bindings/scripts/CodeGeneratorJS.pm:

File:

• trunk/JavaScriptCore/kjs/string_object.cpp (modified) (34 diffs)

trunk/JavaScriptCore/kjs/string_object.cpp

@@ -135 +135 @@
 /* Source for string_object.lut.h
 @begin stringTable 26
-  toString              &StringProtoFuncToString::create          DontEnum|Function       0
-  valueOf               &StringProtoFuncValueOf::create           DontEnum|Function       0
-  charAt                &StringProtoFuncCharAt::create            DontEnum|Function       1
-  charCodeAt            &StringProtoFuncCharCodeAt::create        DontEnum|Function       1
-  concat                &StringProtoFuncConcat::create            DontEnum|Function       1
-  indexOf               &StringProtoFuncIndexOf::create           DontEnum|Function       1
-  lastIndexOf           &StringProtoFuncLastIndexOf::create       DontEnum|Function       1
-  match                 &StringProtoFuncMatch::create             DontEnum|Function       1
-  replace               &StringProtoFuncReplace::create           DontEnum|Function       2
-  search                &StringProtoFuncSearch::create            DontEnum|Function       1
-  slice                 &StringProtoFuncSlice::create             DontEnum|Function       2
-  split                 &StringProtoFuncSplit::create             DontEnum|Function       2
-  substr                &StringProtoFuncSubstr::create            DontEnum|Function       2
-  substring             &StringProtoFuncSubstring::create         DontEnum|Function       2
-  toLowerCase           &StringProtoFuncToLowerCase::create       DontEnum|Function       0
-  toUpperCase           &StringProtoFuncToUpperCase::create       DontEnum|Function       0
-  toLocaleLowerCase     &StringProtoFuncToLocaleLowerCase::create DontEnum|Function       0
-  toLocaleUpperCase     &StringProtoFuncToLocaleUpperCase::create DontEnum|Function       0
-  localeCompare         &StringProtoFuncLocaleCompare::create     DontEnum|Function       1
+  toString              &stringProtoFuncToString          DontEnum|Function       0
+  valueOf               &stringProtoFuncValueOf           DontEnum|Function       0
+  charAt                &stringProtoFuncCharAt            DontEnum|Function       1
+  charCodeAt            &stringProtoFuncCharCodeAt        DontEnum|Function       1
+  concat                &stringProtoFuncConcat            DontEnum|Function       1
+  indexOf               &stringProtoFuncIndexOf           DontEnum|Function       1
+  lastIndexOf           &stringProtoFuncLastIndexOf       DontEnum|Function       1
+  match                 &stringProtoFuncMatch             DontEnum|Function       1
+  replace               &stringProtoFuncReplace           DontEnum|Function       2
+  search                &stringProtoFuncSearch            DontEnum|Function       1
+  slice                 &stringProtoFuncSlice             DontEnum|Function       2
+  split                 &stringProtoFuncSplit             DontEnum|Function       2
+  substr                &stringProtoFuncSubstr            DontEnum|Function       2
+  substring             &stringProtoFuncSubstring         DontEnum|Function       2
+  toLowerCase           &stringProtoFuncToLowerCase       DontEnum|Function       0
+  toUpperCase           &stringProtoFuncToUpperCase       DontEnum|Function       0
+  toLocaleLowerCase     &stringProtoFuncToLocaleLowerCase DontEnum|Function       0
+  toLocaleUpperCase     &stringProtoFuncToLocaleUpperCase DontEnum|Function       0
+  localeCompare         &stringProtoFuncLocaleCompare     DontEnum|Function       1
 #
 # Under here: html extension, should only exist if KJS_PURE_ECMA is not defined
 # I guess we need to generate two hashtables in the .lut.h file, and use #ifdef
 # to select the right one... TODO. #####
-  big                   &StringProtoFuncBig::create               DontEnum|Function       0
-  small                 &StringProtoFuncSmall::create             DontEnum|Function       0
-  blink                 &StringProtoFuncBlink::create             DontEnum|Function       0
-  bold                  &StringProtoFuncBold::create              DontEnum|Function       0
-  fixed                 &StringProtoFuncFixed::create             DontEnum|Function       0
-  italics               &StringProtoFuncItalics::create           DontEnum|Function       0
-  strike                &StringProtoFuncStrike::create            DontEnum|Function       0
-  sub                   &StringProtoFuncSub::create               DontEnum|Function       0
-  sup                   &StringProtoFuncSup::create               DontEnum|Function       0
-  fontcolor             &StringProtoFuncFontcolor::create         DontEnum|Function       1
-  fontsize              &StringProtoFuncFontsize::create          DontEnum|Function       1
-  anchor                &StringProtoFuncAnchor::create            DontEnum|Function       1
-  link                  &StringProtoFuncLink::create              DontEnum|Function       1
+  big                   &stringProtoFuncBig               DontEnum|Function       0
+  small                 &stringProtoFuncSmall             DontEnum|Function       0
+  blink                 &stringProtoFuncBlink             DontEnum|Function       0
+  bold                  &stringProtoFuncBold              DontEnum|Function       0
+  fixed                 &stringProtoFuncFixed             DontEnum|Function       0
+  italics               &stringProtoFuncItalics           DontEnum|Function       0
+  strike                &stringProtoFuncStrike            DontEnum|Function       0
+  sub                   &stringProtoFuncSub               DontEnum|Function       0
+  sup                   &stringProtoFuncSup               DontEnum|Function       0
+  fontcolor             &stringProtoFuncFontcolor         DontEnum|Function       1
+  fontsize              &stringProtoFuncFontsize          DontEnum|Function       1
+  anchor                &stringProtoFuncAnchor            DontEnum|Function       1
+  link                  &stringProtoFuncLink              DontEnum|Function       1
 @end
 */
@@ -433 +433 @@
 }
 
-JSValue* StringProtoFuncToString::callAsFunction(ExecState* exec, JSObject* thisObj, const List&)
+JSValue* stringProtoFuncToString(ExecState* exec, JSObject* thisObj, const List&)
 {
     if (!thisObj->inherits(&StringInstance::info))
@@ -441 +441 @@
 }
 
-JSValue* StringProtoFuncValueOf::callAsFunction(ExecState* exec, JSObject* thisObj, const List&)
+JSValue* stringProtoFuncValueOf(ExecState* exec, JSObject* thisObj, const List&)
 {
     if (!thisObj->inherits(&StringInstance::info))
@@ -449 +449 @@
 }
 
-JSValue* StringProtoFuncCharAt::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)
+JSValue* stringProtoFuncCharAt(ExecState* exec, JSObject* thisObj, const List& args)
 {
     // This optimizes the common case that thisObj is a StringInstance
@@ -465 +465 @@
 }
 
-JSValue* StringProtoFuncCharCodeAt::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)
+JSValue* stringProtoFuncCharCodeAt(ExecState* exec, JSObject* thisObj, const List& args)
 {
     // This optimizes the common case that thisObj is a StringInstance
@@ -482 +482 @@
 }
 
-JSValue* StringProtoFuncConcat::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)
+JSValue* stringProtoFuncConcat(ExecState* exec, JSObject* thisObj, const List& args)
 {
     // This optimizes the common case that thisObj is a StringInstance
@@ -494 +494 @@
 }
 
-JSValue* StringProtoFuncIndexOf::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)
+JSValue* stringProtoFuncIndexOf(ExecState* exec, JSObject* thisObj, const List& args)
 {
     // This optimizes the common case that thisObj is a StringInstance
@@ -511 +511 @@
 }
 
-JSValue* StringProtoFuncLastIndexOf::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)
+JSValue* stringProtoFuncLastIndexOf(ExecState* exec, JSObject* thisObj, const List& args)
 {
     // This optimizes the common case that thisObj is a StringInstance
@@ -529 +529 @@
 }
 
-JSValue* StringProtoFuncMatch::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)
+JSValue* stringProtoFuncMatch(ExecState* exec, JSObject* thisObj, const List& args)
 {
     // This optimizes the common case that thisObj is a StringInstance
@@ -586 +586 @@
 }
 
-JSValue* StringProtoFuncSearch::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)
+JSValue* stringProtoFuncSearch(ExecState* exec, JSObject* thisObj, const List& args)
 {
     // This optimizes the common case that thisObj is a StringInstance
@@ -614 +614 @@
 }
 
-JSValue* StringProtoFuncReplace::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)
+JSValue* stringProtoFuncReplace(ExecState* exec, JSObject* thisObj, const List& args)
 {
     // This optimizes the common case that thisObj is a StringInstance
@@ -629 +629 @@
 }
 
-JSValue* StringProtoFuncSlice::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)
+JSValue* stringProtoFuncSlice(ExecState* exec, JSObject* thisObj, const List& args)
 {
     // This optimizes the common case that thisObj is a StringInstance
@@ -654 +654 @@
 }
 
-JSValue* StringProtoFuncSplit::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)
+JSValue* stringProtoFuncSplit(ExecState* exec, JSObject* thisObj, const List& args)
 {
     // This optimizes the common case that thisObj is a StringInstance
@@ -703 +703 @@
         if (u.isEmpty()) {
           // empty separator matches empty string -> empty array
-          put(exec, exec->propertyNames().length, jsNumber(0));
+          res->put(exec, exec->propertyNames().length, jsNumber(0));
           return result;
         } else {
@@ -724 +724 @@
 }
 
-JSValue* StringProtoFuncSubstr::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)
+JSValue* stringProtoFuncSubstr(ExecState* exec, JSObject* thisObj, const List& args)
 {
     // This optimizes the common case that thisObj is a StringInstance
@@ -749 +749 @@
 }
 
-JSValue* StringProtoFuncSubstring::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)
+JSValue* stringProtoFuncSubstring(ExecState* exec, JSObject* thisObj, const List& args)
 {
     // This optimizes the common case that thisObj is a StringInstance
@@ -782 +782 @@
 }
 
-JSValue* StringProtoFuncToLowerCase::callAsFunction(ExecState* exec, JSObject* thisObj, const List&)
+JSValue* stringProtoFuncToLowerCase(ExecState* exec, JSObject* thisObj, const List&)
 {
     // This optimizes the common case that thisObj is a StringInstance
@@ -807 +807 @@
 }
 
-JSValue* StringProtoFuncToUpperCase::callAsFunction(ExecState* exec, JSObject* thisObj, const List&)
+JSValue* stringProtoFuncToUpperCase(ExecState* exec, JSObject* thisObj, const List&)
 {
     // This optimizes the common case that thisObj is a StringInstance
@@ -832 +832 @@
 }
 
-JSValue* StringProtoFuncToLocaleLowerCase::callAsFunction(ExecState* exec, JSObject* thisObj, const List&)
+JSValue* stringProtoFuncToLocaleLowerCase(ExecState* exec, JSObject* thisObj, const List&)
 {
     // This optimizes the common case that thisObj is a StringInstance
@@ -858 +858 @@
 }
 
-JSValue* StringProtoFuncToLocaleUpperCase::callAsFunction(ExecState* exec, JSObject* thisObj, const List&)
+JSValue* stringProtoFuncToLocaleUpperCase(ExecState* exec, JSObject* thisObj, const List&)
 {
     // This optimizes the common case that thisObj is a StringInstance
@@ -883 +883 @@
 }
 
-JSValue* StringProtoFuncLocaleCompare::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)
+JSValue* stringProtoFuncLocaleCompare(ExecState* exec, JSObject* thisObj, const List& args)
 {
     if (args.size() < 1)
@@ -896 +896 @@
 #ifndef KJS_PURE_ECMA
 
-JSValue* StringProtoFuncBig::callAsFunction(ExecState* exec, JSObject* thisObj, const List&)
+JSValue* stringProtoFuncBig(ExecState* exec, JSObject* thisObj, const List&)
 {
     // This optimizes the common case that thisObj is a StringInstance
@@ -903 +903 @@
 }
 
-JSValue* StringProtoFuncSmall::callAsFunction(ExecState* exec, JSObject* thisObj, const List&)
+JSValue* stringProtoFuncSmall(ExecState* exec, JSObject* thisObj, const List&)
 {
     // This optimizes the common case that thisObj is a StringInstance
@@ -910 +910 @@
 }
 
-JSValue* StringProtoFuncBlink::callAsFunction(ExecState* exec, JSObject* thisObj, const List&)
+JSValue* stringProtoFuncBlink(ExecState* exec, JSObject* thisObj, const List&)
 {
     // This optimizes the common case that thisObj is a StringInstance
@@ -917 +917 @@
 }
 
-JSValue* StringProtoFuncBold::callAsFunction(ExecState* exec, JSObject* thisObj, const List&)
+JSValue* stringProtoFuncBold(ExecState* exec, JSObject* thisObj, const List&)
 {
     // This optimizes the common case that thisObj is a StringInstance
@@ -924 +924 @@
 }
 
-JSValue* StringProtoFuncFixed::callAsFunction(ExecState* exec, JSObject* thisObj, const List&)
+JSValue* stringProtoFuncFixed(ExecState* exec, JSObject* thisObj, const List&)
 {
     // This optimizes the common case that thisObj is a StringInstance
@@ -931 +931 @@
 }
 
-JSValue* StringProtoFuncItalics::callAsFunction(ExecState* exec, JSObject* thisObj, const List&)
+JSValue* stringProtoFuncItalics(ExecState* exec, JSObject* thisObj, const List&)
 {
     // This optimizes the common case that thisObj is a StringInstance
@@ -938 +938 @@
 }
 
-JSValue* StringProtoFuncStrike::callAsFunction(ExecState* exec, JSObject* thisObj, const List&)
+JSValue* stringProtoFuncStrike(ExecState* exec, JSObject* thisObj, const List&)
 {
     // This optimizes the common case that thisObj is a StringInstance
@@ -945 +945 @@
 }
 
-JSValue* StringProtoFuncSub::callAsFunction(ExecState* exec, JSObject* thisObj, const List&)
+JSValue* stringProtoFuncSub(ExecState* exec, JSObject* thisObj, const List&)
 {
     // This optimizes the common case that thisObj is a StringInstance
@@ -952 +952 @@
 }
 
-JSValue* StringProtoFuncSup::callAsFunction(ExecState* exec, JSObject* thisObj, const List&)
+JSValue* stringProtoFuncSup(ExecState* exec, JSObject* thisObj, const List&)
 {
     // This optimizes the common case that thisObj is a StringInstance
@@ -959 +959 @@
 }
 
-JSValue* StringProtoFuncFontcolor::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)
+JSValue* stringProtoFuncFontcolor(ExecState* exec, JSObject* thisObj, const List& args)
 {
     // This optimizes the common case that thisObj is a StringInstance
@@ -967 +967 @@
 }
 
-JSValue* StringProtoFuncFontsize::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)
+JSValue* stringProtoFuncFontsize(ExecState* exec, JSObject* thisObj, const List& args)
 {
     // This optimizes the common case that thisObj is a StringInstance
@@ -975 +975 @@
 }
 
-JSValue* StringProtoFuncAnchor::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)
+JSValue* stringProtoFuncAnchor(ExecState* exec, JSObject* thisObj, const List& args)
 {
     // This optimizes the common case that thisObj is a StringInstance
@@ -983 +983 @@
 }
 
-JSValue* StringProtoFuncLink::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)
+JSValue* stringProtoFuncLink(ExecState* exec, JSObject* thisObj, const List& args)
 {
     // This optimizes the common case that thisObj is a StringInstance