[prev in list] [next in list] [prev in thread] [next in thread]
List: webkit-changes
Subject: [webkit-changes] [74374] trunk/JavaScriptCore
From: barraclough () apple ! com
Date: 2010-12-20 23:56:47
Message-ID: 20101220235647.61EAF6039CC9 () beta ! macosforge ! org
[Download RAW message or body]
[Attachment #2 (text/html)]
<!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>[74374] trunk/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/74374">74374</a></dd> \
<dt>Author</dt> <dd>barraclough@apple.com</dd> <dt>Date</dt> <dd>2010-12-20 15:56:36 \
-0800 (Mon, 20 Dec 2010)</dd> </dl>
<h3>Log Message</h3>
<pre>Bug 51358 - Should check stack depth rather than using recursion limits in byte \
compilation
Reviewed by Olver Hunt.
The current implementation of recursion limit checking is not safe on smaller stacks.
Switch to using a common mechanism, shared with the parser, to check recursion \
limits.
Make bytecompiler use StackBounds. Empirical testing shows emitStrcat to have the \
largest footprint on the stack, at just under 1k on x86-64. Given this, the default \
recursion check (requiring 4k of available space to recurse) seems reasonable.
* bytecompiler/BytecodeGenerator.cpp:
(JSC::BytecodeGenerator::BytecodeGenerator):
* bytecompiler/BytecodeGenerator.h:
(JSC::BytecodeGenerator::emitNode):
(JSC::BytecodeGenerator::emitNodeInConditionContext):
* bytecompiler/NodesCodegen.cpp:
(JSC::BinaryOpNode::emitStrcat):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJavaScriptCoreChangeLog">trunk/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkJavaScriptCorebytecompilerBytecodeGeneratorcpp">trunk/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp</a></li>
<li><a href="#trunkJavaScriptCorebytecompilerBytecodeGeneratorh">trunk/JavaScriptCore/bytecompiler/BytecodeGenerator.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/ChangeLog (74373 => \
74374)</h4> <pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/ChangeLog 2010-12-20 23:55:36 UTC (rev \
74373)
+++ trunk/JavaScriptCore/ChangeLog 2010-12-20 23:56:36 UTC (rev 74374)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2010-12-20 Gavin Barraclough <barraclough@apple.com>
+
+ Reviewed by Olver Hunt.
+
+ Bug 51358 - Should check stack depth rather than using recursion limits in \
byte compilation +
+ The current implementation of recursion limit checking is not safe on \
smaller stacks. + Switch to using a common mechanism, shared with the parser, \
to check recursion limits. +
+ Make bytecompiler use StackBounds. Empirical testing shows emitStrcat to \
have the largest + footprint on the stack, at just under 1k on x86-64. Given \
this, the default recursion + check (requiring 4k of available space to \
recurse) seems reasonable. +
+ * bytecompiler/BytecodeGenerator.cpp:
+ (JSC::BytecodeGenerator::BytecodeGenerator):
+ * bytecompiler/BytecodeGenerator.h:
+ (JSC::BytecodeGenerator::emitNode):
+ (JSC::BytecodeGenerator::emitNodeInConditionContext):
+ * bytecompiler/NodesCodegen.cpp:
+ (JSC::BinaryOpNode::emitStrcat):
+
</ins><span class="cx"> 2010-12-20 Tony Gentilcore <tonyg@chromium.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed build fix.
</span></span></pre></div>
<a id="trunkJavaScriptCorebytecompilerBytecodeGeneratorcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp (74373 => 74374)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2010-12-20 23:55:36 UTC (rev \
74373)
+++ trunk/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2010-12-20 23:56:36 UTC \
(rev 74374) </span><span class="lines">@@ -218,7 +218,7 @@
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> , m_lastOpcodePosition(0)
</span><span class="cx"> #endif
</span><del>- , m_emitNodeDepth(0)
</del><ins>+ , m_stack(m_globalData->stack())
</ins><span class="cx"> , m_usesExceptions(false)
</span><span class="cx"> , m_regeneratingForExceptionInfo(false)
</span><span class="cx"> , m_codeBlockBeingRegeneratedFrom(0)
</span><span class="lines">@@ -312,7 +312,7 @@
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> , m_lastOpcodePosition(0)
</span><span class="cx"> #endif
</span><del>- , m_emitNodeDepth(0)
</del><ins>+ , m_stack(m_globalData->stack())
</ins><span class="cx"> , m_usesExceptions(false)
</span><span class="cx"> , m_regeneratingForExceptionInfo(false)
</span><span class="cx"> , m_codeBlockBeingRegeneratedFrom(0)
</span><span class="lines">@@ -477,7 +477,7 @@
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> , m_lastOpcodePosition(0)
</span><span class="cx"> #endif
</span><del>- , m_emitNodeDepth(0)
</del><ins>+ , m_stack(m_globalData->stack())
</ins><span class="cx"> , m_usesExceptions(false)
</span><span class="cx"> , m_regeneratingForExceptionInfo(false)
</span><span class="cx"> , m_codeBlockBeingRegeneratedFrom(0)
</span></span></pre></div>
<a id="trunkJavaScriptCorebytecompilerBytecodeGeneratorh"></a>
<div class="modfile"><h4>Modified: \
trunk/JavaScriptCore/bytecompiler/BytecodeGenerator.h (74373 => 74374)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/JavaScriptCore/bytecompiler/BytecodeGenerator.h 2010-12-20 23:55:36 UTC (rev \
74373)
+++ trunk/JavaScriptCore/bytecompiler/BytecodeGenerator.h 2010-12-20 23:56:36 UTC \
(rev 74374) </span><span class="lines">@@ -208,13 +208,9 @@
</span><span class="cx"> // Node::emitCode assumes that dst, if provided, \
is either a local or a referenced temporary. </span><span class="cx"> \
ASSERT(!dst || dst == ignoredResult() || !dst->isTemporary() || \
dst->refCount()); </span><span class="cx"> \
addLineInfo(n->lineNo()); </span><del>-
- if (m_emitNodeDepth >= s_maxEmitNodeDepth)
- return emitThrowExpressionTooDeepException();
- ++m_emitNodeDepth;
- RegisterID* r = n->emitBytecode(*this, dst);
- --m_emitNodeDepth;
- return r;
</del><ins>+ return m_stack.recursionCheck()
+ ? n->emitBytecode(*this, dst)
+ : emitThrowExpressionTooDeepException();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RegisterID* emitNode(Node* n)
</span><span class="lines">@@ -225,13 +221,10 @@
</span><span class="cx"> void emitNodeInConditionContext(ExpressionNode* n, \
Label* trueTarget, Label* falseTarget, bool fallThroughMeansTrue) </span><span \
class="cx"> { </span><span class="cx"> \
addLineInfo(n->lineNo()); </span><del>- if (m_emitNodeDepth >= \
s_maxEmitNodeDepth) { </del><ins>+ if (m_stack.recursionCheck())
+ n->emitBytecodeInConditionContext(*this, trueTarget, falseTarget, \
fallThroughMeansTrue); + else
</ins><span class="cx"> emitThrowExpressionTooDeepException();
</span><del>- return;
- }
- ++m_emitNodeDepth;
- n->emitBytecodeInConditionContext(*this, trueTarget, falseTarget, \
fallThroughMeansTrue);
- --m_emitNodeDepth;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void emitExpressionInfo(unsigned divot, unsigned \
startOffset, unsigned endOffset) </span><span class="lines">@@ -583,13 +576,11 @@
</span><span class="cx"> size_t m_lastOpcodePosition;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- unsigned m_emitNodeDepth;
</del><ins>+ StackBounds m_stack;
</ins><span class="cx">
</span><span class="cx"> bool m_usesExceptions;
</span><span class="cx"> bool m_regeneratingForExceptionInfo;
</span><span class="cx"> CodeBlock* m_codeBlockBeingRegeneratedFrom;
</span><del>-
- static const unsigned s_maxEmitNodeDepth = 5000;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic