Changeset 59800 in webkit for trunk/JavaScriptCore/interpreter/Interpreter.h

Timestamp:

May 19, 2010, 6:01:03 PM (15 years ago)

Author:

[email protected]

Message:

Bug 39393 - JSFunction need not be a subclass of InternalFunction.

Reviewed by Oliver Hunt.

This may prevent us from introducing a more useful parent class to
JSFunction, e.g. a JSObject that holds an executable, which could
also reference an eval or program executable.

• JavaScriptCore.exp:
• interpreter/Interpreter.cpp:

(JSC::Interpreter::retrieveCaller):
(JSC::Interpreter::findFunctionCallFrame):

• interpreter/Interpreter.h:
• profiler/Profiler.cpp:

(JSC::Profiler::createCallIdentifier):

• runtime/FunctionPrototype.cpp:

(JSC::functionProtoFuncToString):

• runtime/JSFunction.cpp:

(JSC::):
(JSC::JSFunction::JSFunction):
(JSC::JSFunction::name):
(JSC::JSFunction::displayName):
(JSC::JSFunction::calculatedDisplayName):

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

(JSC::JSObject::putDirectFunction):
(JSC::JSObject::putDirectFunctionWithoutTransition):

• runtime/JSObject.h:
• runtime/Lookup.cpp:

(JSC::setUpStaticFunctionSlot):

File:

• trunk/JavaScriptCore/interpreter/Interpreter.h (modified) (3 diffs)

trunk/JavaScriptCore/interpreter/Interpreter.h

@@ -45 +45 @@
     class EvalExecutable;
     class FunctionExecutable;
-    class InternalFunction;
     class JSFunction;
     class JSGlobalObject;
@@ -102 +101 @@
 
         JSValue retrieveArguments(CallFrame*, JSFunction*) const;
-        JSValue retrieveCaller(CallFrame*, InternalFunction*) const;
+        JSValue retrieveCaller(CallFrame*, JSFunction*) const;
         void retrieveLastCaller(CallFrame*, int& lineNumber, intptr_t& sourceID, UString& sourceURL, JSValue& function) const;
         
@@ -144 +143 @@
         static ALWAYS_INLINE CallFrame* slideRegisterWindowForCall(CodeBlock*, RegisterFile*, CallFrame*, size_t registerOffset, int argc);
 
-        static CallFrame* findFunctionCallFrame(CallFrame*, InternalFunction*);
+        static CallFrame* findFunctionCallFrame(CallFrame*, JSFunction*);
 
         JSValue privateExecute(ExecutionFlag, RegisterFile*, CallFrame*, JSValue* exception);