<!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>[174359] 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/174359">174359</a></dd>
<dt>Author</dt> <dd>oliver@apple.com</dd>
<dt>Date</dt> <dd>2014-10-06 12:29:27 -0700 (Mon, 06 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/174226">r174226</a>): [JSC] Crash when running the perf test Speedometer/Full.html
https://bugs.webkit.org/show_bug.cgi?id=137404
Reviewed by Michael Saboff.
Update the Arguments object to recognise that it must always have an
environment record if the referenced callee has one, and if such is not
present it should not try to extract one from the callframe, as that
path leads to madness.
Happily this makes some of the other code more sensible, and removes a
bunch of unnecessary and icky logic.
* interpreter/Interpreter.cpp:
(JSC::unwindCallFrame):
* jit/JITOperations.cpp:
* llint/LLIntSlowPaths.cpp:
(JSC::LLInt::LLINT_SLOW_PATH_DECL):
* runtime/Arguments.cpp:
(JSC::Arguments::tearOff):
(JSC::Arguments::didTearOffActivation): Deleted.
* runtime/Arguments.h:
(JSC::Arguments::argument):
(JSC::Arguments::finishCreation):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterInterpretercpp">trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITOperationscpp">trunk/Source/JavaScriptCore/jit/JITOperations.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLLIntSlowPathscpp">trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeArgumentscpp">trunk/Source/JavaScriptCore/runtime/Arguments.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeArgumentsh">trunk/Source/JavaScriptCore/runtime/Arguments.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (174358 => 174359)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-10-06 19:20:19 UTC (rev 174358)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-10-06 19:29:27 UTC (rev 174359)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-10-06 Oliver Hunt <oliver@apple.com>
+
+ REGRESSION(r174226): [JSC] Crash when running the perf test Speedometer/Full.html
+ https://bugs.webkit.org/show_bug.cgi?id=137404
+
+ Reviewed by Michael Saboff.
+
+ Update the Arguments object to recognise that it must always have an
+ environment record if the referenced callee has one, and if such is not
+ present it should not try to extract one from the callframe, as that
+ path leads to madness.
+
+ Happily this makes some of the other code more sensible, and removes a
+ bunch of unnecessary and icky logic.
+
+ * interpreter/Interpreter.cpp:
+ (JSC::unwindCallFrame):
+ * jit/JITOperations.cpp:
+ * llint/LLIntSlowPaths.cpp:
+ (JSC::LLInt::LLINT_SLOW_PATH_DECL):
+ * runtime/Arguments.cpp:
+ (JSC::Arguments::tearOff):
+ (JSC::Arguments::didTearOffActivation): Deleted.
+ * runtime/Arguments.h:
+ (JSC::Arguments::argument):
+ (JSC::Arguments::finishCreation):
+
</ins><span class="cx"> 2014-10-04 Brian J. Burg <burg@cs.washington.edu>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r174319.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterInterpretercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp (174358 => 174359)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp 2014-10-06 19:20:19 UTC (rev 174358)
+++ trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp 2014-10-06 19:29:27 UTC (rev 174359)
</span><span class="lines">@@ -448,7 +448,6 @@
</span><span class="cx"> ASSERT(!callFrame->hadException());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- JSValue lexicalEnvironment;
</del><span class="cx"> if (codeBlock->codeType() == FunctionCode && codeBlock->needsActivation()) {
</span><span class="cx"> #if ENABLE(DFG_JIT)
</span><span class="cx"> RELEASE_ASSERT(!visitor->isInlinedFrame());
</span><span class="lines">@@ -457,10 +456,8 @@
</span><span class="cx">
</span><span class="cx"> if (codeBlock->codeType() == FunctionCode && codeBlock->usesArguments()) {
</span><span class="cx"> if (Arguments* arguments = visitor->existingArguments()) {
</span><del>- if (lexicalEnvironment && lexicalEnvironment.isCell())
- arguments->didTearOffActivation(callFrame, jsCast<JSLexicalEnvironment*>(lexicalEnvironment));
</del><span class="cx"> #if ENABLE(DFG_JIT)
</span><del>- else if (visitor->isInlinedFrame())
</del><ins>+ if (visitor->isInlinedFrame())
</ins><span class="cx"> arguments->tearOff(callFrame, visitor->inlineCallFrame());
</span><span class="cx"> #endif
</span><span class="cx"> else
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOperationscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOperations.cpp (174358 => 174359)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOperations.cpp 2014-10-06 19:20:19 UTC (rev 174358)
+++ trunk/Source/JavaScriptCore/jit/JITOperations.cpp 2014-10-06 19:29:27 UTC (rev 174359)
</span><span class="lines">@@ -1590,13 +1590,9 @@
</span><span class="cx"> return JSValue::encode(result);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void JIT_OPERATION operationTearOffArguments(ExecState* exec, JSCell* argumentsCell, JSCell* activationCell)
</del><ins>+void JIT_OPERATION operationTearOffArguments(ExecState* exec, JSCell* argumentsCell, JSCell*)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(exec->codeBlock()->usesArguments());
</span><del>- if (activationCell) {
- jsCast<Arguments*>(argumentsCell)->didTearOffActivation(exec, jsCast<JSLexicalEnvironment*>(activationCell));
- return;
- }
</del><span class="cx"> jsCast<Arguments*>(argumentsCell)->tearOff(exec);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLLIntSlowPathscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp (174358 => 174359)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2014-10-06 19:20:19 UTC (rev 174358)
+++ trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2014-10-06 19:29:27 UTC (rev 174359)
</span><span class="lines">@@ -1250,10 +1250,7 @@
</span><span class="cx"> LLINT_BEGIN();
</span><span class="cx"> ASSERT(exec->codeBlock()->usesArguments());
</span><span class="cx"> Arguments* arguments = jsCast<Arguments*>(exec->uncheckedR(VirtualRegister(pc[1].u.operand).offset()).jsValue());
</span><del>- if (JSValue activationValue = LLINT_OP_C(2).jsValue())
- arguments->didTearOffActivation(exec, jsCast<JSLexicalEnvironment*>(activationValue));
- else
- arguments->tearOff(exec);
</del><ins>+ arguments->tearOff(exec);
</ins><span class="cx"> LLINT_END();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeArgumentscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Arguments.cpp (174358 => 174359)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Arguments.cpp 2014-10-06 19:20:19 UTC (rev 174358)
+++ trunk/Source/JavaScriptCore/runtime/Arguments.cpp 2014-10-06 19:29:27 UTC (rev 174359)
</span><span class="lines">@@ -372,6 +372,8 @@
</span><span class="cx">
</span><span class="cx"> void Arguments::tearOff(CallFrame* callFrame)
</span><span class="cx"> {
</span><ins>+ if (m_callee->jsExecutable()->needsActivation())
+ RELEASE_ASSERT(m_lexicalEnvironment);
</ins><span class="cx"> if (isTornOff())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -391,21 +393,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Arguments::didTearOffActivation(ExecState* exec, JSLexicalEnvironment* lexicalEnvironment)
-{
- RELEASE_ASSERT(lexicalEnvironment);
- if (isTornOff())
- return;
-
- if (!m_numArguments)
- return;
-
- m_lexicalEnvironment.set(exec->vm(), this, lexicalEnvironment);
- tearOff(exec);
-}
-
</del><span class="cx"> void Arguments::tearOff(CallFrame* callFrame, InlineCallFrame* inlineCallFrame)
</span><span class="cx"> {
</span><ins>+ RELEASE_ASSERT(!inlineCallFrame->baselineCodeBlock()->needsActivation());
</ins><span class="cx"> if (isTornOff())
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeArgumentsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Arguments.h (174358 => 174359)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Arguments.h 2014-10-06 19:20:19 UTC (rev 174358)
+++ trunk/Source/JavaScriptCore/runtime/Arguments.h 2014-10-06 19:29:27 UTC (rev 174359)
</span><span class="lines">@@ -87,7 +87,6 @@
</span><span class="cx"> void tearOff(CallFrame*);
</span><span class="cx"> void tearOff(CallFrame*, InlineCallFrame*);
</span><span class="cx"> bool isTornOff() const { return m_registerArray.get(); }
</span><del>- void didTearOffActivation(ExecState*, JSLexicalEnvironment*);
</del><span class="cx">
</span><span class="cx"> static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
</span><span class="cx"> {
</span><span class="lines">@@ -273,10 +272,8 @@
</span><span class="cx"> if (m_slowArgumentData->slowArguments()[argument].status != SlowArgument::Captured)
</span><span class="cx"> return m_registers[index];
</span><span class="cx">
</span><del>- JSLexicalEnvironment* lexicalEnvironment = m_lexicalEnvironment.get();
- if (!lexicalEnvironment)
- lexicalEnvironment = CallFrame::create(reinterpret_cast<Register*>(m_registers))->lexicalEnvironment();
- return lexicalEnvironment->registerAt(index - m_slowArgumentData->bytecodeToMachineCaptureOffset());
</del><ins>+ RELEASE_ASSERT(m_lexicalEnvironment);
+ return m_lexicalEnvironment->registerAt(index - m_slowArgumentData->bytecodeToMachineCaptureOffset());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void Arguments::finishCreation(CallFrame* callFrame, ArgumentsMode mode)
</span><span class="lines">@@ -307,7 +304,10 @@
</span><span class="cx"> m_slowArgumentData->setBytecodeToMachineCaptureOffset(
</span><span class="cx"> codeBlock->framePointerOffsetToGetActivationRegisters());
</span><span class="cx"> }
</span><del>-
</del><ins>+ if (codeBlock->needsActivation()) {
+ RELEASE_ASSERT(callFrame->lexicalEnvironment());
+ m_lexicalEnvironment.set(callFrame->vm(), this, callFrame->lexicalEnvironment());
+ }
</ins><span class="cx"> // The bytecode generator omits op_tear_off_lexical_environment in cases of no
</span><span class="cx"> // declared parameters, so we need to tear off immediately.
</span><span class="cx"> if (m_isStrictMode || !callee->jsExecutable()->parameterCount())
</span><span class="lines">@@ -320,8 +320,8 @@
</span><span class="cx"> m_registers = nullptr;
</span><span class="cx"> tearOff(callFrame);
</span><span class="cx"> break;
</span><del>- } }
-
</del><ins>+ }
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void Arguments::finishCreation(CallFrame* callFrame, InlineCallFrame* inlineCallFrame, ArgumentsMode mode)
</span></span></pre>
</div>
</div>
</body>
</html>