Changeset 38825 in webkit for trunk/JavaScriptCore/runtime

Timestamp:

Nov 27, 2008, 6:24:20 PM (17 years ago)

Author:

[email protected]

Message:

2008-11-27 Sam Weinig <​[email protected]>

Reviewed by Cameron Zwarich.

Fix FIXME by adding accessor for JSFunction's m_body property.

• interpreter/Interpreter.cpp: (JSC::Interpreter::cti_op_call_JSFunction): (JSC::Interpreter::cti_vm_dontLazyLinkCall): (JSC::Interpreter::cti_vm_lazyLinkCall):
• profiler/Profiler.cpp: (JSC::createCallIdentifierFromFunctionImp):
• runtime/Arguments.h: (JSC::Arguments::getArgumentsData): (JSC::Arguments::Arguments):
• runtime/FunctionPrototype.cpp: (JSC::functionProtoFuncToString):
• runtime/JSFunction.h: (JSC::JSFunction::JSFunction): (JSC::JSFunction::body):

Location:

trunk/JavaScriptCore/runtime

Files:

• Arguments.h (modified) (3 diffs)
• FunctionPrototype.cpp (modified) (1 diff)
• JSFunction.h (modified) (3 diffs)

trunk/JavaScriptCore/runtime/Arguments.h

@@ -107 +107 @@
         function = callFrame->callee();
     
-        CodeBlock* codeBlock = &function->m_body->generatedBytecode();
+        CodeBlock* codeBlock = &function->body()->generatedBytecode();
         int numParameters = codeBlock->numParameters;
         argc = callFrame->argumentCount();
@@ -130 +130 @@
         getArgumentsData(callFrame, callee, firstParameterIndex, argv, numArguments);
 
-        d->numParameters = callee->m_body->parameterCount();
+        d->numParameters = callee->body()->parameterCount();
         d->firstParameterIndex = firstParameterIndex;
         d->numArguments = numArguments;
@@ -161 +161 @@
         , d(new ArgumentsData)
     {
-        ASSERT(!callFrame->callee()->m_body->parameterCount());
+        ASSERT(!callFrame->callee()->body()->parameterCount());
 
         unsigned numArguments = callFrame->argumentCount() - 1;

trunk/JavaScriptCore/runtime/FunctionPrototype.cpp

@@ -68 +68 @@
     if (thisValue->isObject(&JSFunction::info)) {
         JSFunction* function = asFunction(thisValue);
-        return jsString(exec, "function " + function->name(&exec->globalData()) + "(" + function->m_body->paramString() + ") " + function->m_body->toSourceString());
+        return jsString(exec, "function " + function->name(&exec->globalData()) + "(" + function->body()->paramString() + ") " + function->body()->toSourceString());
     }
 

trunk/JavaScriptCore/runtime/JSFunction.h

@@ -43 +43 @@
 
         typedef InternalFunction Base;
-        JSFunction(PassRefPtr<JSC::Structure> st) : InternalFunction(st), m_scopeChain(NoScopeChain()) {}
+
+        JSFunction(PassRefPtr<Structure> structure)
+            : InternalFunction(structure)
+            , m_scopeChain(NoScopeChain())
+        {
+        }
+
     public:
         JSFunction(ExecState*, const Identifier&, FunctionBodyNode*, ScopeChainNode*);
@@ -58 +64 @@
         ScopeChain& scope() { return m_scopeChain; }
 
+        FunctionBodyNode* body() const { return m_body.get(); }
+
         virtual void mark();
 
         static const ClassInfo info;
-
-        // FIXME: This should be private
-        RefPtr<FunctionBodyNode> m_body;
 
         static PassRefPtr<Structure> createStructure(JSValue* prototype) 
@@ -80 +85 @@
         static JSValue* lengthGetter(ExecState*, const Identifier&, const PropertySlot&);
 
+        RefPtr<FunctionBodyNode> m_body;
         ScopeChain m_scopeChain;
     };