<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[176825] trunk/Source/JavaScriptCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/176825">176825</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2014-12-04 16:59:33 -0800 (Thu, 04 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Removed the concept of ParserArenaRefCounted
https://bugs.webkit.org/show_bug.cgi?id=139277
Reviewed by Oliver Hunt.
This is a step toward a parser speedup.
Now that we have a clear root node type for each parse tree, there's no
need to have a concept for "I might be refcounted or arena allocated".
Instead, we can just use unique_ptr to manage the tree as a whole.
* API/JSScriptRef.cpp:
(parseScript):
* builtins/BuiltinExecutables.cpp:
(JSC::BuiltinExecutables::createBuiltinExecutable): Updated for type change.
* bytecode/UnlinkedCodeBlock.cpp:
(JSC::generateFunctionCodeBlock): Use unique_ptr. No need to call
destroyData() explicitly: the unique_ptr destructor will do everything
we need, as Bjarne intended.
* parser/NodeConstructors.h:
(JSC::ParserArenaRoot::ParserArenaRoot):
(JSC::ParserArenaRefCounted::ParserArenaRefCounted): Deleted.
* parser/Nodes.cpp:
(JSC::ScopeNode::ScopeNode):
(JSC::ProgramNode::ProgramNode):
(JSC::EvalNode::EvalNode):
(JSC::FunctionNode::FunctionNode):
(JSC::ProgramNode::create): Deleted.
(JSC::EvalNode::create): Deleted.
(JSC::FunctionNode::create): Deleted. All special create semantics can
just go away now that we play by C++ constructor / destructor rules.
* parser/Nodes.h:
(JSC::ParserArenaRoot::parserArena):
(JSC::ParserArenaRoot::~ParserArenaRoot): Just a normal class now, which
holds onto the whole parse tree by virtue of owning the arena in which
all the parsed nodes (except for itself) were allocated.
(JSC::ProgramNode::closedVariables):
(JSC::ParserArenaRefCounted::~ParserArenaRefCounted): Deleted.
(JSC::ScopeNode::destroyData): Deleted. No need to destroy anything
explicitly anymore -- we can just rely on destructors.
(JSC::ScopeNode::parserArena): Deleted.
* parser/Parser.h:
(JSC::Parser<LexerType>::parse):
(JSC::parse): unique_ptr all the things.
* parser/ParserArena.cpp:
(JSC::ParserArena::reset):
(JSC::ParserArena::isEmpty):
(JSC::ParserArena::contains): Deleted.
(JSC::ParserArena::last): Deleted.
(JSC::ParserArena::removeLast): Deleted.
(JSC::ParserArena::derefWithArena): Deleted.
* parser/ParserArena.h:
(JSC::ParserArena::swap): Much delete. Such wow.
* runtime/CodeCache.cpp:
(JSC::CodeCache::getGlobalCodeBlock):
(JSC::CodeCache::getFunctionExecutableFromGlobalCode):
* runtime/Completion.cpp:
(JSC::checkSyntax):
* runtime/Executable.cpp:
(JSC::ProgramExecutable::checkSyntax): unique_ptr all the things.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreAPIJSScriptRefcpp">trunk/Source/JavaScriptCore/API/JSScriptRef.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebuiltinsBuiltinExecutablescpp">trunk/Source/JavaScriptCore/builtins/BuiltinExecutables.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockcpp">trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserNodeConstructorsh">trunk/Source/JavaScriptCore/parser/NodeConstructors.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserNodescpp">trunk/Source/JavaScriptCore/parser/Nodes.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserNodesh">trunk/Source/JavaScriptCore/parser/Nodes.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserParserh">trunk/Source/JavaScriptCore/parser/Parser.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserParserArenacpp">trunk/Source/JavaScriptCore/parser/ParserArena.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserParserArenah">trunk/Source/JavaScriptCore/parser/ParserArena.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCodeCachecpp">trunk/Source/JavaScriptCore/runtime/CodeCache.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCompletioncpp">trunk/Source/JavaScriptCore/runtime/Completion.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeExecutablecpp">trunk/Source/JavaScriptCore/runtime/Executable.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreAPIJSScriptRefcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/JSScriptRef.cpp (176824 => 176825)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSScriptRef.cpp 2014-12-05 00:55:30 UTC (rev 176824)
+++ trunk/Source/JavaScriptCore/API/JSScriptRef.cpp 2014-12-05 00:59:33 UTC (rev 176825)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx">
</span><span class="cx"> static bool parseScript(VM* vm, const SourceCode& source, ParserError& error)
</span><span class="cx"> {
</span><del>- return JSC::parse<JSC::ProgramNode>(vm, source, 0, Identifier(), JSParseNormal, JSParseProgramCode, error);
</del><ins>+ return !!JSC::parse<JSC::ProgramNode>(vm, source, 0, Identifier(), JSParseNormal, JSParseProgramCode, error);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (176824 => 176825)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-12-05 00:55:30 UTC (rev 176824)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-12-05 00:59:33 UTC (rev 176825)
</span><span class="lines">@@ -1,3 +1,76 @@
</span><ins>+2014-12-04 Geoffrey Garen <ggaren@apple.com>
+
+ Removed the concept of ParserArenaRefCounted
+ https://bugs.webkit.org/show_bug.cgi?id=139277
+
+ Reviewed by Oliver Hunt.
+
+ This is a step toward a parser speedup.
+
+ Now that we have a clear root node type for each parse tree, there's no
+ need to have a concept for "I might be refcounted or arena allocated".
+ Instead, we can just use unique_ptr to manage the tree as a whole.
+
+ * API/JSScriptRef.cpp:
+ (parseScript):
+ * builtins/BuiltinExecutables.cpp:
+ (JSC::BuiltinExecutables::createBuiltinExecutable): Updated for type change.
+
+ * bytecode/UnlinkedCodeBlock.cpp:
+ (JSC::generateFunctionCodeBlock): Use unique_ptr. No need to call
+ destroyData() explicitly: the unique_ptr destructor will do everything
+ we need, as Bjarne intended.
+
+ * parser/NodeConstructors.h:
+ (JSC::ParserArenaRoot::ParserArenaRoot):
+ (JSC::ParserArenaRefCounted::ParserArenaRefCounted): Deleted.
+
+ * parser/Nodes.cpp:
+ (JSC::ScopeNode::ScopeNode):
+ (JSC::ProgramNode::ProgramNode):
+ (JSC::EvalNode::EvalNode):
+ (JSC::FunctionNode::FunctionNode):
+ (JSC::ProgramNode::create): Deleted.
+ (JSC::EvalNode::create): Deleted.
+ (JSC::FunctionNode::create): Deleted. All special create semantics can
+ just go away now that we play by C++ constructor / destructor rules.
+
+ * parser/Nodes.h:
+ (JSC::ParserArenaRoot::parserArena):
+ (JSC::ParserArenaRoot::~ParserArenaRoot): Just a normal class now, which
+ holds onto the whole parse tree by virtue of owning the arena in which
+ all the parsed nodes (except for itself) were allocated.
+
+ (JSC::ProgramNode::closedVariables):
+ (JSC::ParserArenaRefCounted::~ParserArenaRefCounted): Deleted.
+
+ (JSC::ScopeNode::destroyData): Deleted. No need to destroy anything
+ explicitly anymore -- we can just rely on destructors.
+
+ (JSC::ScopeNode::parserArena): Deleted.
+
+ * parser/Parser.h:
+ (JSC::Parser<LexerType>::parse):
+ (JSC::parse): unique_ptr all the things.
+
+ * parser/ParserArena.cpp:
+ (JSC::ParserArena::reset):
+ (JSC::ParserArena::isEmpty):
+ (JSC::ParserArena::contains): Deleted.
+ (JSC::ParserArena::last): Deleted.
+ (JSC::ParserArena::removeLast): Deleted.
+ (JSC::ParserArena::derefWithArena): Deleted.
+ * parser/ParserArena.h:
+ (JSC::ParserArena::swap): Much delete. Such wow.
+
+ * runtime/CodeCache.cpp:
+ (JSC::CodeCache::getGlobalCodeBlock):
+ (JSC::CodeCache::getFunctionExecutableFromGlobalCode):
+ * runtime/Completion.cpp:
+ (JSC::checkSyntax):
+ * runtime/Executable.cpp:
+ (JSC::ProgramExecutable::checkSyntax): unique_ptr all the things.
+
</ins><span class="cx"> 2014-12-04 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r173188): Text inserted when trying to delete a word from the Twitter message box.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebuiltinsBuiltinExecutablescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/builtins/BuiltinExecutables.cpp (176824 => 176825)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/builtins/BuiltinExecutables.cpp 2014-12-05 00:55:30 UTC (rev 176824)
+++ trunk/Source/JavaScriptCore/builtins/BuiltinExecutables.cpp 2014-12-05 00:59:33 UTC (rev 176825)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> {
</span><span class="cx"> JSTextPosition positionBeforeLastNewline;
</span><span class="cx"> ParserError error;
</span><del>- RefPtr<ProgramNode> program = parse<ProgramNode>(&m_vm, source, 0, Identifier(), JSParseBuiltin, JSParseProgramCode, error, &positionBeforeLastNewline);
</del><ins>+ std::unique_ptr<ProgramNode> program = parse<ProgramNode>(&m_vm, source, 0, Identifier(), JSParseBuiltin, JSParseProgramCode, error, &positionBeforeLastNewline);
</ins><span class="cx">
</span><span class="cx"> if (!program) {
</span><span class="cx"> dataLog("Fatal error compiling builtin function '", name.string(), "': ", error.m_message);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp (176824 => 176825)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp 2014-12-05 00:55:30 UTC (rev 176824)
+++ trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp 2014-12-05 00:59:33 UTC (rev 176825)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx">
</span><span class="cx"> static UnlinkedFunctionCodeBlock* generateFunctionCodeBlock(VM& vm, UnlinkedFunctionExecutable* executable, const SourceCode& source, CodeSpecializationKind kind, DebuggerMode debuggerMode, ProfilerMode profilerMode, UnlinkedFunctionKind functionKind, bool bodyIncludesBraces, ParserError& error)
</span><span class="cx"> {
</span><del>- RefPtr<FunctionNode> function = parse<FunctionNode>(&vm, source, executable->parameters(), executable->name(), executable->toStrictness(), JSParseFunctionCode, error, 0, bodyIncludesBraces);
</del><ins>+ std::unique_ptr<FunctionNode> function = parse<FunctionNode>(&vm, source, executable->parameters(), executable->name(), executable->toStrictness(), JSParseFunctionCode, error, 0, bodyIncludesBraces);
</ins><span class="cx">
</span><span class="cx"> if (!function) {
</span><span class="cx"> ASSERT(error.m_type != ParserError::ErrorNone);
</span><span class="lines">@@ -64,7 +64,6 @@
</span><span class="cx"> UnlinkedFunctionCodeBlock* result = UnlinkedFunctionCodeBlock::create(&vm, FunctionCode, ExecutableInfo(function->needsActivation(), function->usesEval(), function->isStrictMode(), kind == CodeForConstruct, functionKind == UnlinkedBuiltinFunction));
</span><span class="cx"> OwnPtr<BytecodeGenerator> generator(adoptPtr(new BytecodeGenerator(vm, function.get(), result, debuggerMode, profilerMode)));
</span><span class="cx"> error = generator->generate();
</span><del>- function->destroyData();
</del><span class="cx"> if (error.m_type != ParserError::ErrorNone)
</span><span class="cx"> return 0;
</span><span class="cx"> return result;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserNodeConstructorsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/NodeConstructors.h (176824 => 176825)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/NodeConstructors.h 2014-12-05 00:55:30 UTC (rev 176824)
+++ trunk/Source/JavaScriptCore/parser/NodeConstructors.h 2014-12-05 00:59:33 UTC (rev 176825)
</span><span class="lines">@@ -37,9 +37,9 @@
</span><span class="cx"> return parserArena.allocateDeletable(size);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- inline ParserArenaRefCounted::ParserArenaRefCounted(ParserArena& parserArena)
</del><ins>+ inline ParserArenaRoot::ParserArenaRoot(ParserArena& parserArena)
</ins><span class="cx"> {
</span><del>- parserArena.derefWithArena(adoptRef(this));
</del><ins>+ m_arena.swap(parserArena);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline Node::Node(const JSTokenLocation& location)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserNodescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Nodes.cpp (176824 => 176825)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Nodes.cpp 2014-12-05 00:55:30 UTC (rev 176824)
+++ trunk/Source/JavaScriptCore/parser/Nodes.cpp 2014-12-05 00:59:33 UTC (rev 176825)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx">
</span><span class="cx"> ScopeNode::ScopeNode(ParserArena& parserArena, const JSTokenLocation& startLocation, const JSTokenLocation& endLocation, bool inStrictContext)
</span><span class="cx"> : StatementNode(endLocation)
</span><del>- , ParserArenaRefCounted(parserArena)
</del><ins>+ , ParserArenaRoot(parserArena)
</ins><span class="cx"> , m_startLineNumber(startLocation.line)
</span><span class="cx"> , m_startStartOffset(startLocation.startOffset)
</span><span class="cx"> , m_startLineStartOffset(startLocation.lineStartOffset)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx">
</span><span class="cx"> ScopeNode::ScopeNode(ParserArena& parserArena, const JSTokenLocation& startLocation, const JSTokenLocation& endLocation, const SourceCode& source, SourceElements* children, VarStack* varStack, FunctionStack* funcStack, IdentifierSet& capturedVariables, CodeFeatures features, int numConstants)
</span><span class="cx"> : StatementNode(endLocation)
</span><del>- , ParserArenaRefCounted(parserArena)
</del><ins>+ , ParserArenaRoot(parserArena)
</ins><span class="cx"> , m_startLineNumber(startLocation.line)
</span><span class="cx"> , m_startStartOffset(startLocation.startOffset)
</span><span class="cx"> , m_startLineStartOffset(startLocation.lineStartOffset)
</span><span class="lines">@@ -99,7 +99,6 @@
</span><span class="cx"> , m_numConstants(numConstants)
</span><span class="cx"> , m_statements(children)
</span><span class="cx"> {
</span><del>- m_arena.swap(parserArena);
</del><span class="cx"> if (varStack)
</span><span class="cx"> m_varStack.swap(*varStack);
</span><span class="cx"> if (funcStack)
</span><span class="lines">@@ -114,25 +113,13 @@
</span><span class="cx">
</span><span class="cx"> // ------------------------------ ProgramNode -----------------------------
</span><span class="cx">
</span><del>-inline ProgramNode::ProgramNode(ParserArena& parserArena, const JSTokenLocation& startLocation, const JSTokenLocation& endLocation, unsigned startColumn, unsigned endColumn, SourceElements* children, VarStack* varStack, FunctionStack* funcStack, IdentifierSet& capturedVariables, const SourceCode& source, CodeFeatures features, int numConstants)
</del><ins>+ProgramNode::ProgramNode(ParserArena& parserArena, const JSTokenLocation& startLocation, const JSTokenLocation& endLocation, unsigned startColumn, unsigned endColumn, SourceElements* children, VarStack* varStack, FunctionStack* funcStack, IdentifierSet& capturedVariables, const SourceCode& source, CodeFeatures features, int numConstants)
</ins><span class="cx"> : ScopeNode(parserArena, startLocation, endLocation, source, children, varStack, funcStack, capturedVariables, features, numConstants)
</span><span class="cx"> , m_startColumn(startColumn)
</span><span class="cx"> , m_endColumn(endColumn)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<ProgramNode> ProgramNode::create(ParserArena& parserArena, const JSTokenLocation& startLocation, const JSTokenLocation& endLocation, unsigned startColumn, unsigned endColumn, SourceElements* children, VarStack* varStack, FunctionStack* funcStack, IdentifierSet& capturedVariables, const SourceCode& source, CodeFeatures features, int numConstants)
-{
- RefPtr<ProgramNode> node = new ProgramNode(parserArena, startLocation, endLocation, startColumn, endColumn, children, varStack, funcStack, capturedVariables, source, features, numConstants);
-
- ASSERT(node->m_arena.last() == node);
- node->m_arena.removeLast();
- ASSERT(!node->m_arena.contains(node.get()));
-
- return node.release();
-}
-
-
</del><span class="cx"> void ProgramNode::setClosedVariables(Vector<RefPtr<StringImpl>>&& closedVariables)
</span><span class="cx"> {
</span><span class="cx"> m_closedVariables = WTF::move(closedVariables);
</span><span class="lines">@@ -140,23 +127,12 @@
</span><span class="cx">
</span><span class="cx"> // ------------------------------ EvalNode -----------------------------
</span><span class="cx">
</span><del>-inline EvalNode::EvalNode(ParserArena& parserArena, const JSTokenLocation& startLocation, const JSTokenLocation& endLocation, unsigned endColumn, SourceElements* children, VarStack* varStack, FunctionStack* funcStack, IdentifierSet& capturedVariables, const SourceCode& source, CodeFeatures features, int numConstants)
</del><ins>+EvalNode::EvalNode(ParserArena& parserArena, const JSTokenLocation& startLocation, const JSTokenLocation& endLocation, unsigned, unsigned endColumn, SourceElements* children, VarStack* varStack, FunctionStack* funcStack, IdentifierSet& capturedVariables, const SourceCode& source, CodeFeatures features, int numConstants)
</ins><span class="cx"> : ScopeNode(parserArena, startLocation, endLocation, source, children, varStack, funcStack, capturedVariables, features, numConstants)
</span><span class="cx"> , m_endColumn(endColumn)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<EvalNode> EvalNode::create(ParserArena& parserArena, const JSTokenLocation& startLocation, const JSTokenLocation& endLocation, unsigned, unsigned endColumn, SourceElements* children, VarStack* varStack, FunctionStack* funcStack, IdentifierSet& capturedVariables, const SourceCode& source, CodeFeatures features, int numConstants)
-{
- RefPtr<EvalNode> node = new EvalNode(parserArena, startLocation, endLocation, endColumn, children, varStack, funcStack, capturedVariables, source, features, numConstants);
-
- ASSERT(node->m_arena.last() == node);
- node->m_arena.removeLast();
- ASSERT(!node->m_arena.contains(node.get()));
-
- return node.release();
-}
-
</del><span class="cx"> // ------------------------------ FunctionBodyNode -----------------------------
</span><span class="cx">
</span><span class="cx"> PassRefPtr<FunctionParameters> FunctionParameters::create(ParameterNode* firstParameter)
</span><span class="lines">@@ -210,26 +186,15 @@
</span><span class="cx"> m_endColumn = position.offset - position.lineStartOffset;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// =====================
</del><ins>+// ------------------------------ FunctionNode -----------------------------
</ins><span class="cx">
</span><del>-inline FunctionNode::FunctionNode(ParserArena& parserArena, const JSTokenLocation& startLocation, const JSTokenLocation& endLocation, unsigned startColumn, unsigned endColumn, SourceElements* children, VarStack* varStack, FunctionStack* funcStack, IdentifierSet& capturedVariables, const SourceCode& sourceCode, CodeFeatures features, int numConstants)
</del><ins>+FunctionNode::FunctionNode(ParserArena& parserArena, const JSTokenLocation& startLocation, const JSTokenLocation& endLocation, unsigned startColumn, unsigned endColumn, SourceElements* children, VarStack* varStack, FunctionStack* funcStack, IdentifierSet& capturedVariables, const SourceCode& sourceCode, CodeFeatures features, int numConstants)
</ins><span class="cx"> : ScopeNode(parserArena, startLocation, endLocation, sourceCode, children, varStack, funcStack, capturedVariables, features, numConstants)
</span><span class="cx"> , m_startColumn(startColumn)
</span><span class="cx"> , m_endColumn(endColumn)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<FunctionNode> FunctionNode::create(ParserArena& parserArena, const JSTokenLocation& startLocation, const JSTokenLocation& endLocation, unsigned startColumn, unsigned endColumn, SourceElements* children, VarStack* varStack, FunctionStack* funcStack, IdentifierSet& capturedVariables, const SourceCode& sourceCode, CodeFeatures features, int numConstants)
-{
- RefPtr<FunctionNode> node = new FunctionNode(parserArena, startLocation, endLocation, startColumn, endColumn , children, varStack, funcStack, capturedVariables, sourceCode, features, numConstants);
-
- ASSERT(node->m_arena.last() == node);
- node->m_arena.removeLast();
- ASSERT(!node->m_arena.contains(node.get()));
-
- return node.release();
-}
-
</del><span class="cx"> void FunctionNode::finishParsing(PassRefPtr<FunctionParameters> parameters, const Identifier& ident, enum FunctionMode functionMode)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!source().isNull());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserNodesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Nodes.h (176824 => 176825)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Nodes.h 2014-12-05 00:55:30 UTC (rev 176824)
+++ trunk/Source/JavaScriptCore/parser/Nodes.h 2014-12-05 00:59:33 UTC (rev 176825)
</span><span class="lines">@@ -111,16 +111,17 @@
</span><span class="cx"> T data;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- class ParserArenaRefCounted : public RefCounted<ParserArenaRefCounted> {
</del><ins>+ class ParserArenaRoot {
</ins><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> protected:
</span><del>- ParserArenaRefCounted(ParserArena&);
</del><ins>+ ParserArenaRoot(ParserArena&);
</ins><span class="cx">
</span><span class="cx"> public:
</span><del>- virtual ~ParserArenaRefCounted()
- {
- ASSERT(deletionHasBegun());
- }
</del><ins>+ ParserArena& parserArena() { return m_arena; }
+ virtual ~ParserArenaRoot() { }
+
+ protected:
+ ParserArena m_arena;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class Node : public ParserArenaFreeable {
</span><span class="lines">@@ -1404,7 +1405,7 @@
</span><span class="cx"> ParameterNode* m_next;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- class ScopeNode : public StatementNode, public ParserArenaRefCounted {
</del><ins>+ class ScopeNode : public StatementNode, public ParserArenaRoot {
</ins><span class="cx"> public:
</span><span class="cx"> typedef DeclarationStacks::VarStack VarStack;
</span><span class="cx"> typedef DeclarationStacks::FunctionStack FunctionStack;
</span><span class="lines">@@ -1412,18 +1413,8 @@
</span><span class="cx"> ScopeNode(ParserArena&, const JSTokenLocation& start, const JSTokenLocation& end, bool inStrictContext);
</span><span class="cx"> ScopeNode(ParserArena&, const JSTokenLocation& start, const JSTokenLocation& end, const SourceCode&, SourceElements*, VarStack*, FunctionStack*, IdentifierSet&, CodeFeatures, int numConstants);
</span><span class="cx">
</span><del>- using ParserArenaRefCounted::operator new;
</del><ins>+ using ParserArenaRoot::operator new;
</ins><span class="cx">
</span><del>- void destroyData()
- {
- m_arena.reset();
- m_varStack.clear();
- m_functionStack.clear();
- m_statements = 0;
- m_capturedVariables.clear();
- }
-
- ParserArena& parserArena() { return m_arena; }
</del><span class="cx"> const SourceCode& source() const { return m_source; }
</span><span class="cx"> const String& sourceURL() const { return m_source.provider()->url(); }
</span><span class="cx"> intptr_t sourceID() const { return m_source.providerID(); }
</span><span class="lines">@@ -1466,8 +1457,6 @@
</span><span class="cx"> void setClosedVariables(Vector<RefPtr<StringImpl>>&&) { }
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- ParserArena m_arena;
-
</del><span class="cx"> int m_startLineNumber;
</span><span class="cx"> unsigned m_startStartOffset;
</span><span class="cx"> unsigned m_startLineStartOffset;
</span><span class="lines">@@ -1484,7 +1473,7 @@
</span><span class="cx">
</span><span class="cx"> class ProgramNode : public ScopeNode {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<ProgramNode> create(ParserArena&, const JSTokenLocation& start, const JSTokenLocation& end, unsigned startColumn, unsigned endColumn, SourceElements*, VarStack*, FunctionStack*, IdentifierSet&, const SourceCode&, CodeFeatures, int numConstants);
</del><ins>+ ProgramNode(ParserArena&, const JSTokenLocation& start, const JSTokenLocation& end, unsigned startColumn, unsigned endColumn, SourceElements*, VarStack*, FunctionStack*, IdentifierSet&, const SourceCode&, CodeFeatures, int numConstants);
</ins><span class="cx">
</span><span class="cx"> unsigned startColumn() const { return m_startColumn; }
</span><span class="cx"> unsigned endColumn() const { return m_endColumn; }
</span><span class="lines">@@ -1493,9 +1482,8 @@
</span><span class="cx">
</span><span class="cx"> void setClosedVariables(Vector<RefPtr<StringImpl>>&&);
</span><span class="cx"> const Vector<RefPtr<StringImpl>>& closedVariables() const { return m_closedVariables; }
</span><del>- private:
- ProgramNode(ParserArena&, const JSTokenLocation& start, const JSTokenLocation& end, unsigned startColumn, unsigned endColumn, SourceElements*, VarStack*, FunctionStack*, IdentifierSet&, const SourceCode&, CodeFeatures, int numConstants);
</del><span class="cx">
</span><ins>+ private:
</ins><span class="cx"> virtual void emitBytecode(BytecodeGenerator&, RegisterID* = 0) override;
</span><span class="cx"> Vector<RefPtr<StringImpl>> m_closedVariables;
</span><span class="cx"> unsigned m_startColumn;
</span><span class="lines">@@ -1504,7 +1492,7 @@
</span><span class="cx">
</span><span class="cx"> class EvalNode : public ScopeNode {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<EvalNode> create(ParserArena&, const JSTokenLocation& start, const JSTokenLocation& end, unsigned, unsigned endColumn, SourceElements*, VarStack*, FunctionStack*, IdentifierSet&, const SourceCode&, CodeFeatures, int numConstants);
</del><ins>+ EvalNode(ParserArena&, const JSTokenLocation& start, const JSTokenLocation& end, unsigned startColumn, unsigned endColumn, SourceElements*, VarStack*, FunctionStack*, IdentifierSet&, const SourceCode&, CodeFeatures, int numConstants);
</ins><span class="cx">
</span><span class="cx"> ALWAYS_INLINE unsigned startColumn() const { return 0; }
</span><span class="cx"> unsigned endColumn() const { return m_endColumn; }
</span><span class="lines">@@ -1512,8 +1500,6 @@
</span><span class="cx"> static const bool scopeIsFunction = false;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- EvalNode(ParserArena&, const JSTokenLocation& start, const JSTokenLocation& end, unsigned endColumn, SourceElements*, VarStack*, FunctionStack*, IdentifierSet&, const SourceCode&, CodeFeatures, int numConstants);
-
</del><span class="cx"> virtual void emitBytecode(BytecodeGenerator&, RegisterID* = 0) override;
</span><span class="cx">
</span><span class="cx"> unsigned m_endColumn;
</span><span class="lines">@@ -1584,7 +1570,7 @@
</span><span class="cx">
</span><span class="cx"> class FunctionNode final : public ScopeNode {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<FunctionNode> create(ParserArena&, const JSTokenLocation& start, const JSTokenLocation& end, unsigned startColumn, unsigned endColumn, SourceElements*, VarStack*, FunctionStack*, IdentifierSet&, const SourceCode&, CodeFeatures, int numConstants);
</del><ins>+ FunctionNode(ParserArena&, const JSTokenLocation& start, const JSTokenLocation& end, unsigned startColumn, unsigned endColumn, SourceElements*, VarStack*, FunctionStack*, IdentifierSet&, const SourceCode&, CodeFeatures, int numConstants);
</ins><span class="cx">
</span><span class="cx"> FunctionParameters* parameters() const { return m_parameters.get(); }
</span><span class="cx">
</span><span class="lines">@@ -1602,8 +1588,6 @@
</span><span class="cx"> static const bool scopeIsFunction = true;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- FunctionNode(ParserArena&, const JSTokenLocation& start, const JSTokenLocation& end, unsigned startColumn, unsigned endColumn, SourceElements*, VarStack*, FunctionStack*, IdentifierSet&, const SourceCode&, CodeFeatures, int numConstants);
-
</del><span class="cx"> Identifier m_ident;
</span><span class="cx"> FunctionMode m_functionMode;
</span><span class="cx"> RefPtr<FunctionParameters> m_parameters;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Parser.h (176824 => 176825)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Parser.h 2014-12-05 00:55:30 UTC (rev 176824)
+++ trunk/Source/JavaScriptCore/parser/Parser.h 2014-12-05 00:59:33 UTC (rev 176825)
</span><span class="lines">@@ -402,7 +402,7 @@
</span><span class="cx"> ~Parser();
</span><span class="cx">
</span><span class="cx"> template <class ParsedNode>
</span><del>- PassRefPtr<ParsedNode> parse(ParserError&, bool needReparsingAdjustment);
</del><ins>+ std::unique_ptr<ParsedNode> parse(ParserError&, bool needReparsingAdjustment);
</ins><span class="cx">
</span><span class="cx"> JSTextPosition positionBeforeLastNewline() const { return m_lexer->positionBeforeLastNewline(); }
</span><span class="cx"> Vector<RefPtr<StringImpl>>&& closedVariables() { return WTF::move(m_closedVariables); }
</span><span class="lines">@@ -861,7 +861,7 @@
</span><span class="cx">
</span><span class="cx"> template <typename LexerType>
</span><span class="cx"> template <class ParsedNode>
</span><del>-PassRefPtr<ParsedNode> Parser<LexerType>::parse(ParserError& error, bool needReparsingAdjustment)
</del><ins>+std::unique_ptr<ParsedNode> Parser<LexerType>::parse(ParserError& error, bool needReparsingAdjustment)
</ins><span class="cx"> {
</span><span class="cx"> int errLine;
</span><span class="cx"> String errMsg;
</span><span class="lines">@@ -892,14 +892,14 @@
</span><span class="cx"> m_sourceElements = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<ParsedNode> result;
</del><ins>+ std::unique_ptr<ParsedNode> result;
</ins><span class="cx"> if (m_sourceElements) {
</span><span class="cx"> JSTokenLocation endLocation;
</span><span class="cx"> endLocation.line = m_lexer->lineNumber();
</span><span class="cx"> endLocation.lineStartOffset = m_lexer->currentLineStartOffset();
</span><span class="cx"> endLocation.startOffset = m_lexer->currentOffset();
</span><span class="cx"> unsigned endColumn = endLocation.startOffset - endLocation.lineStartOffset;
</span><del>- result = ParsedNode::create(m_parserArena,
</del><ins>+ result = std::make_unique<ParsedNode>(m_parserArena,
</ins><span class="cx"> startLocation,
</span><span class="cx"> endLocation,
</span><span class="cx"> startColumn,
</span><span class="lines">@@ -936,18 +936,18 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return result.release();
</del><ins>+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <class ParsedNode>
</span><del>-PassRefPtr<ParsedNode> parse(VM* vm, const SourceCode& source, FunctionParameters* parameters, const Identifier& name, JSParserStrictness strictness, JSParserMode parserMode, ParserError& error, JSTextPosition* positionBeforeLastNewline = 0, bool needReparsingAdjustment = false)
</del><ins>+std::unique_ptr<ParsedNode> parse(VM* vm, const SourceCode& source, FunctionParameters* parameters, const Identifier& name, JSParserStrictness strictness, JSParserMode parserMode, ParserError& error, JSTextPosition* positionBeforeLastNewline = 0, bool needReparsingAdjustment = false)
</ins><span class="cx"> {
</span><span class="cx"> SamplingRegion samplingRegion("Parsing");
</span><span class="cx">
</span><span class="cx"> ASSERT(!source.provider()->source().isNull());
</span><span class="cx"> if (source.provider()->source().is8Bit()) {
</span><span class="cx"> Parser<Lexer<LChar>> parser(vm, source, parameters, name, strictness, parserMode);
</span><del>- RefPtr<ParsedNode> result = parser.parse<ParsedNode>(error, needReparsingAdjustment);
</del><ins>+ std::unique_ptr<ParsedNode> result = parser.parse<ParsedNode>(error, needReparsingAdjustment);
</ins><span class="cx"> if (positionBeforeLastNewline)
</span><span class="cx"> *positionBeforeLastNewline = parser.positionBeforeLastNewline();
</span><span class="cx"> if (strictness == JSParseBuiltin) {
</span><span class="lines">@@ -956,13 +956,13 @@
</span><span class="cx"> RELEASE_ASSERT(result);
</span><span class="cx"> result->setClosedVariables(parser.closedVariables());
</span><span class="cx"> }
</span><del>- return result.release();
</del><ins>+ return result;
</ins><span class="cx"> }
</span><span class="cx"> Parser<Lexer<UChar>> parser(vm, source, parameters, name, strictness, parserMode);
</span><del>- RefPtr<ParsedNode> result = parser.parse<ParsedNode>(error, needReparsingAdjustment);
</del><ins>+ std::unique_ptr<ParsedNode> result = parser.parse<ParsedNode>(error, needReparsingAdjustment);
</ins><span class="cx"> if (positionBeforeLastNewline)
</span><span class="cx"> *positionBeforeLastNewline = parser.positionBeforeLastNewline();
</span><del>- return result.release();
</del><ins>+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParserArenacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/ParserArena.cpp (176824 => 176825)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/ParserArena.cpp 2014-12-05 00:55:30 UTC (rev 176824)
+++ trunk/Source/JavaScriptCore/parser/ParserArena.cpp 2014-12-05 00:59:33 UTC (rev 176825)
</span><span class="lines">@@ -63,21 +63,6 @@
</span><span class="cx"> deallocateObjects();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ParserArena::contains(ParserArenaRefCounted* object) const
-{
- return m_refCountedObjects.find(object) != notFound;
-}
-
-ParserArenaRefCounted* ParserArena::last() const
-{
- return m_refCountedObjects.last().get();
-}
-
-void ParserArena::removeLast()
-{
- m_refCountedObjects.removeLast();
-}
-
</del><span class="cx"> void ParserArena::reset()
</span><span class="cx"> {
</span><span class="cx"> // Since this code path is used only when parsing fails, it's not bothering to reuse
</span><span class="lines">@@ -92,7 +77,6 @@
</span><span class="cx"> m_identifierArena->clear();
</span><span class="cx"> m_freeablePools.clear();
</span><span class="cx"> m_deletableObjects.clear();
</span><del>- m_refCountedObjects.clear();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ParserArena::allocateFreeablePool()
</span><span class="lines">@@ -106,18 +90,4 @@
</span><span class="cx"> ASSERT(freeablePool() == pool);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ParserArena::isEmpty() const
-{
- return !m_freeablePoolEnd
- && (!m_identifierArena || m_identifierArena->isEmpty())
- && m_freeablePools.isEmpty()
- && m_deletableObjects.isEmpty()
- && m_refCountedObjects.isEmpty();
</del><span class="cx"> }
</span><del>-
-void ParserArena::derefWithArena(PassRefPtr<ParserArenaRefCounted> object)
-{
- m_refCountedObjects.append(object);
-}
-
-}
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParserArenah"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/ParserArena.h (176824 => 176825)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/ParserArena.h 2014-12-05 00:55:30 UTC (rev 176824)
+++ trunk/Source/JavaScriptCore/parser/ParserArena.h 2014-12-05 00:59:33 UTC (rev 176825)
</span><span class="lines">@@ -33,7 +33,6 @@
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="cx"> class ParserArenaDeletable;
</span><del>- class ParserArenaRefCounted;
</del><span class="cx">
</span><span class="cx"> class IdentifierArena {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="lines">@@ -49,8 +48,6 @@
</span><span class="cx">
</span><span class="cx"> const Identifier& makeNumericIdentifier(VM*, double number);
</span><span class="cx">
</span><del>- bool isEmpty() const { return m_identifiers.isEmpty(); }
-
</del><span class="cx"> public:
</span><span class="cx"> static const int MaximumCachableCharacter = 128;
</span><span class="cx"> typedef SegmentedVector<Identifier, 64> IdentifierVector;
</span><span class="lines">@@ -131,7 +128,6 @@
</span><span class="cx"> m_identifierArena.swap(otherArena.m_identifierArena);
</span><span class="cx"> m_freeablePools.swap(otherArena.m_freeablePools);
</span><span class="cx"> m_deletableObjects.swap(otherArena.m_deletableObjects);
</span><del>- m_refCountedObjects.swap(otherArena.m_refCountedObjects);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void* allocateFreeable(size_t size)
</span><span class="lines">@@ -154,12 +150,6 @@
</span><span class="cx"> return deletable;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void derefWithArena(PassRefPtr<ParserArenaRefCounted>);
- bool contains(ParserArenaRefCounted*) const;
- ParserArenaRefCounted* last() const;
- void removeLast();
-
- bool isEmpty() const;
</del><span class="cx"> JS_EXPORT_PRIVATE void reset();
</span><span class="cx">
</span><span class="cx"> IdentifierArena& identifierArena()
</span><span class="lines">@@ -187,7 +177,6 @@
</span><span class="cx"> OwnPtr<IdentifierArena> m_identifierArena;
</span><span class="cx"> Vector<void*> m_freeablePools;
</span><span class="cx"> Vector<ParserArenaDeletable*> m_deletableObjects;
</span><del>- Vector<RefPtr<ParserArenaRefCounted>> m_refCountedObjects;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCodeCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/CodeCache.cpp (176824 => 176825)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/CodeCache.cpp 2014-12-05 00:55:30 UTC (rev 176824)
+++ trunk/Source/JavaScriptCore/runtime/CodeCache.cpp 2014-12-05 00:59:33 UTC (rev 176825)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> typedef typename CacheTypes<UnlinkedCodeBlockType>::RootNode RootNode;
</span><del>- RefPtr<RootNode> rootNode = parse<RootNode>(&vm, source, 0, Identifier(), strictness, JSParseProgramCode, error);
</del><ins>+ std::unique_ptr<RootNode> rootNode = parse<RootNode>(&vm, source, 0, Identifier(), strictness, JSParseProgramCode, error);
</ins><span class="cx"> if (!rootNode) {
</span><span class="cx"> m_sourceCode.remove(addResult.iterator);
</span><span class="cx"> return 0;
</span><span class="lines">@@ -109,7 +109,6 @@
</span><span class="cx">
</span><span class="cx"> auto generator = std::make_unique<BytecodeGenerator>(vm, rootNode.get(), unlinkedCodeBlock, debuggerMode, profilerMode);
</span><span class="cx"> error = generator->generate();
</span><del>- rootNode->destroyData();
</del><span class="cx"> if (error.m_type != ParserError::ErrorNone) {
</span><span class="cx"> m_sourceCode.remove(addResult.iterator);
</span><span class="cx"> return 0;
</span><span class="lines">@@ -142,7 +141,7 @@
</span><span class="cx"> return jsCast<UnlinkedFunctionExecutable*>(addResult.iterator->value.cell.get());
</span><span class="cx">
</span><span class="cx"> JSTextPosition positionBeforeLastNewline;
</span><del>- RefPtr<ProgramNode> program = parse<ProgramNode>(&vm, source, 0, Identifier(), JSParseNormal, JSParseProgramCode, error, &positionBeforeLastNewline);
</del><ins>+ std::unique_ptr<ProgramNode> program = parse<ProgramNode>(&vm, source, 0, Identifier(), JSParseNormal, JSParseProgramCode, error, &positionBeforeLastNewline);
</ins><span class="cx"> if (!program) {
</span><span class="cx"> RELEASE_ASSERT(error.m_type != ParserError::ErrorNone);
</span><span class="cx"> m_sourceCode.remove(addResult.iterator);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCompletioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Completion.cpp (176824 => 176825)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Completion.cpp 2014-12-05 00:55:30 UTC (rev 176824)
+++ trunk/Source/JavaScriptCore/runtime/Completion.cpp 2014-12-05 00:59:33 UTC (rev 176825)
</span><span class="lines">@@ -55,8 +55,7 @@
</span><span class="cx"> {
</span><span class="cx"> JSLockHolder lock(vm);
</span><span class="cx"> RELEASE_ASSERT(vm.atomicStringTable() == wtfThreadData().atomicStringTable());
</span><del>- RefPtr<ProgramNode> programNode = parse<ProgramNode>(&vm, source, 0, Identifier(), JSParseNormal, JSParseProgramCode, error);
- return programNode;
</del><ins>+ return !!parse<ProgramNode>(&vm, source, 0, Identifier(), JSParseNormal, JSParseProgramCode, error);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue evaluate(ExecState* exec, const SourceCode& source, JSValue thisValue, JSValue* returnedException)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeExecutablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Executable.cpp (176824 => 176825)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Executable.cpp 2014-12-05 00:55:30 UTC (rev 176824)
+++ trunk/Source/JavaScriptCore/runtime/Executable.cpp 2014-12-05 00:59:33 UTC (rev 176825)
</span><span class="lines">@@ -461,7 +461,7 @@
</span><span class="cx"> ParserError error;
</span><span class="cx"> VM* vm = &exec->vm();
</span><span class="cx"> JSGlobalObject* lexicalGlobalObject = exec->lexicalGlobalObject();
</span><del>- RefPtr<ProgramNode> programNode = parse<ProgramNode>(vm, m_source, 0, Identifier(), JSParseNormal, JSParseProgramCode, error);
</del><ins>+ std::unique_ptr<ProgramNode> programNode = parse<ProgramNode>(vm, m_source, 0, Identifier(), JSParseNormal, JSParseProgramCode, error);
</ins><span class="cx"> if (programNode)
</span><span class="cx"> return 0;
</span><span class="cx"> ASSERT(error.m_type != ParserError::ErrorNone);
</span></span></pre>
</div>
</div>
</body>
</html>