<!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>[180732] 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/180732">180732</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2015-02-26 23:26:23 -0800 (Thu, 26 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, roll out <a href="http://trac.webkit.org/projects/webkit/changeset/180723">r180723</a>. It broke a bunch of tests.
* bytecompiler/BytecodeGenerator.cpp:
(JSC::BytecodeGenerator::constLocal):
* bytecompiler/BytecodeGenerator.h:
* bytecompiler/NodesCodegen.cpp:
(JSC::ConstDeclNode::emitCodeSingle):
* tests/stress/const-arguments.js: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp">trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorh">trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerNodesCodegencpp">trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstressconstargumentsjs">trunk/Source/JavaScriptCore/tests/stress/const-arguments.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (180731 => 180732)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-02-27 07:04:17 UTC (rev 180731)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-02-27 07:26:23 UTC (rev 180732)
</span><span class="lines">@@ -1,29 +1,13 @@
</span><span class="cx"> 2015-02-26 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><del>- BytecodeGenerator::constLocal() behaves identically to BytecodeGenerator::local() for the purposes of its one caller
- https://bugs.webkit.org/show_bug.cgi?id=142071
</del><ins>+ Unreviewed, roll out r180723. It broke a bunch of tests.
</ins><span class="cx">
</span><del>- Rubber stamped by Benjamin Poulain.
-
- The only behavioral differences between constLocal() and local() are:
-
- - constLocal() doesn't have a special case for "this" that overrides other checks like the
- shouldOptimizeLocals() check. But the one user of constLocal() is for the "const x"
- expression, and "const this" doesn't parse.
-
- - constLocal() won't createArgumentsIfNecessary() for "arguments". But it's harmless if
- it does, since its one user assigns to the local.
-
- So, we can remove constLocal() and make its one caller use local() instead.
-
</del><span class="cx"> * bytecompiler/BytecodeGenerator.cpp:
</span><del>- (JSC::BytecodeGenerator::constLocal): Deleted.
</del><ins>+ (JSC::BytecodeGenerator::constLocal):
</ins><span class="cx"> * bytecompiler/BytecodeGenerator.h:
</span><span class="cx"> * bytecompiler/NodesCodegen.cpp:
</span><span class="cx"> (JSC::ConstDeclNode::emitCodeSingle):
</span><del>- * tests/stress/const-arguments.js: Added.
- (foo):
- (check):
</del><ins>+ * tests/stress/const-arguments.js: Removed.
</ins><span class="cx">
</span><span class="cx"> 2015-02-26 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp (180731 => 180732)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2015-02-27 07:04:17 UTC (rev 180731)
+++ trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2015-02-27 07:26:23 UTC (rev 180732)
</span><span class="lines">@@ -1214,6 +1214,24 @@
</span><span class="cx"> return Local(local, entry.getAttributes(), isArguments ? Local::SpecialLocal : Local::NormalLocal);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+Local BytecodeGenerator::constLocal(const Identifier& property)
+{
+ if (m_codeType != FunctionCode)
+ return Local();
+
+ SymbolTableEntry entry = symbolTable().get(property.impl());
+ if (entry.isNull())
+ return Local();
+
+ RegisterID* local = createLazyRegisterIfNecessary(&registerFor(entry.getIndex()));
+
+ bool isArguments = property == propertyNames().arguments;
+ if (isCaptured(local->index()) && m_lexicalEnvironmentRegister)
+ return Local();
+
+ return Local(local, entry.getAttributes(), isArguments ? Local::SpecialLocal : Local::NormalLocal);
+}
+
</ins><span class="cx"> void BytecodeGenerator::emitCheckHasInstance(RegisterID* dst, RegisterID* value, RegisterID* base, Label* target)
</span><span class="cx"> {
</span><span class="cx"> size_t begin = instructions().size();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h (180731 => 180732)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h 2015-02-27 07:04:17 UTC (rev 180731)
+++ trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h 2015-02-27 07:26:23 UTC (rev 180732)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2008, 2009, 2012-2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2008, 2009, 2012, 2013, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2008 Cameron Zwarich <cwzwarich@uwaterloo.ca>
</span><span class="cx"> * Copyright (C) 2012 Igalia, S.L.
</span><span class="cx"> *
</span><span class="lines">@@ -286,6 +286,7 @@
</span><span class="cx"> CaptureMode captureMode(int operand) { return isCaptured(operand) ? IsCaptured : NotCaptured; }
</span><span class="cx">
</span><span class="cx"> Local local(const Identifier&);
</span><ins>+ Local constLocal(const Identifier&);
</ins><span class="cx">
</span><span class="cx"> // Returns the register storing "this"
</span><span class="cx"> RegisterID* thisRegister() { return &m_thisRegister; }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerNodesCodegencpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp (180731 => 180732)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 2015-02-27 07:04:17 UTC (rev 180731)
+++ trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 2015-02-27 07:26:23 UTC (rev 180732)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 1999-2002 Harri Porten (porten@kde.org)
</span><span class="cx"> * Copyright (C) 2001 Peter Kelly (pmk@post.com)
</span><del>-* Copyright (C) 2003-2009, 2012-2013, 2015 Apple Inc. All rights reserved.
</del><ins>+* Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012, 2013 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2007 Cameron Zwarich (cwzwarich@uwaterloo.ca)
</span><span class="cx"> * Copyright (C) 2007 Maks Orlovich
</span><span class="cx"> * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
</span><span class="lines">@@ -1695,7 +1695,7 @@
</span><span class="cx"> RegisterID* ConstDeclNode::emitCodeSingle(BytecodeGenerator& generator)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: This code does not match the behavior of const in Firefox.
</span><del>- if (Local local = generator.local(m_ident)) {
</del><ins>+ if (Local local = generator.constLocal(m_ident)) {
</ins><span class="cx"> if (!m_init)
</span><span class="cx"> return local.get();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressconstargumentsjs"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/tests/stress/const-arguments.js (180731 => 180732)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/const-arguments.js 2015-02-27 07:04:17 UTC (rev 180731)
+++ trunk/Source/JavaScriptCore/tests/stress/const-arguments.js 2015-02-27 07:26:23 UTC (rev 180732)
</span><span class="lines">@@ -1,16 +0,0 @@
</span><del>-function foo() {
- const arguments = 52;
- return arguments;
-}
-
-noInline(foo);
-
-function check(result, expected)
-{
- if (result !== expected)
- throw new Error("Bad result at i = " + i + ": " + result + " (expected " + expected + ")");
-}
-
-for (var i = 0; i < 10000; ++i)
- check(foo(), 52);
-
</del></span></pre>
</div>
</div>
</body>
</html>