<!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>[184324] trunk</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/184324">184324</a></dd>

<dt>Author</dt> <dd>commit-queue@webkit.org</dd>

<dt>Date</dt> <dd>2015-05-13 18:32:25 -0700 (Wed, 13 May 2015)</dd>

</dl>

<h3>Log Message</h3>

<pre>ES6: Allow duplicate property names

https://bugs.webkit.org/show_bug.cgi?id=142895

Patch by Joseph Pecoraro &lt;pecoraro@apple.com&gt; on 2015-05-13

Reviewed by Geoffrey Garen.

Source/JavaScriptCore:

Introduce new `op_put_getter_by_id` and `op_put_setter_by_id` opcodes

that will define a single getter or setter property on an object.

The existing `op_put_getter_setter` opcode is still preferred for

putting both a getter and setter at the same time but cannot be used

for putting an individual getter or setter which is needed in

some cases.

Add a new slow path when generating bytecodes for a property list

with computed properties, as computed properties are the only time

the list of properties cannot be determined statically.

* bytecompiler/NodesCodegen.cpp:

(JSC::PropertyListNode::emitBytecode):

- fast path for all constant properties

- slow but paired getter/setter path if there are no computed properties

- slow path, individual put operation for every property, if there are computed properties

* parser/Nodes.h:

Distinguish a Computed property from a Constant property.

* parser/Parser.cpp:

(JSC::Parser&lt;LexerType&gt;::parseProperty):

(JSC::Parser&lt;LexerType&gt;::parsePropertyMethod):

Distingish Computed and Constant properties.

(JSC::Parser&lt;LexerType&gt;::parseObjectLiteral):

When we drop into strict mode it is because we saw a getter

or setter, so be more explicit.

(JSC::Parser&lt;LexerType&gt;::parseStrictObjectLiteral):

Eliminate duplicate property syntax error exception.

* parser/SyntaxChecker.h:

(JSC::SyntaxChecker::getName):

* parser/ASTBuilder.h:

(JSC::ASTBuilder::getName): Deleted.

No longer used.

* runtime/JSObject.h:

(JSC::JSObject::putDirectInternal):

When updating a property. If the Accessor attribute changed

update the Structure.

* runtime/JSObject.cpp:

(JSC::JSObject::putGetter):

(JSC::JSObject::putSetter):

Called by the opcodes, just perform the same operation that

__defineGetter__ or __defineSetter__ would do.

(JSC::JSObject::putDirectNonIndexAccessor):

This transition is now handled in putDirectInternal.

* runtime/Structure.h:

Add needed export.

* bytecode/BytecodeList.json:

* bytecode/BytecodeUseDef.h:

(JSC::computeUsesForBytecodeOffset):

(JSC::computeDefsForBytecodeOffset):

* bytecode/CodeBlock.cpp:

(JSC::CodeBlock::dumpBytecode):

* bytecompiler/BytecodeGenerator.cpp:

(JSC::BytecodeGenerator::emitPutGetterById):

(JSC::BytecodeGenerator::emitPutSetterById):

* bytecompiler/BytecodeGenerator.h:

* jit/JIT.cpp:

(JSC::JIT::privateCompileMainPass):

* jit/JIT.h:

* jit/JITInlines.h:

(JSC::JIT::callOperation):

* jit/JITOperations.cpp:

* jit/JITOperations.h:

* jit/JITPropertyAccess.cpp:

(JSC::JIT::emit_op_put_getter_by_id):

(JSC::JIT::emit_op_put_setter_by_id):

* jit/JITPropertyAccess32_64.cpp:

(JSC::JIT::emit_op_put_getter_by_id):

(JSC::JIT::emit_op_put_setter_by_id):

* llint/LLIntSlowPaths.cpp:

(JSC::LLInt::LLINT_SLOW_PATH_DECL):

* llint/LLIntSlowPaths.h:

* llint/LowLevelInterpreter.asm:

New bytecodes. Modelled after existing op_put_getter_setter.

LayoutTests:

* js/object-literal-duplicate-properties-expected.txt: Added.

* js/object-literal-duplicate-properties.html: Added.

* js/script-tests/object-literal-duplicate-properties.js: Added.

Include a new test all about testing duplicate property names

and their expected cascading results.

* ietestcenter/Javascript/11.1.5_4-4-b-1-expected.txt:

* ietestcenter/Javascript/11.1.5_4-4-b-2-expected.txt:

* ietestcenter/Javascript/11.1.5_4-4-c-1-expected.txt:

* ietestcenter/Javascript/11.1.5_4-4-c-2-expected.txt:

* ietestcenter/Javascript/11.1.5_4-4-d-1-expected.txt:

* ietestcenter/Javascript/11.1.5_4-4-d-2-expected.txt:

* ietestcenter/Javascript/11.1.5_4-4-d-3-expected.txt:

* ietestcenter/Javascript/11.1.5_4-4-d-4-expected.txt:

ES5 behavior for duplciate properties has changed.

* js/mozilla/strict/11.1.5-expected.txt:

* js/object-literal-syntax-expected.txt:

* js/script-tests/object-literal-syntax.js:

Update other tests and values now that duplicate properties

are allowed, and their cascade order behaves correctly.</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>

<li><a href="#trunkLayoutTestsietestcenterJavascript1115_44b1expectedtxt">trunk/LayoutTests/ietestcenter/Javascript/11.1.5_4-4-b-1-expected.txt</a></li>

<li><a href="#trunkLayoutTestsietestcenterJavascript1115_44b2expectedtxt">trunk/LayoutTests/ietestcenter/Javascript/11.1.5_4-4-b-2-expected.txt</a></li>

<li><a href="#trunkLayoutTestsietestcenterJavascript1115_44c1expectedtxt">trunk/LayoutTests/ietestcenter/Javascript/11.1.5_4-4-c-1-expected.txt</a></li>

<li><a href="#trunkLayoutTestsietestcenterJavascript1115_44c2expectedtxt">trunk/LayoutTests/ietestcenter/Javascript/11.1.5_4-4-c-2-expected.txt</a></li>

<li><a href="#trunkLayoutTestsietestcenterJavascript1115_44d1expectedtxt">trunk/LayoutTests/ietestcenter/Javascript/11.1.5_4-4-d-1-expected.txt</a></li>

<li><a href="#trunkLayoutTestsietestcenterJavascript1115_44d2expectedtxt">trunk/LayoutTests/ietestcenter/Javascript/11.1.5_4-4-d-2-expected.txt</a></li>

<li><a href="#trunkLayoutTestsietestcenterJavascript1115_44d3expectedtxt">trunk/LayoutTests/ietestcenter/Javascript/11.1.5_4-4-d-3-expected.txt</a></li>

<li><a href="#trunkLayoutTestsietestcenterJavascript1115_44d4expectedtxt">trunk/LayoutTests/ietestcenter/Javascript/11.1.5_4-4-d-4-expected.txt</a></li>

<li><a href="#trunkLayoutTestsjsmozillastrict1115expectedtxt">trunk/LayoutTests/js/mozilla/strict/11.1.5-expected.txt</a></li>

<li><a href="#trunkLayoutTestsjsobjectliteralsyntaxexpectedtxt">trunk/LayoutTests/js/object-literal-syntax-expected.txt</a></li>

<li><a href="#trunkLayoutTestsjsscripttestsobjectliteralsyntaxjs">trunk/LayoutTests/js/script-tests/object-literal-syntax.js</a></li>

<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>

<li><a href="#trunkSourceJavaScriptCorebytecodeBytecodeListjson">trunk/Source/JavaScriptCore/bytecode/BytecodeList.json</a></li>

<li><a href="#trunkSourceJavaScriptCorebytecodeBytecodeUseDefh">trunk/Source/JavaScriptCore/bytecode/BytecodeUseDef.h</a></li>

<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockcpp">trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp</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>

<li><a href="#trunkSourceJavaScriptCorejitCCallHelpersh">trunk/Source/JavaScriptCore/jit/CCallHelpers.h</a></li>

<li><a href="#trunkSourceJavaScriptCorejitJITcpp">trunk/Source/JavaScriptCore/jit/JIT.cpp</a></li>

<li><a href="#trunkSourceJavaScriptCorejitJITh">trunk/Source/JavaScriptCore/jit/JIT.h</a></li>

<li><a href="#trunkSourceJavaScriptCorejitJITInlinesh">trunk/Source/JavaScriptCore/jit/JITInlines.h</a></li>

<li><a href="#trunkSourceJavaScriptCorejitJITOperationscpp">trunk/Source/JavaScriptCore/jit/JITOperations.cpp</a></li>

<li><a href="#trunkSourceJavaScriptCorejitJITOperationsh">trunk/Source/JavaScriptCore/jit/JITOperations.h</a></li>

<li><a href="#trunkSourceJavaScriptCorejitJITPropertyAccesscpp">trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp</a></li>

<li><a href="#trunkSourceJavaScriptCorejitJITPropertyAccess32_64cpp">trunk/Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp</a></li>

<li><a href="#trunkSourceJavaScriptCorellintLLIntSlowPathscpp">trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp</a></li>

<li><a href="#trunkSourceJavaScriptCorellintLLIntSlowPathsh">trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.h</a></li>

<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreterasm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm</a></li>

<li><a href="#trunkSourceJavaScriptCoreparserASTBuilderh">trunk/Source/JavaScriptCore/parser/ASTBuilder.h</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>

<li><a href="#trunkSourceJavaScriptCoreparserSyntaxCheckerh">trunk/Source/JavaScriptCore/parser/SyntaxChecker.h</a></li>

<li><a href="#trunkSourceJavaScriptCoreruntimeJSObjectcpp">trunk/Source/JavaScriptCore/runtime/JSObject.cpp</a></li>

<li><a href="#trunkSourceJavaScriptCoreruntimeJSObjecth">trunk/Source/JavaScriptCore/runtime/JSObject.h</a></li>

<li><a href="#trunkSourceJavaScriptCoreruntimeStructureh">trunk/Source/JavaScriptCore/runtime/Structure.h</a></li>

</ul>

<h3>Added Paths</h3>

<ul>

<li><a href="#trunkLayoutTestsjsobjectliteralduplicatepropertiesexpectedtxt">trunk/LayoutTests/js/object-literal-duplicate-properties-expected.txt</a></li>

<li><a href="#trunkLayoutTestsjsobjectliteralduplicatepropertieshtml">trunk/LayoutTests/js/object-literal-duplicate-properties.html</a></li>

<li><a href="#trunkLayoutTestsjsscripttestsobjectliteralduplicatepropertiesjs">trunk/LayoutTests/js/script-tests/object-literal-duplicate-properties.js</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkLayoutTestsChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (184323 => 184324)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/ChangeLog        2015-05-14 01:21:03 UTC (rev 184323)

+++ trunk/LayoutTests/ChangeLog        2015-05-14 01:32:25 UTC (rev 184324)

</span><span class="lines">@@ -1,3 +1,32 @@

</span><ins>+2015-05-13  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;

+

+        ES6: Allow duplicate property names

+        https://bugs.webkit.org/show_bug.cgi?id=142895

+

+        Reviewed by Geoffrey Garen.

+

+        * js/object-literal-duplicate-properties-expected.txt: Added.

+        * js/object-literal-duplicate-properties.html: Added.

+        * js/script-tests/object-literal-duplicate-properties.js: Added.

+        Include a new test all about testing duplicate property names

+        and their expected cascading results.

+

+        * ietestcenter/Javascript/11.1.5_4-4-b-1-expected.txt:

+        * ietestcenter/Javascript/11.1.5_4-4-b-2-expected.txt:

+        * ietestcenter/Javascript/11.1.5_4-4-c-1-expected.txt:

+        * ietestcenter/Javascript/11.1.5_4-4-c-2-expected.txt:

+        * ietestcenter/Javascript/11.1.5_4-4-d-1-expected.txt:

+        * ietestcenter/Javascript/11.1.5_4-4-d-2-expected.txt:

+        * ietestcenter/Javascript/11.1.5_4-4-d-3-expected.txt:

+        * ietestcenter/Javascript/11.1.5_4-4-d-4-expected.txt:

+        ES5 behavior for duplciate properties has changed.

+

+        * js/mozilla/strict/11.1.5-expected.txt:

+        * js/object-literal-syntax-expected.txt:

+        * js/script-tests/object-literal-syntax.js:

+        Update other tests and values now that duplicate properties

+        are allowed, and their cascade order behaves correctly.

+

</ins><span class="cx"> 2015-05-13  Antti Koivisto  &lt;antti@apple.com&gt;

</span><span class="cx"> 

</span><span class="cx">         Cached CSS image resources don't show up after reloading &lt;http://nightly.webkit.org/start/&gt;

</span></span></pre></div>

<a id="trunkLayoutTestsietestcenterJavascript1115_44b1expectedtxt"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/ietestcenter/Javascript/11.1.5_4-4-b-1-expected.txt (184323 => 184324)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/ietestcenter/Javascript/11.1.5_4-4-b-1-expected.txt        2015-05-14 01:21:03 UTC (rev 184323)

+++ trunk/LayoutTests/ietestcenter/Javascript/11.1.5_4-4-b-1-expected.txt        2015-05-14 01:32:25 UTC (rev 184324)

</span><span class="lines">@@ -4,7 +4,7 @@

</span><span class="cx"> 

</span><span class="cx"> 

</span><span class="cx"> PASS ES5Harness.preconditionPassed is true

</span><del>-PASS ES5Harness.testPassed is true