<!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>[196868] 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/196868">196868</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2016-02-20 15:51:33 -0800 (Sat, 20 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[ES6] Implement Proxy.[[Construct]]
https://bugs.webkit.org/show_bug.cgi?id=154440
Reviewed by Oliver Hunt.
This patch is mostly an implementation of
Proxy.[[Construct]] with respect to section 9.5.13
of the ECMAScript spec.
https://tc39.github.io/ecma262/#sec-proxy-object-internal-methods-and-internal-slots-construct-argumentslist-newtarget
This patch also changes op_create_this to accept new.target's
that aren't JSFunctions. This is necessary implementing Proxy.[[Construct]]
because we might construct a JSFunction with a new.target being
a Proxy. This will also be needed when we implement Reflect.construct.
* dfg/DFGOperations.cpp:
* dfg/DFGSpeculativeJIT32_64.cpp:
(JSC::DFG::SpeculativeJIT::compile):
* dfg/DFGSpeculativeJIT64.cpp:
(JSC::DFG::SpeculativeJIT::compile):
* jit/JITOpcodes.cpp:
(JSC::JIT::emit_op_create_this):
(JSC::JIT::emitSlow_op_create_this):
* jit/JITOpcodes32_64.cpp:
(JSC::JIT::emit_op_create_this):
(JSC::JIT::emitSlow_op_create_this):
* llint/LLIntData.cpp:
(JSC::LLInt::Data::performAssertions):
* llint/LowLevelInterpreter.asm:
* llint/LowLevelInterpreter32_64.asm:
* llint/LowLevelInterpreter64.asm:
* runtime/CommonSlowPaths.cpp:
(JSC::SLOW_PATH_DECL):
* runtime/ProxyObject.cpp:
(JSC::ProxyObject::finishCreation):
(JSC::ProxyObject::visitChildren):
(JSC::performProxyConstruct):
(JSC::ProxyObject::getConstructData):
* runtime/ProxyObject.h:
* tests/es6.yaml:
* tests/stress/proxy-construct.js: Added.
(assert):
(throw.new.Error.let.target):
(throw.new.Error):
(assert.let.target):
(assert.let.handler.get construct):
(let.target):
(let.handler.construct):
(i.catch):
(assert.let.handler.construct):
(assert.let.construct):
(assert.else.assert.let.target):
(assert.else.assert.let.construct):
(assert.else.assert):
(new.proxy.let.target):
(new.proxy.let.construct):
(new.proxy):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGOperationscpp">trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITOpcodescpp">trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITOpcodes32_64cpp">trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLLIntDatacpp">trunk/Source/JavaScriptCore/llint/LLIntData.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreterasm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreter32_64asm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreter64asm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCommonSlowPathscpp">trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeProxyObjectcpp">trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeProxyObjecth">trunk/Source/JavaScriptCore/runtime/ProxyObject.h</a></li>
<li><a href="#trunkSourceJavaScriptCoretestses6yaml">trunk/Source/JavaScriptCore/tests/es6.yaml</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstressproxyconstructjs">trunk/Source/JavaScriptCore/tests/stress/proxy-construct.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (196867 => 196868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-02-20 22:47:51 UTC (rev 196867)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-02-20 23:51:33 UTC (rev 196868)
</span><span class="lines">@@ -1,3 +1,63 @@
</span><ins>+2016-02-19 Saam Barati <sbarati@apple.com>
+
+ [ES6] Implement Proxy.[[Construct]]
+ https://bugs.webkit.org/show_bug.cgi?id=154440
+
+ Reviewed by Oliver Hunt.
+
+ This patch is mostly an implementation of
+ Proxy.[[Construct]] with respect to section 9.5.13
+ of the ECMAScript spec.
+ https://tc39.github.io/ecma262/#sec-proxy-object-internal-methods-and-internal-slots-construct-argumentslist-newtarget
+
+ This patch also changes op_create_this to accept new.target's
+ that aren't JSFunctions. This is necessary implementing Proxy.[[Construct]]
+ because we might construct a JSFunction with a new.target being
+ a Proxy. This will also be needed when we implement Reflect.construct.
+
+ * dfg/DFGOperations.cpp:
+ * dfg/DFGSpeculativeJIT32_64.cpp:
+ (JSC::DFG::SpeculativeJIT::compile):
+ * dfg/DFGSpeculativeJIT64.cpp:
+ (JSC::DFG::SpeculativeJIT::compile):
+ * jit/JITOpcodes.cpp:
+ (JSC::JIT::emit_op_create_this):
+ (JSC::JIT::emitSlow_op_create_this):
+ * jit/JITOpcodes32_64.cpp:
+ (JSC::JIT::emit_op_create_this):
+ (JSC::JIT::emitSlow_op_create_this):
+ * llint/LLIntData.cpp:
+ (JSC::LLInt::Data::performAssertions):
+ * llint/LowLevelInterpreter.asm:
+ * llint/LowLevelInterpreter32_64.asm:
+ * llint/LowLevelInterpreter64.asm:
+ * runtime/CommonSlowPaths.cpp:
+ (JSC::SLOW_PATH_DECL):
+ * runtime/ProxyObject.cpp:
+ (JSC::ProxyObject::finishCreation):
+ (JSC::ProxyObject::visitChildren):
+ (JSC::performProxyConstruct):
+ (JSC::ProxyObject::getConstructData):
+ * runtime/ProxyObject.h:
+ * tests/es6.yaml:
+ * tests/stress/proxy-construct.js: Added.
+ (assert):
+ (throw.new.Error.let.target):
+ (throw.new.Error):
+ (assert.let.target):
+ (assert.let.handler.get construct):
+ (let.target):
+ (let.handler.construct):
+ (i.catch):
+ (assert.let.handler.construct):
+ (assert.let.construct):
+ (assert.else.assert.let.target):
+ (assert.else.assert.let.construct):
+ (assert.else.assert):
+ (new.proxy.let.target):
+ (new.proxy.let.construct):
+ (new.proxy):
+
</ins><span class="cx"> 2016-02-19 Sukolsak Sakshuwong <sukolsak@gmail.com>
</span><span class="cx">
</span><span class="cx"> [INTL] Implement Number Format Functions
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGOperationscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp (196867 => 196868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp 2016-02-20 22:47:51 UTC (rev 196867)
+++ trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp 2016-02-20 23:51:33 UTC (rev 196868)
</span><span class="lines">@@ -164,8 +164,10 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(&vm, exec);
</span><ins>+ if (constructor->type() == JSFunctionType)
+ return constructEmptyObject(exec, jsCast<JSFunction*>(constructor)->rareData(exec, inlineCapacity)->objectAllocationProfile()->structure());
</ins><span class="cx">
</span><del>- return constructEmptyObject(exec, jsCast<JSFunction*>(constructor)->rareData(exec, inlineCapacity)->objectAllocationProfile()->structure());
</del><ins>+ return constructEmptyObject(exec);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JIT_OPERATION operationValueBitAnd(ExecState* exec, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp (196867 => 196868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2016-02-20 22:47:51 UTC (rev 196867)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2016-02-20 23:51:33 UTC (rev 196868)
</span><span class="lines">@@ -3707,6 +3707,8 @@
</span><span class="cx">
</span><span class="cx"> MacroAssembler::JumpList slowPath;
</span><span class="cx">
</span><ins>+ slowPath.append(m_jit.branch8(JITCompiler::NotEqual,
+ JITCompiler::Address(calleeGPR, JSCell::typeInfoTypeOffset()), TrustedImm32(JSFunctionType)));
</ins><span class="cx"> m_jit.loadPtr(JITCompiler::Address(calleeGPR, JSFunction::offsetOfRareData()), rareDataGPR);
</span><span class="cx"> slowPath.append(m_jit.branchTestPtr(MacroAssembler::Zero, rareDataGPR));
</span><span class="cx"> m_jit.loadPtr(JITCompiler::Address(rareDataGPR, FunctionRareData::offsetOfObjectAllocationProfile() + ObjectAllocationProfile::offsetOfAllocator()), allocatorGPR);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp (196867 => 196868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2016-02-20 22:47:51 UTC (rev 196867)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2016-02-20 23:51:33 UTC (rev 196868)
</span><span class="lines">@@ -3740,6 +3740,8 @@
</span><span class="cx">
</span><span class="cx"> MacroAssembler::JumpList slowPath;
</span><span class="cx">
</span><ins>+ slowPath.append(m_jit.branch8(JITCompiler::NotEqual,
+ JITCompiler::Address(calleeGPR, JSCell::typeInfoTypeOffset()), TrustedImm32(JSFunctionType)));
</ins><span class="cx"> m_jit.loadPtr(JITCompiler::Address(calleeGPR, JSFunction::offsetOfRareData()), rareDataGPR);
</span><span class="cx"> slowPath.append(m_jit.branchTestPtr(MacroAssembler::Zero, rareDataGPR));
</span><span class="cx"> m_jit.loadPtr(JITCompiler::Address(rareDataGPR, FunctionRareData::offsetOfObjectAllocationProfile() + ObjectAllocationProfile::offsetOfAllocator()), allocatorGPR);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOpcodescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp (196867 => 196868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp 2016-02-20 22:47:51 UTC (rev 196867)
+++ trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp 2016-02-20 23:51:33 UTC (rev 196868)
</span><span class="lines">@@ -712,6 +712,7 @@
</span><span class="cx"> RegisterID scratchReg = regT3;
</span><span class="cx">
</span><span class="cx"> emitGetVirtualRegister(callee, calleeReg);
</span><ins>+ addSlowCase(branch8(NotEqual, Address(calleeReg, JSCell::typeInfoTypeOffset()), TrustedImm32(JSFunctionType)));
</ins><span class="cx"> loadPtr(Address(calleeReg, JSFunction::offsetOfRareData()), rareDataReg);
</span><span class="cx"> addSlowCase(branchTestPtr(Zero, rareDataReg));
</span><span class="cx"> loadPtr(Address(rareDataReg, FunctionRareData::offsetOfObjectAllocationProfile() + ObjectAllocationProfile::offsetOfAllocator()), allocatorReg);
</span><span class="lines">@@ -729,6 +730,7 @@
</span><span class="cx">
</span><span class="cx"> void JIT::emitSlow_op_create_this(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
</span><span class="cx"> {
</span><ins>+ linkSlowCase(iter); // Callee::m_type != JSFunctionType.
</ins><span class="cx"> linkSlowCase(iter); // doesn't have rare data
</span><span class="cx"> linkSlowCase(iter); // doesn't have an allocation profile
</span><span class="cx"> linkSlowCase(iter); // allocation failed
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOpcodes32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp (196867 => 196868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp 2016-02-20 22:47:51 UTC (rev 196867)
+++ trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp 2016-02-20 23:51:33 UTC (rev 196868)
</span><span class="lines">@@ -970,6 +970,7 @@
</span><span class="cx"> RegisterID scratchReg = regT3;
</span><span class="cx">
</span><span class="cx"> emitLoadPayload(callee, calleeReg);
</span><ins>+ addSlowCase(branch8(NotEqual, Address(calleeReg, JSCell::typeInfoTypeOffset()), TrustedImm32(JSFunctionType)));
</ins><span class="cx"> loadPtr(Address(calleeReg, JSFunction::offsetOfRareData()), rareDataReg);
</span><span class="cx"> addSlowCase(branchTestPtr(Zero, rareDataReg));
</span><span class="cx"> loadPtr(Address(rareDataReg, FunctionRareData::offsetOfObjectAllocationProfile() + ObjectAllocationProfile::offsetOfAllocator()), allocatorReg);
</span><span class="lines">@@ -987,6 +988,7 @@
</span><span class="cx">
</span><span class="cx"> void JIT::emitSlow_op_create_this(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
</span><span class="cx"> {
</span><ins>+ linkSlowCase(iter); // Callee::m_type != JSFunctionType.
</ins><span class="cx"> linkSlowCase(iter); // doesn't have rare data
</span><span class="cx"> linkSlowCase(iter); // doesn't have an allocation profile
</span><span class="cx"> linkSlowCase(iter); // allocation failed
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLLIntDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LLIntData.cpp (196867 => 196868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LLIntData.cpp 2016-02-20 22:47:51 UTC (rev 196867)
+++ trunk/Source/JavaScriptCore/llint/LLIntData.cpp 2016-02-20 23:51:33 UTC (rev 196868)
</span><span class="lines">@@ -146,6 +146,7 @@
</span><span class="cx"> STATIC_ASSERT(SymbolType == 7);
</span><span class="cx"> STATIC_ASSERT(ObjectType == 21);
</span><span class="cx"> STATIC_ASSERT(FinalObjectType == 22);
</span><ins>+ STATIC_ASSERT(JSFunctionType == 24);
</ins><span class="cx"> STATIC_ASSERT(MasqueradesAsUndefined == 1);
</span><span class="cx"> STATIC_ASSERT(ImplementsDefaultHasInstance == 2);
</span><span class="cx"> STATIC_ASSERT(FirstConstantRegisterIndex == 0x40000000);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreterasm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm (196867 => 196868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2016-02-20 22:47:51 UTC (rev 196867)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2016-02-20 23:51:33 UTC (rev 196868)
</span><span class="lines">@@ -330,6 +330,7 @@
</span><span class="cx"> const SymbolType = 7
</span><span class="cx"> const ObjectType = 21
</span><span class="cx"> const FinalObjectType = 22
</span><ins>+const JSFunctionType = 24
</ins><span class="cx">
</span><span class="cx"> # Type flags constants.
</span><span class="cx"> const MasqueradesAsUndefined = 1
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter32_64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm (196867 => 196868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2016-02-20 22:47:51 UTC (rev 196867)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2016-02-20 23:51:33 UTC (rev 196868)
</span><span class="lines">@@ -691,6 +691,7 @@
</span><span class="cx"> traceExecution()
</span><span class="cx"> loadi 8[PC], t0
</span><span class="cx"> loadp PayloadOffset[cfr, t0, 8], t0
</span><ins>+ bbneq JSCell::m_type[t0], JSFunctionType, .opCreateThisSlow
</ins><span class="cx"> loadp JSFunction::m_rareData[t0], t5
</span><span class="cx"> btpz t5, .opCreateThisSlow
</span><span class="cx"> loadp FunctionRareData::m_objectAllocationProfile + ObjectAllocationProfile::m_allocator[t5], t1
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm (196867 => 196868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2016-02-20 22:47:51 UTC (rev 196867)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2016-02-20 23:51:33 UTC (rev 196868)
</span><span class="lines">@@ -597,6 +597,7 @@
</span><span class="cx"> traceExecution()
</span><span class="cx"> loadisFromInstruction(2, t0)
</span><span class="cx"> loadp [cfr, t0, 8], t0
</span><ins>+ bbneq JSCell::m_type[t0], JSFunctionType, .opCreateThisSlow
</ins><span class="cx"> loadp JSFunction::m_rareData[t0], t3
</span><span class="cx"> btpz t3, .opCreateThisSlow
</span><span class="cx"> loadp FunctionRareData::m_objectAllocationProfile + ObjectAllocationProfile::m_allocator[t3], t1
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCommonSlowPathscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp (196867 => 196868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp 2016-02-20 22:47:51 UTC (rev 196867)
+++ trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp 2016-02-20 23:51:33 UTC (rev 196868)
</span><span class="lines">@@ -221,17 +221,22 @@
</span><span class="cx"> SLOW_PATH_DECL(slow_path_create_this)
</span><span class="cx"> {
</span><span class="cx"> BEGIN();
</span><del>- JSFunction* constructor = jsCast<JSFunction*>(OP(2).jsValue().asCell());
</del><ins>+ JSObject* result;
+ JSCell* constructorAsCell = OP(2).jsValue().asCell();
+ if (constructorAsCell->type() == JSFunctionType) {
+ JSFunction* constructor = jsCast<JSFunction*>(constructorAsCell);
+ auto& cacheWriteBarrier = pc[4].u.jsCell;
+ if (!cacheWriteBarrier)
+ cacheWriteBarrier.set(exec->vm(), exec->codeBlock(), constructor);
+ else if (cacheWriteBarrier.unvalidatedGet() != JSCell::seenMultipleCalleeObjects() && cacheWriteBarrier.get() != constructor)
+ cacheWriteBarrier.setWithoutWriteBarrier(JSCell::seenMultipleCalleeObjects());
</ins><span class="cx">
</span><del>- auto& cacheWriteBarrier = pc[4].u.jsCell;
- if (!cacheWriteBarrier)
- cacheWriteBarrier.set(exec->vm(), exec->codeBlock(), constructor);
- else if (cacheWriteBarrier.unvalidatedGet() != JSCell::seenMultipleCalleeObjects() && cacheWriteBarrier.get() != constructor)
- cacheWriteBarrier.setWithoutWriteBarrier(JSCell::seenMultipleCalleeObjects());
-
- size_t inlineCapacity = pc[3].u.operand;
- Structure* structure = constructor->rareData(exec, inlineCapacity)->objectAllocationProfile()->structure();
- RETURN(constructEmptyObject(exec, structure));
</del><ins>+ size_t inlineCapacity = pc[3].u.operand;
+ Structure* structure = constructor->rareData(exec, inlineCapacity)->objectAllocationProfile()->structure();
+ result = constructEmptyObject(exec, structure);
+ } else
+ result = constructEmptyObject(exec);
+ RETURN(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SLOW_PATH_DECL(slow_path_to_this)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeProxyObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp (196867 => 196868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp 2016-02-20 22:47:51 UTC (rev 196867)
+++ trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp 2016-02-20 23:51:33 UTC (rev 196868)
</span><span class="lines">@@ -65,10 +65,14 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- CallData ignored;
</del><span class="cx"> JSObject* targetAsObject = jsCast<JSObject*>(target);
</span><del>- m_isCallable = targetAsObject->methodTable(vm)->getCallData(targetAsObject, ignored) != CallTypeNone;
</del><span class="cx">
</span><ins>+ CallData ignoredCallData;
+ m_isCallable = targetAsObject->methodTable(vm)->getCallData(targetAsObject, ignoredCallData) != CallTypeNone;
+
+ ConstructData ignoredConstructData;
+ m_isConstructible = jsCast<JSObject*>(target)->methodTable(vm)->getConstructData(jsCast<JSObject*>(target), ignoredConstructData) != ConstructTypeNone;
+
</ins><span class="cx"> m_target.set(vm, this, targetAsObject);
</span><span class="cx"> m_handler.set(vm, this, handler);
</span><span class="cx"> }
</span><span class="lines">@@ -351,4 +355,54 @@
</span><span class="cx"> visitor.append(&thisObject->m_handler);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static EncodedJSValue JSC_HOST_CALL performProxyConstruct(ExecState* exec)
+{
+ VM& vm = exec->vm();
+ ProxyObject* proxy = jsCast<ProxyObject*>(exec->callee());
+ JSValue handlerValue = proxy->handler();
+ if (handlerValue.isNull())
+ return throwVMTypeError(exec, ASCIILiteral("Proxy 'handler' is null. It should be an Object."));
+
+ JSObject* handler = jsCast<JSObject*>(handlerValue);
+ CallData callData;
+ CallType callType;
+ JSValue constructMethod = handler->getMethod(exec, callData, callType, makeIdentifier(vm, "construct"), ASCIILiteral("'construct' property of a Proxy's handler should be constructible."));
+ if (exec->hadException())
+ return JSValue::encode(jsUndefined());
+ JSObject* target = proxy->target();
+ if (constructMethod.isUndefined()) {
+ ConstructData constructData;
+ ConstructType constructType = target->methodTable(vm)->getConstructData(target, constructData);
+ RELEASE_ASSERT(constructType != ConstructTypeNone);
+ return JSValue::encode(construct(exec, target, constructType, constructData, ArgList(exec), exec->newTarget()));
+ }
+
+ JSArray* argArray = constructArray(exec, static_cast<ArrayAllocationProfile*>(nullptr), ArgList(exec));
+ if (exec->hadException())
+ return JSValue::encode(jsUndefined());
+ MarkedArgumentBuffer arguments;
+ arguments.append(target);
+ arguments.append(argArray);
+ arguments.append(exec->newTarget());
+ JSValue result = call(exec, constructMethod, callType, callData, handler, arguments);
+ if (exec->hadException())
+ return JSValue::encode(jsUndefined());
+ if (!result.isObject())
+ return throwVMTypeError(exec, ASCIILiteral("Result from Proxy handler's 'construct' method should be an object."));
+ return JSValue::encode(result);
+}
+
+ConstructType ProxyObject::getConstructData(JSCell* cell, ConstructData& constructData)
+{
+ ProxyObject* proxy = jsCast<ProxyObject*>(cell);
+ if (!proxy->m_isConstructible) {
+ constructData.js.functionExecutable = nullptr;
+ constructData.js.scope = nullptr;
+ return ConstructTypeNone;
+ }
+
+ constructData.native.function = performProxyConstruct;
+ return ConstructTypeHost;
+}
+
</ins><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeProxyObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ProxyObject.h (196867 => 196868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ProxyObject.h 2016-02-20 22:47:51 UTC (rev 196867)
+++ trunk/Source/JavaScriptCore/runtime/ProxyObject.h 2016-02-20 23:51:33 UTC (rev 196868)
</span><span class="lines">@@ -62,6 +62,7 @@
</span><span class="cx"> static bool getOwnPropertySlot(JSObject*, ExecState*, PropertyName, PropertySlot&);
</span><span class="cx"> static bool getOwnPropertySlotByIndex(JSObject*, ExecState*, unsigned propertyName, PropertySlot&);
</span><span class="cx"> static CallType getCallData(JSCell*, CallData&);
</span><ins>+ static ConstructType getConstructData(JSCell*, ConstructData&);
</ins><span class="cx"> static void visitChildren(JSCell*, SlotVisitor&);
</span><span class="cx">
</span><span class="cx"> bool getOwnPropertySlotCommon(ExecState*, PropertyName, PropertySlot&);
</span><span class="lines">@@ -71,6 +72,7 @@
</span><span class="cx"> WriteBarrier<JSObject> m_target;
</span><span class="cx"> WriteBarrier<Unknown> m_handler;
</span><span class="cx"> bool m_isCallable : 1;
</span><ins>+ bool m_isConstructible : 1;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestses6yaml"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/es6.yaml (196867 => 196868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/es6.yaml 2016-02-20 22:47:51 UTC (rev 196867)
+++ trunk/Source/JavaScriptCore/tests/es6.yaml 2016-02-20 23:51:33 UTC (rev 196868)
</span><span class="lines">@@ -911,7 +911,7 @@
</span><span class="cx"> - path: es6/Proxy_Array.isArray_support.js
</span><span class="cx"> cmd: runES6 :fail
</span><span class="cx"> - path: es6/Proxy_construct_handler.js
</span><del>- cmd: runES6 :fail
</del><ins>+ cmd: runES6 :normal
</ins><span class="cx"> - path: es6/Proxy_constructor_requires_new.js
</span><span class="cx"> cmd: runES6 :normal
</span><span class="cx"> - path: es6/Proxy_defineProperty_handler.js
</span><span class="lines">@@ -967,7 +967,7 @@
</span><span class="cx"> - path: es6/Proxy_internal_get_calls_ClassDefinitionEvaluation.js
</span><span class="cx"> cmd: runES6 :normal
</span><span class="cx"> - path: es6/Proxy_internal_get_calls_CreateDynamicFunction.js
</span><del>- cmd: runES6 :fail
</del><ins>+ cmd: runES6 :normal
</ins><span class="cx"> - path: es6/Proxy_internal_get_calls_CreateListFromArrayLike.js
</span><span class="cx"> cmd: runES6 :normal
</span><span class="cx"> - path: es6/Proxy_internal_get_calls_Date.prototype.toJSON.js
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressproxyconstructjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/proxy-construct.js (0 => 196868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/proxy-construct.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/proxy-construct.js 2016-02-20 23:51:33 UTC (rev 196868)
</span><span class="lines">@@ -0,0 +1,263 @@
</span><ins>+function assert(b) {
+ if (!b)
+ throw new Error("Bad assertion");
+}
+
+{
+ let target = function() { }
+ let handler = {
+ construct: 45
+ };
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ let threw = false;
+ try {
+ new proxy;
+ } catch(e) {
+ threw = true;
+ assert(e.toString() === "TypeError: 'construct' property of a Proxy's handler should be constructible.");
+ }
+ assert(threw);
+ }
+}
+
+{
+ let target = function() { }
+ let handler = {
+ construct: "hello"
+ };
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ let threw = false;
+ try {
+ new proxy;
+ } catch(e) {
+ threw = true;
+ assert(e.toString() === "TypeError: 'construct' property of a Proxy's handler should be constructible.");
+ }
+ assert(threw);
+ }
+}
+
+{
+ let target = function() { }
+ let error = null;
+ let handler = {
+ get construct() {
+ error = new Error;
+ throw error;
+ }
+ };
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ let threw = false;
+ try {
+ new proxy;
+ } catch(e) {
+ threw = true;
+ assert(e === error);
+ }
+ assert(threw);
+ error = null;
+ }
+}
+
+{
+ let target = function() { }
+ let error = null;
+ let handler = {
+ construct: function() {
+ error = new Error;
+ throw error;
+ }
+ };
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ let threw = false;
+ try {
+ new proxy;
+ } catch(e) {
+ threw = true;
+ assert(e === error);
+ }
+ assert(threw);
+ error = null;
+ }
+}
+
+{
+ let error = null;
+ let target = function() {
+ assert(new.target === proxy);
+ error = new Error;
+ throw error;
+ };
+ let handler = { };
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ let threw = false;
+ try {
+ new proxy;
+ } catch(e) {
+ assert(e === error);
+ error = null;
+ threw = true;
+ }
+ assert(threw);
+ }
+}
+
+{
+ let target = function() { }
+ let handler = {
+ construct: function() {
+ return 25;
+ }
+ };
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ let threw = false;
+ try {
+ new proxy;
+ } catch(e) {
+ threw = true;
+ assert(e.toString() === "TypeError: Result from Proxy handler's 'construct' method should be an object.");
+ }
+ assert(threw);
+ }
+}
+
+{
+ let target = function() { }
+ let handler = {
+ construct: function() {
+ return "hello";
+ }
+ };
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ let threw = false;
+ try {
+ new proxy;
+ } catch(e) {
+ threw = true;
+ assert(e.toString() === "TypeError: Result from Proxy handler's 'construct' method should be an object.");
+ }
+ assert(threw);
+ }
+}
+
+{
+ let target = function() { }
+ let handler = {
+ construct: function() {
+ return Symbol();
+ }
+ };
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ let threw = false;
+ try {
+ new proxy;
+ } catch(e) {
+ threw = true;
+ assert(e.toString() === "TypeError: Result from Proxy handler's 'construct' method should be an object.");
+ }
+ assert(threw);
+ }
+}
+
+{
+ let a = {};
+ let b = {};
+ let retValue = null;
+ let target = function() {
+ return retValue;
+ };
+ let error = null;
+ let handler = {
+ construct: function(theTarget, argArray, newTarget) {
+ assert(theTarget === target);
+ assert(newTarget === proxy);
+ return new theTarget(...argArray);
+ }
+ };
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ retValue = i % 2 ? a : b;
+ assert(new proxy === retValue);
+ }
+}
+
+{
+ let a = {};
+ let b = {};
+ let target = function() {
+ assert(new.target === proxy);
+ return a;
+ };
+ let error = null;
+ let construct = function(theTarget, argArray, newTarget) {
+ assert(theTarget === target);
+ assert(newTarget === proxy);
+ return b;
+ };
+ let handler = { };
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ if (i % 2)
+ handler.construct = construct;
+ else
+ handler.construct = null;
+ let result = new proxy;
+ if (i % 2)
+ assert(result === b)
+ else
+ assert(result === a);
+ }
+}
+
+{
+ let target = function(...args) {
+ assert(new.target === target);
+ assert(args[0] === 0);
+ assert(args[1] === 1);
+ assert(args[2] === "foo");
+ };
+ let error = null;
+ let construct = function(theTarget, argArray, newTarget) {
+ assert(theTarget === target);
+ assert(newTarget === proxy);
+ return new target(...argArray);
+ };
+ let handler = { };
+ handler.construct = construct;
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ new proxy(0, 1, "foo");
+ }
+}
+
+{
+ let obj = null;
+ let target = function(...args) {
+ assert(new.target === target);
+ assert(args[0] === 0);
+ assert(obj);
+ assert(args[1] === obj);
+ assert(args[2] === "foo");
+ };
+ let error = null;
+ let construct = function(theTarget, argArray, newTarget) {
+ assert(theTarget === target);
+ assert(newTarget === proxy);
+ return new target(...argArray);
+ };
+ let handler = { };
+ handler.construct = construct;
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ obj = {};
+ new proxy(0, obj, "foo");
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>