<!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>[187111] 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/187111">187111</a></dd>
<dt>Author</dt> <dd>saambarati1@gmail.com</dd>
<dt>Date</dt> <dd>2015-07-21 12:18:47 -0700 (Tue, 21 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>DestructuringPatternNode and DestructuringAssignmentNode should be ParserArenaFreeable
https://bugs.webkit.org/show_bug.cgi?id=147140
Reviewed by Geoffrey Garen.
The descendants of DestructuringPatternNode that need destruction also
inherit from ParserArenaDeletable.
* parser/Nodes.h:
(JSC::DestructuringPatternNode::~DestructuringPatternNode):
(JSC::ObjectPatternNode::appendEntry):
(JSC::DestructuringAssignmentNode::bindings):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserNodesh">trunk/Source/JavaScriptCore/parser/Nodes.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserParsercpp">trunk/Source/JavaScriptCore/parser/Parser.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (187110 => 187111)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-07-21 18:43:46 UTC (rev 187110)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-07-21 19:18:47 UTC (rev 187111)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-07-21 Saam barati <saambarati1@gmail.com>
+
+ DestructuringPatternNode and DestructuringAssignmentNode should be ParserArenaFreeable
+ https://bugs.webkit.org/show_bug.cgi?id=147140
+
+ Reviewed by Geoffrey Garen.
+
+ The descendants of DestructuringPatternNode that need destruction also
+ inherit from ParserArenaDeletable.
+
+ * parser/Nodes.h:
+ (JSC::DestructuringPatternNode::~DestructuringPatternNode):
+ (JSC::ObjectPatternNode::appendEntry):
+ (JSC::DestructuringAssignmentNode::bindings):
+
</ins><span class="cx"> 2015-07-21 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><span class="cx"> Add support for the new.target syntax.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserNodesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Nodes.h (187110 => 187111)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Nodes.h 2015-07-21 18:43:46 UTC (rev 187110)
+++ trunk/Source/JavaScriptCore/parser/Nodes.h 2015-07-21 19:18:47 UTC (rev 187111)
</span><span class="lines">@@ -1747,7 +1747,7 @@
</span><span class="cx"> };
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- class DestructuringPatternNode : public ParserArenaDeletable {
</del><ins>+ class DestructuringPatternNode : public ParserArenaFreeable {
</ins><span class="cx"> public:
</span><span class="cx"> virtual ~DestructuringPatternNode() { }
</span><span class="cx"> virtual void collectBoundIdentifiers(Vector<Identifier>&) const = 0;
</span><span class="lines">@@ -1761,8 +1761,10 @@
</span><span class="cx"> DestructuringPatternNode();
</span><span class="cx"> };
</span><span class="cx">
</span><del>- class ArrayPatternNode : public DestructuringPatternNode, public ThrowableExpressionData {
</del><ins>+ class ArrayPatternNode : public DestructuringPatternNode, public ThrowableExpressionData, public ParserArenaDeletable {
</ins><span class="cx"> public:
</span><ins>+ using ParserArenaDeletable::operator new;
+
</ins><span class="cx"> ArrayPatternNode();
</span><span class="cx"> enum class BindingType {
</span><span class="cx"> Elision,
</span><span class="lines">@@ -1789,14 +1791,16 @@
</span><span class="cx"> Vector<Entry> m_targetPatterns;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- class ObjectPatternNode : public DestructuringPatternNode {
</del><ins>+ class ObjectPatternNode : public DestructuringPatternNode, public ParserArenaDeletable {
</ins><span class="cx"> public:
</span><ins>+ using ParserArenaDeletable::operator new;
+
</ins><span class="cx"> ObjectPatternNode();
</span><span class="cx"> void appendEntry(const JSTokenLocation&, const Identifier& identifier, bool wasString, DestructuringPatternNode* pattern, ExpressionNode* defaultValue)
</span><span class="cx"> {
</span><span class="cx"> m_targetPatterns.append(Entry{ identifier, wasString, pattern, defaultValue });
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> private:
</span><span class="cx"> virtual void collectBoundIdentifiers(Vector<Identifier>&) const override;
</span><span class="cx"> virtual void bindValue(BytecodeGenerator&, RegisterID*) const override;
</span><span class="lines">@@ -1827,17 +1831,15 @@
</span><span class="cx">
</span><span class="cx"> JSTextPosition m_divotStart;
</span><span class="cx"> JSTextPosition m_divotEnd;
</span><del>- Identifier m_boundProperty;
</del><ins>+ const Identifier& m_boundProperty;
</ins><span class="cx"> AssignmentContext m_bindingContext;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- class DestructuringAssignmentNode : public ExpressionNode, public ParserArenaDeletable {
</del><ins>+ class DestructuringAssignmentNode : public ExpressionNode {
</ins><span class="cx"> public:
</span><span class="cx"> DestructuringAssignmentNode(const JSTokenLocation&, DestructuringPatternNode*, ExpressionNode*);
</span><span class="cx"> DestructuringPatternNode* bindings() { return m_bindings; }
</span><span class="cx">
</span><del>- using ParserArenaDeletable::operator new;
-
</del><span class="cx"> private:
</span><span class="cx"> virtual bool isAssignmentLocation() const override { return true; }
</span><span class="cx"> virtual bool isDestructuringNode() const override { return true; }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Parser.cpp (187110 => 187111)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Parser.cpp 2015-07-21 18:43:46 UTC (rev 187110)
+++ trunk/Source/JavaScriptCore/parser/Parser.cpp 2015-07-21 19:18:47 UTC (rev 187111)
</span><span class="lines">@@ -763,27 +763,27 @@
</span><span class="cx"> if (match(CLOSEBRACE))
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- Identifier propertyName;
</del><ins>+ const Identifier* propertyName = nullptr;
</ins><span class="cx"> TreeDestructuringPattern innerPattern = 0;
</span><span class="cx"> JSTokenLocation location = m_token.m_location;
</span><span class="cx"> if (match(IDENT) || isLETMaskedAsIDENT()) {
</span><span class="cx"> failIfTrue(match(LET) && (kind == DestructureToLet || kind == DestructureToConst), "Can't use 'let' as an identifier name for a LexicalDeclaration");
</span><del>- propertyName = *m_token.m_data.ident;
</del><ins>+ propertyName = m_token.m_data.ident;
</ins><span class="cx"> JSToken identifierToken = m_token;
</span><span class="cx"> next();
</span><span class="cx"> if (consume(COLON))
</span><span class="cx"> innerPattern = parseDestructuringPattern(context, kind, bindingContext, depth + 1);
</span><span class="cx"> else
</span><del>- innerPattern = createBindingPattern(context, kind, propertyName, depth, identifierToken, bindingContext);
</del><ins>+ innerPattern = createBindingPattern(context, kind, *propertyName, depth, identifierToken, bindingContext);
</ins><span class="cx"> } else {
</span><span class="cx"> JSTokenType tokenType = m_token.m_type;
</span><span class="cx"> switch (m_token.m_type) {
</span><span class="cx"> case DOUBLE:
</span><span class="cx"> case INTEGER:
</span><del>- propertyName = Identifier::from(m_vm, m_token.m_data.doubleValue);
</del><ins>+ propertyName = &m_parserArena.identifierArena().makeNumericIdentifier(const_cast<VM*>(m_vm), m_token.m_data.doubleValue);
</ins><span class="cx"> break;
</span><span class="cx"> case STRING:
</span><del>- propertyName = *m_token.m_data.ident;
</del><ins>+ propertyName = m_token.m_data.ident;
</ins><span class="cx"> wasString = true;
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="lines">@@ -792,16 +792,16 @@
</span><span class="cx"> return 0;
</span><span class="cx"> failWithMessage("Expected a property name");
</span><span class="cx"> }
</span><del>- propertyName = *m_token.m_data.ident;
</del><ins>+ propertyName = m_token.m_data.ident;
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> next();
</span><span class="cx"> if (!consume(COLON)) {
</span><span class="cx"> if (kind == DestructureToExpressions)
</span><span class="cx"> return 0;
</span><del>- semanticFailIfTrue(tokenType == RESERVED, "Cannot use abbreviated destructuring syntax for reserved name '", propertyName.impl(), "'");
- semanticFailIfTrue(tokenType == RESERVED_IF_STRICT, "Cannot use abbreviated destructuring syntax for reserved name '", propertyName.impl(), "' in strict mode");
- semanticFailIfTrue(tokenType & KeywordTokenFlag, "Cannot use abbreviated destructuring syntax for keyword '", propertyName.impl(), "'");
</del><ins>+ semanticFailIfTrue(tokenType == RESERVED, "Cannot use abbreviated destructuring syntax for reserved name '", propertyName->impl(), "'");
+ semanticFailIfTrue(tokenType == RESERVED_IF_STRICT, "Cannot use abbreviated destructuring syntax for reserved name '", propertyName->impl(), "' in strict mode");
+ semanticFailIfTrue(tokenType & KeywordTokenFlag, "Cannot use abbreviated destructuring syntax for keyword '", propertyName->impl(), "'");
</ins><span class="cx">
</span><span class="cx"> failWithMessage("Expected a ':' prior to a named destructuring property");
</span><span class="cx"> }
</span><span class="lines">@@ -812,7 +812,8 @@
</span><span class="cx"> failIfFalse(innerPattern, "Cannot parse this destructuring pattern");
</span><span class="cx"> TreeExpression defaultValue = parseDefaultValueForDestructuringPattern(context);
</span><span class="cx"> failIfTrue(kind == DestructureToParameters && defaultValue, "Default values in destructuring parameters are currently not supported");
</span><del>- context.appendObjectPatternEntry(objectPattern, location, wasString, propertyName, innerPattern, defaultValue);
</del><ins>+ ASSERT(propertyName);
+ context.appendObjectPatternEntry(objectPattern, location, wasString, *propertyName, innerPattern, defaultValue);
</ins><span class="cx"> } while (consume(COMMA));
</span><span class="cx">
</span><span class="cx"> if (kind == DestructureToExpressions && !match(CLOSEBRACE))
</span></span></pre>
</div>
</div>
</body>
</html>