Changeset 63675 in webkit for trunk/JavaScriptCore/runtime/Executable.h

Timestamp:

Jul 19, 2010, 10:19:16 AM (15 years ago)

Author:

Darin Adler

Message:

2010-07-16 Darin Adler <Darin Adler>

Reviewed by Sam Weinig.

Use OwnPtr for CodeBlock objects
​https://bugs.webkit.org/show_bug.cgi?id=42490

• runtime/Executable.cpp: (JSC::EvalExecutable::EvalExecutable): Moved this here and made it non-inline. Eliminated the code that used to initialize the raw pointer since it's now an OwnPtr. (JSC::EvalExecutable::~EvalExecutable): Removed the explicit delete here. (JSC::ProgramExecutable::ProgramExecutable): Ditto. (JSC::ProgramExecutable::~ProgramExecutable): Ditto. (JSC::FunctionExecutable::FunctionExecutable): Ditto. (JSC::FunctionExecutable::~FunctionExecutable): Ditto. (JSC::EvalExecutable::compileInternal): Added use of adoptPtr and get. (JSC::ProgramExecutable::compileInternal): Ditto. (JSC::FunctionExecutable::compileForCallInternal): Ditto. (JSC::FunctionExecutable::compileForConstructInternal): Ditto. (JSC::FunctionExecutable::recompile): Use clear instead of delete followed by assignment of 0.

• runtime/Executable.h: Moved constructors to the cpp file and changed raw pointers to OwnPtr.

File:

• trunk/JavaScriptCore/runtime/Executable.h (modified) (6 diffs)

trunk/JavaScriptCore/runtime/Executable.h

@@ -221 +221 @@
 
     private:
-        EvalExecutable(ExecState* exec, const SourceCode& source)
-            : ScriptExecutable(exec, source)
-            , m_evalCodeBlock(0)
-        {
-        }
+        EvalExecutable(ExecState*, const SourceCode&);
 
         JSObject* compileInternal(ExecState*, ScopeChainNode*);
@@ -231 +227 @@
         virtual PassOwnPtr<ExceptionInfo> reparseExceptionInfo(JSGlobalData*, ScopeChainNode*, CodeBlock*);
 
-        EvalCodeBlock* m_evalCodeBlock;
+        OwnPtr<EvalCodeBlock> m_evalCodeBlock;
     };
 
@@ -268 +264 @@
 
     private:
-        ProgramExecutable(ExecState* exec, const SourceCode& source)
-            : ScriptExecutable(exec, source)
-            , m_programCodeBlock(0)
-        {
-        }
+        ProgramExecutable(ExecState*, const SourceCode&);
 
         JSObject* compileInternal(ExecState*, ScopeChainNode*);
@@ -278 +270 @@
         virtual PassOwnPtr<ExceptionInfo> reparseExceptionInfo(JSGlobalData*, ScopeChainNode*, CodeBlock*);
 
-        ProgramCodeBlock* m_programCodeBlock;
+        OwnPtr<ProgramCodeBlock> m_programCodeBlock;
     };
 
@@ -359 +351 @@
 
         void recompile(ExecState*);
-        void markAggregate(MarkStack& markStack);
+        void markAggregate(MarkStack&);
         static PassRefPtr<FunctionExecutable> fromGlobalCode(const Identifier&, ExecState*, Debugger*, const SourceCode&, JSObject** exception);
 
     private:
-        FunctionExecutable(JSGlobalData* globalData, const Identifier& name, const SourceCode& source, bool forceUsesArguments, FunctionParameters* parameters, int firstLine, int lastLine)
-            : ScriptExecutable(globalData, source)
-            , m_numVariables(0)
-            , m_forceUsesArguments(forceUsesArguments)
-            , m_parameters(parameters)
-            , m_codeBlockForCall(0)
-            , m_codeBlockForConstruct(0)
-            , m_name(name)
-            , m_symbolTable(0)
-        {
-            m_firstLine = firstLine;
-            m_lastLine = lastLine;
-        }
-
-        FunctionExecutable(ExecState* exec, const Identifier& name, const SourceCode& source, bool forceUsesArguments, FunctionParameters* parameters, int firstLine, int lastLine)
-            : ScriptExecutable(exec, source)
-            , m_numVariables(0)
-            , m_forceUsesArguments(forceUsesArguments)
-            , m_parameters(parameters)
-            , m_codeBlockForCall(0)
-            , m_codeBlockForConstruct(0)
-            , m_name(name)
-            , m_symbolTable(0)
-        {
-            m_firstLine = firstLine;
-            m_lastLine = lastLine;
-        }
+        FunctionExecutable(JSGlobalData*, const Identifier& name, const SourceCode&, bool forceUsesArguments, FunctionParameters*, int firstLine, int lastLine);
+        FunctionExecutable(ExecState*, const Identifier& name, const SourceCode&, bool forceUsesArguments, FunctionParameters*, int firstLine, int lastLine);
 
         JSObject* compileForCallInternal(ExecState*, ScopeChainNode*);
@@ -400 +367 @@
 
         RefPtr<FunctionParameters> m_parameters;
-        FunctionCodeBlock* m_codeBlockForCall;
-        FunctionCodeBlock* m_codeBlockForConstruct;
+        OwnPtr<FunctionCodeBlock> m_codeBlockForCall;
+        OwnPtr<FunctionCodeBlock> m_codeBlockForConstruct;
         Identifier m_name;
         SharedSymbolTable* m_symbolTable;