Changeset 79177 in webkit for trunk/Source/JavaScriptCore/runtime/Lookup.cpp

Timestamp:

Feb 20, 2011, 9:18:40 PM (15 years ago)

Author:

[email protected]

Message:

​https://bugs.webkit.org/show_bug.cgi?id=54839
Remove PrototypeFunction, NativeFunctionWrapper, and GlobalEvalFunction.

Reviewed by Oliver Hunt.

Historically, Native functions used to be represented by PrototypeFunctions, however
since introducing call optimizations to the JIT this has used JSFunctions for host
calls too. At the point this change was made, the interpreter continued to use
PrototypeFunctions, however since fallback from the JIT to interpreter was introduced
the interpreter has had to be able to run using host functions represented using
JSFunctions - leading to an unnecessary and redundant divergence in behaviour between
interpreter only builds, and situations where the JIT has fallen back to interpreting.

NativeFunctionWrapper only existed to select between PrototypeFunction and JSFunction
for wrappers for host functions, and as such can also be removed.

GlobalEvalFunction is a redundant wrapper that happens to be derived from
PrototypeFunction. It existed to hold a reference to the global object - but since all
functions how derive from JSObjectWithGlobalObject, this no longer requires an
additional class to provide this functionality.

Source/JavaScriptCore:

• JavaScriptCore.JSVALUE32_64only.exp:
• JavaScriptCore.JSVALUE64only.exp:
• JavaScriptCore.xcodeproj/project.pbxproj:

Removed symbols / references to files.

• runtime/GlobalEvalFunction.cpp: Removed.
• runtime/GlobalEvalFunction.h: Removed.
• runtime/NativeFunctionWrapper.h: Removed.
• runtime/PrototypeFunction.cpp: Removed.
• runtime/PrototypeFunction.h: Removed.

Removed.

• runtime/Executable.cpp:

(JSC::NativeExecutable::~NativeExecutable):

• runtime/Executable.h:

(JSC::NativeExecutable::create):
(JSC::NativeExecutable::NativeExecutable):
(JSC::JSFunction::nativeFunction):

• runtime/JSFunction.cpp:

(JSC::callHostFunctionAsConstructor):
(JSC::JSFunction::JSFunction):
(JSC::JSFunction::getCallData):

• runtime/JSFunction.h:
• runtime/JSGlobalData.cpp:

(JSC::JSGlobalData::getHostFunction):

• runtime/JSGlobalData.h:

(JSC::JSGlobalData::getCTIStub):

Added interpreter-friendly constructors for NativeExecutables.

• bytecompiler/BytecodeGenerator.cpp:
• interpreter/Interpreter.cpp:
• jit/JITStubs.cpp:
• jsc.cpp:
• runtime/ArrayConstructor.cpp:
• runtime/BooleanPrototype.cpp:
• runtime/BooleanPrototype.h:
• runtime/CallData.h:
• runtime/DateConstructor.cpp:
• runtime/DateConstructor.h:
• runtime/ErrorPrototype.cpp:
• runtime/ErrorPrototype.h:
• runtime/FunctionPrototype.cpp:
• runtime/FunctionPrototype.h:
• runtime/JSGlobalObject.cpp:
• runtime/JSGlobalObject.h:
• runtime/JSGlobalObjectFunctions.cpp:
• runtime/Lookup.cpp:
• runtime/NumberPrototype.cpp:
• runtime/NumberPrototype.h:
• runtime/ObjectConstructor.cpp:
• runtime/ObjectConstructor.h:
• runtime/ObjectPrototype.cpp:
• runtime/ObjectPrototype.h:
• runtime/RegExpPrototype.cpp:
• runtime/RegExpPrototype.h:
• runtime/SmallStrings.h:
• runtime/StringConstructor.cpp:
• runtime/StringConstructor.h:

Removed use of redundant classes.

Source/WebCore:

• bindings/js/JSDOMBinding.cpp:
• bindings/js/JSDOMWindowCustom.cpp:
• bindings/js/JSHistoryCustom.cpp:
• bindings/js/JSLocationCustom.cpp:

Removed use of redundant classes.

File:

• trunk/Source/JavaScriptCore/runtime/Lookup.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/runtime/Lookup.cpp

@@ -23 +23 @@
 #include "Executable.h"
 #include "JSFunction.h"
-#include "PrototypeFunction.h"
 
 namespace JSC {
@@ -78 +77 @@
 
     if (!location) {
-        NativeFunctionWrapper* function;
+        JSFunction* function;
         JSGlobalObject* globalObject = asGlobalObject(thisObj->getAnonymousValue(0).asCell());
 #if ENABLE(JIT) && ENABLE(JIT_OPTIMIZE_NATIVE_CALL)
         if (entry->generator())
-            function = new (exec) NativeFunctionWrapper(exec, globalObject, globalObject->prototypeFunctionStructure(), entry->functionLength(), propertyName, exec->globalData().getHostFunction(entry->function(), entry->generator()));
+            function = new (exec) JSFunction(exec, globalObject, globalObject->functionStructure(), entry->functionLength(), propertyName, exec->globalData().getHostFunction(entry->function(), entry->generator()));
         else
 #endif
-            function = new (exec) NativeFunctionWrapper(exec, globalObject, globalObject->prototypeFunctionStructure(), entry->functionLength(), propertyName, entry->function());
+            function = new (exec) JSFunction(exec, globalObject, globalObject->functionStructure(), entry->functionLength(), propertyName, entry->function());
 
         thisObj->putDirectFunction(exec->globalData(), propertyName, function, entry->attributes());