<!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>[190014] 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/190014">190014</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2015-09-19 08:36:46 -0700 (Sat, 19 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>VariableEnvironmentNode should inherit from ParserArenaDeletable because VariableEnvironment's must have their destructors run
https://bugs.webkit.org/show_bug.cgi?id=149359
Reviewed by Andreas Kling.
VariableEnvironment must have its destructor run.
Therefore, VariableEnvironmentNode should inherit from ParserArenaDeletable.
Also, anything that inherits from VariableEnvironmentNode must use
ParserArenaDeletable's operator new. Also, any other nodes that own
a VariableEnvironment must also have their destructors run.
* parser/Nodes.h:
(JSC::VariableEnvironmentNode::VariableEnvironmentNode):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerNodesCodegencpp">trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserNodeConstructorsh">trunk/Source/JavaScriptCore/parser/NodeConstructors.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserNodesh">trunk/Source/JavaScriptCore/parser/Nodes.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (190013 => 190014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-09-19 09:59:47 UTC (rev 190013)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-09-19 15:36:46 UTC (rev 190014)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-09-19 Saam barati <sbarati@apple.com>
+
+ VariableEnvironmentNode should inherit from ParserArenaDeletable because VariableEnvironment's must have their destructors run
+ https://bugs.webkit.org/show_bug.cgi?id=149359
+
+ Reviewed by Andreas Kling.
+
+ VariableEnvironment must have its destructor run.
+ Therefore, VariableEnvironmentNode should inherit from ParserArenaDeletable.
+ Also, anything that inherits from VariableEnvironmentNode must use
+ ParserArenaDeletable's operator new. Also, any other nodes that own
+ a VariableEnvironment must also have their destructors run.
+
+ * parser/Nodes.h:
+ (JSC::VariableEnvironmentNode::VariableEnvironmentNode):
+
</ins><span class="cx"> 2015-09-18 Sukolsak Sakshuwong <sukolsak@gmail.com>
</span><span class="cx">
</span><span class="cx"> Remove duplicate code in the WebAssembly parser
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerNodesCodegencpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp (190013 => 190014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 2015-09-19 09:59:47 UTC (rev 190013)
+++ trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 2015-09-19 15:36:46 UTC (rev 190014)
</span><span class="lines">@@ -2850,13 +2850,13 @@
</span><span class="cx"> tryData = generator.pushTry(here.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- generator.emitPushCatchScope(m_thrownValueIdent, thrownValueRegister.get(), m_catchEnvironment);
</del><ins>+ generator.emitPushCatchScope(m_thrownValueIdent, thrownValueRegister.get(), m_lexicalVariables);
</ins><span class="cx"> generator.emitProfileControlFlow(m_tryBlock->endOffset() + 1);
</span><span class="cx"> if (m_finallyBlock)
</span><span class="cx"> generator.emitNode(dst, m_catchBlock);
</span><span class="cx"> else
</span><span class="cx"> generator.emitNodeInTailPosition(dst, m_catchBlock);
</span><del>- generator.emitPopCatchScope(m_catchEnvironment);
</del><ins>+ generator.emitPopCatchScope(m_lexicalVariables);
</ins><span class="cx"> generator.emitLabel(catchEndLabel.get());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserNodeConstructorsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/NodeConstructors.h (190013 => 190014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/NodeConstructors.h 2015-09-19 09:59:47 UTC (rev 190013)
+++ trunk/Source/JavaScriptCore/parser/NodeConstructors.h 2015-09-19 15:36:46 UTC (rev 190014)
</span><span class="lines">@@ -878,12 +878,12 @@
</span><span class="cx">
</span><span class="cx"> inline TryNode::TryNode(const JSTokenLocation& location, StatementNode* tryBlock, const Identifier& thrownValueIdent, StatementNode* catchBlock, VariableEnvironment& catchEnvironment, StatementNode* finallyBlock)
</span><span class="cx"> : StatementNode(location)
</span><ins>+ , VariableEnvironmentNode(catchEnvironment)
</ins><span class="cx"> , m_tryBlock(tryBlock)
</span><span class="cx"> , m_thrownValueIdent(thrownValueIdent)
</span><span class="cx"> , m_catchBlock(catchBlock)
</span><span class="cx"> , m_finallyBlock(finallyBlock)
</span><span class="cx"> {
</span><del>- m_catchEnvironment.swap(catchEnvironment);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline FunctionParameters::FunctionParameters()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserNodesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Nodes.h (190013 => 190014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Nodes.h 2015-09-19 09:59:47 UTC (rev 190013)
+++ trunk/Source/JavaScriptCore/parser/Nodes.h 2015-09-19 15:36:46 UTC (rev 190014)
</span><span class="lines">@@ -209,7 +209,7 @@
</span><span class="cx"> int m_lastLine;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- class VariableEnvironmentNode {
</del><ins>+ class VariableEnvironmentNode : public ParserArenaDeletable {
</ins><span class="cx"> public:
</span><span class="cx"> VariableEnvironmentNode()
</span><span class="cx"> {
</span><span class="lines">@@ -1286,6 +1286,8 @@
</span><span class="cx">
</span><span class="cx"> class BlockNode : public StatementNode, public VariableEnvironmentNode {
</span><span class="cx"> public:
</span><ins>+ using ParserArenaDeletable::operator new;
+
</ins><span class="cx"> BlockNode(const JSTokenLocation&, SourceElements*, VariableEnvironment&);
</span><span class="cx">
</span><span class="cx"> StatementNode* singleStatement() const;
</span><span class="lines">@@ -1398,6 +1400,8 @@
</span><span class="cx">
</span><span class="cx"> class ForNode : public StatementNode, public VariableEnvironmentNode {
</span><span class="cx"> public:
</span><ins>+ using ParserArenaDeletable::operator new;
+
</ins><span class="cx"> ForNode(const JSTokenLocation&, ExpressionNode* expr1, ExpressionNode* expr2, ExpressionNode* expr3, StatementNode*, VariableEnvironment&);
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -1413,6 +1417,8 @@
</span><span class="cx">
</span><span class="cx"> class EnumerationNode : public StatementNode, public ThrowableExpressionData, public VariableEnvironmentNode {
</span><span class="cx"> public:
</span><ins>+ using ParserArenaDeletable::operator new;
+
</ins><span class="cx"> EnumerationNode(const JSTokenLocation&, ExpressionNode*, ExpressionNode*, StatementNode*, VariableEnvironment&);
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="lines">@@ -1513,8 +1519,10 @@
</span><span class="cx"> ExpressionNode* m_expr;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- class TryNode : public StatementNode {
</del><ins>+ class TryNode : public StatementNode, public VariableEnvironmentNode {
</ins><span class="cx"> public:
</span><ins>+ using ParserArenaDeletable::operator new;
+
</ins><span class="cx"> TryNode(const JSTokenLocation&, StatementNode* tryBlock, const Identifier& exceptionIdent, StatementNode* catchBlock, VariableEnvironment& catchEnvironment, StatementNode* finallyBlock);
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -1524,7 +1532,6 @@
</span><span class="cx"> const Identifier& m_thrownValueIdent;
</span><span class="cx"> StatementNode* m_catchBlock;
</span><span class="cx"> StatementNode* m_finallyBlock;
</span><del>- VariableEnvironment m_catchEnvironment;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class ScopeNode : public StatementNode, public ParserArenaRoot, public VariableEnvironmentNode {
</span><span class="lines">@@ -2112,6 +2119,8 @@
</span><span class="cx">
</span><span class="cx"> class SwitchNode : public StatementNode, public VariableEnvironmentNode {
</span><span class="cx"> public:
</span><ins>+ using ParserArenaDeletable::operator new;
+
</ins><span class="cx"> SwitchNode(const JSTokenLocation&, ExpressionNode*, CaseBlockNode*, VariableEnvironment&);
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre>
</div>
</div>
</body>
</html>