<!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>[196836] 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/196836">196836</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2016-02-19 14:56:31 -0800 (Fri, 19 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[ES6] Implement Proxy.[[Call]]
https://bugs.webkit.org/show_bug.cgi?id=154425
Reviewed by Mark Lam.
This patch is a straight forward implementation of
Proxy.[[Call]] with respect to section 9.5.12
of the ECMAScript spec.
https://tc39.github.io/ecma262/#sec-proxy-object-internal-methods-and-internal-slots-call-thisargument-argumentslist
* runtime/ProxyObject.cpp:
(JSC::ProxyObject::finishCreation):
(JSC::performProxyGet):
(JSC::ProxyObject::performInternalMethodGetOwnProperty):
(JSC::ProxyObject::performHasProperty):
(JSC::ProxyObject::getOwnPropertySlotByIndex):
(JSC::performProxyCall):
(JSC::ProxyObject::getCallData):
(JSC::ProxyObject::visitChildren):
* runtime/ProxyObject.h:
(JSC::ProxyObject::create):
* tests/es6.yaml:
* tests/stress/proxy-call.js: Added.
(assert):
(throw.new.Error.let.target):
(throw.new.Error.let.handler.apply):
(throw.new.Error):
(assert.let.target):
(assert.let.handler.get apply):
(let.target):
(let.handler.apply):
(i.catch):
(assert.let.handler.apply):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</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="#trunkSourceJavaScriptCoretestsstressproxycalljs">trunk/Source/JavaScriptCore/tests/stress/proxy-call.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (196835 => 196836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-02-19 22:28:24 UTC (rev 196835)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-02-19 22:56:31 UTC (rev 196836)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2016-02-19 Saam Barati <sbarati@apple.com>
+
+ [ES6] Implement Proxy.[[Call]]
+ https://bugs.webkit.org/show_bug.cgi?id=154425
+
+ Reviewed by Mark Lam.
+
+ This patch is a straight forward implementation of
+ Proxy.[[Call]] with respect to section 9.5.12
+ of the ECMAScript spec.
+ https://tc39.github.io/ecma262/#sec-proxy-object-internal-methods-and-internal-slots-call-thisargument-argumentslist
+
+ * runtime/ProxyObject.cpp:
+ (JSC::ProxyObject::finishCreation):
+ (JSC::performProxyGet):
+ (JSC::ProxyObject::performInternalMethodGetOwnProperty):
+ (JSC::ProxyObject::performHasProperty):
+ (JSC::ProxyObject::getOwnPropertySlotByIndex):
+ (JSC::performProxyCall):
+ (JSC::ProxyObject::getCallData):
+ (JSC::ProxyObject::visitChildren):
+ * runtime/ProxyObject.h:
+ (JSC::ProxyObject::create):
+ * tests/es6.yaml:
+ * tests/stress/proxy-call.js: Added.
+ (assert):
+ (throw.new.Error.let.target):
+ (throw.new.Error.let.handler.apply):
+ (throw.new.Error):
+ (assert.let.target):
+ (assert.let.handler.get apply):
+ (let.target):
+ (let.handler.apply):
+ (i.catch):
+ (assert.let.handler.apply):
+
</ins><span class="cx"> 2016-02-19 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove more LLVM related dead code after r196729
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeProxyObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp (196835 => 196836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp 2016-02-19 22:28:24 UTC (rev 196835)
+++ trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp 2016-02-19 22:56:31 UTC (rev 196836)
</span><span class="lines">@@ -65,7 +65,11 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_target.set(vm, this, jsCast<JSObject*>(target));
</del><ins>+ CallData ignored;
+ JSObject* targetAsObject = jsCast<JSObject*>(target);
+ m_isCallable = targetAsObject->methodTable(vm)->getCallData(targetAsObject, ignored) != CallTypeNone;
+
+ m_target.set(vm, this, targetAsObject);
</ins><span class="cx"> m_handler.set(vm, this, handler);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -105,8 +109,6 @@
</span><span class="cx"> MarkedArgumentBuffer arguments;
</span><span class="cx"> arguments.append(target);
</span><span class="cx"> arguments.append(identifierToSafePublicJSValue(vm, Identifier::fromUid(&vm, propertyName.uid())));
</span><del>- if (exec->hadException())
- return JSValue::encode(jsUndefined());
</del><span class="cx"> arguments.append(thisObject);
</span><span class="cx"> JSValue trapResult = call(exec, getHandler, callType, callData, handler, arguments);
</span><span class="cx"> if (exec->hadException())
</span><span class="lines">@@ -152,8 +154,6 @@
</span><span class="cx"> MarkedArgumentBuffer arguments;
</span><span class="cx"> arguments.append(target);
</span><span class="cx"> arguments.append(identifierToSafePublicJSValue(vm, Identifier::fromUid(&vm, propertyName.uid())));
</span><del>- if (exec->hadException())
- return false;
</del><span class="cx"> JSValue trapResult = call(exec, getOwnPropertyDescriptorMethod, callType, callData, handler, arguments);
</span><span class="cx"> if (exec->hadException())
</span><span class="cx"> return false;
</span><span class="lines">@@ -234,8 +234,6 @@
</span><span class="cx"> MarkedArgumentBuffer arguments;
</span><span class="cx"> arguments.append(target);
</span><span class="cx"> arguments.append(identifierToSafePublicJSValue(vm, Identifier::fromUid(&vm, propertyName.uid())));
</span><del>- if (exec->hadException())
- return false;
</del><span class="cx"> JSValue trapResult = call(exec, hasMethod, callType, callData, handler, arguments);
</span><span class="cx"> if (exec->hadException())
</span><span class="cx"> return false;
</span><span class="lines">@@ -298,6 +296,51 @@
</span><span class="cx"> return thisObject->getOwnPropertySlotCommon(exec, ident.impl(), slot);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static EncodedJSValue JSC_HOST_CALL performProxyCall(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 applyMethod = handler->getMethod(exec, callData, callType, makeIdentifier(vm, "apply"), ASCIILiteral("'apply' property of a Proxy's handler should be callable."));
+ if (exec->hadException())
+ return JSValue::encode(jsUndefined());
+ JSObject* target = proxy->target();
+ if (applyMethod.isUndefined()) {
+ CallData callData;
+ CallType callType = target->methodTable(vm)->getCallData(target, callData);
+ RELEASE_ASSERT(callType != CallTypeNone);
+ return JSValue::encode(call(exec, target, callType, callData, exec->thisValue(), ArgList(exec)));
+ }
+
+ JSArray* argArray = constructArray(exec, static_cast<ArrayAllocationProfile*>(nullptr), ArgList(exec));
+ if (exec->hadException())
+ return JSValue::encode(jsUndefined());
+ MarkedArgumentBuffer arguments;
+ arguments.append(target);
+ arguments.append(exec->thisValue());
+ arguments.append(argArray);
+ return JSValue::encode(call(exec, applyMethod, callType, callData, handler, arguments));
+}
+
+CallType ProxyObject::getCallData(JSCell* cell, CallData& callData)
+{
+ ProxyObject* proxy = jsCast<ProxyObject*>(cell);
+ if (!proxy->m_isCallable) {
+ callData.js.functionExecutable = nullptr;
+ callData.js.scope = nullptr;
+ return CallTypeNone;
+ }
+
+ callData.native.function = performProxyCall;
+ return CallTypeHost;
+}
+
</ins><span class="cx"> void ProxyObject::visitChildren(JSCell* cell, SlotVisitor& visitor)
</span><span class="cx"> {
</span><span class="cx"> ProxyObject* thisObject = jsCast<ProxyObject*>(cell);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeProxyObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ProxyObject.h (196835 => 196836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ProxyObject.h 2016-02-19 22:28:24 UTC (rev 196835)
+++ trunk/Source/JavaScriptCore/runtime/ProxyObject.h 2016-02-19 22:56:31 UTC (rev 196836)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> public:
</span><span class="cx"> typedef JSNonFinalObject Base;
</span><span class="cx">
</span><del>- const static unsigned StructureFlags = Base::StructureFlags | OverridesGetOwnPropertySlot;
</del><ins>+ const static unsigned StructureFlags = Base::StructureFlags | OverridesGetOwnPropertySlot | TypeOfShouldCallGetCallData;
</ins><span class="cx">
</span><span class="cx"> static ProxyObject* create(ExecState* exec, Structure* structure, JSValue target, JSValue handler)
</span><span class="cx"> {
</span><span class="lines">@@ -61,6 +61,7 @@
</span><span class="cx">
</span><span class="cx"> static bool getOwnPropertySlot(JSObject*, ExecState*, PropertyName, PropertySlot&);
</span><span class="cx"> static bool getOwnPropertySlotByIndex(JSObject*, ExecState*, unsigned propertyName, PropertySlot&);
</span><ins>+ static CallType getCallData(JSCell*, CallData&);
</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">@@ -69,6 +70,7 @@
</span><span class="cx">
</span><span class="cx"> WriteBarrier<JSObject> m_target;
</span><span class="cx"> WriteBarrier<Unknown> m_handler;
</span><ins>+ bool m_isCallable : 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 (196835 => 196836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/es6.yaml 2016-02-19 22:28:24 UTC (rev 196835)
+++ trunk/Source/JavaScriptCore/tests/es6.yaml 2016-02-19 22:56:31 UTC (rev 196836)
</span><span class="lines">@@ -907,7 +907,7 @@
</span><span class="cx"> - path: es6/prototype_of_bound_functions_subclasses.js
</span><span class="cx"> cmd: runES6 :fail
</span><span class="cx"> - path: es6/Proxy_apply_handler.js
</span><del>- cmd: runES6 :fail
</del><ins>+ cmd: runES6 :normal
</ins><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><span class="lines">@@ -975,7 +975,7 @@
</span><span class="cx"> - path: es6/Proxy_internal_get_calls_Error.prototype.toString.js
</span><span class="cx"> cmd: runES6 :normal
</span><span class="cx"> - path: es6/Proxy_internal_get_calls_Function.prototype.bind.js
</span><del>- cmd: runES6 :fail
</del><ins>+ cmd: runES6 :normal
</ins><span class="cx"> - path: es6/Proxy_internal_get_calls_HasBinding.js
</span><span class="cx"> cmd: runES6 :normal
</span><span class="cx"> - path: es6/Proxy_internal_get_calls_instanceof_operator.js
</span><span class="lines">@@ -1021,7 +1021,7 @@
</span><span class="cx"> - path: es6/Proxy_internal_getOwnPropertyDescriptor_calls_[[Set]].js
</span><span class="cx"> cmd: runES6 :fail
</span><span class="cx"> - path: es6/Proxy_internal_getOwnPropertyDescriptor_calls_Function.prototype.bind.js
</span><del>- cmd: runES6 :fail
</del><ins>+ cmd: runES6 :normal
</ins><span class="cx"> - path: es6/Proxy_internal_getOwnPropertyDescriptor_calls_Object.assign.js
</span><span class="cx"> cmd: runES6 :fail
</span><span class="cx"> - path: es6/Proxy_internal_getOwnPropertyDescriptor_calls_Object.prototype.hasOwnProperty.js
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressproxycalljs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/proxy-call.js (0 => 196836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/proxy-call.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/proxy-call.js 2016-02-19 22:56:31 UTC (rev 196836)
</span><span class="lines">@@ -0,0 +1,394 @@
</span><ins>+function assert(b) {
+ if (!b)
+ throw new Error("Bad assertion");
+}
+
+{
+ let target = function foo(...args) {
+ assert(args[0] === 10);
+ assert(args[1] === 20);
+ return "foo";
+ }
+ let handler = {
+ apply: function(theTarget, thisArg, argArray) {
+ assert(theTarget === target);
+ assert(argArray[0] === 10);
+ assert(argArray[1] === 20);
+ return theTarget.apply(thisArg, argArray);
+ }
+ };
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ assert(proxy(10, 20) === "foo");
+ }
+}
+
+{
+ let target = function foo() { }
+ let error = null;
+ let handler = {
+ get apply() {
+ error = new Error();
+ throw error;
+ }
+ };
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ let threw = false;
+ try {
+ proxy(10, 20);
+ } catch(e) {
+ assert(e === error);
+ threw = true;
+ }
+ assert(threw);
+ }
+}
+
+{
+ let called = false;
+ let globalThis = this;
+ let target = function foo() {
+ assert(this === globalThis);
+ called = true;
+ }
+ let handler = {
+ apply: null
+ };
+
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ proxy();
+ assert(called);
+ called = false;
+ }
+}
+
+{
+ let called = false;
+ let globalThis = this;
+ let target = function foo() {
+ assert(this === globalThis);
+ called = true;
+ }
+ let handler = {
+ apply: undefined
+ };
+
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ proxy();
+ assert(called);
+ called = false;
+ }
+}
+
+{
+ let called = false;
+ let thisValue = {};
+ let target = function foo(x, y, z) {
+ assert(this === thisValue);
+ assert(x === 20);
+ assert(y === 45);
+ assert(z === "foo");
+ called = true;
+ }
+
+ let handler = {
+ apply: undefined
+ };
+
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ proxy.call(thisValue, 20, 45, "foo");
+ assert(called);
+ called = false;
+ proxy.apply(thisValue, [20, 45, "foo"]);
+ assert(called);
+ called = false;
+ }
+}
+
+{
+ let called = false;
+ let thisValue = {};
+ let target = function foo(x, y, z) {
+ assert(this === thisValue);
+ assert(x === 20);
+ assert(y === 45);
+ assert(z === "foo");
+ called = true;
+ return this;
+ }
+
+ let handler = {
+ apply: function(theTarget, thisArg, argArray) {
+ assert(theTarget === target);
+ assert(argArray[0] === 20);
+ assert(argArray[1] === 45);
+ assert(argArray[2] === "foo");
+ assert(thisArg === thisValue);
+ return theTarget.apply(thisArg, argArray);
+ }
+ };
+
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ assert(proxy.call(thisValue, 20, 45, "foo") === thisValue);
+ assert(called);
+ called = false;
+ assert(proxy.apply(thisValue, [20, 45, "foo"]) === thisValue);
+ assert(called);
+ called = false;
+ }
+}
+
+{
+ let called = false;
+ let target = Error;
+
+ let handler = {
+ apply: function(theTarget, thisArg, argArray) {
+ called = true;
+ assert(theTarget === Error);
+ return theTarget.apply(thisArg, argArray);
+ }
+ };
+
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ let error = proxy();
+ assert(!!error.stack);
+ called = false;
+ }
+}
+
+{
+ let called = false;
+ let self = this;
+ let target = (x) => {
+ called = true;
+ assert(this === self);
+ return x;
+ };
+
+ let handler = { };
+
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ let result = proxy(i);
+ assert(result === i);
+ called = false;
+ }
+}
+
+{
+ let called = false;
+ let self = this;
+ let target = (x) => {
+ assert(this === self);
+ return x;
+ };
+
+ let handler = {
+ apply: function(theTarget, thisArg, argArray) {
+ called = true;
+ assert(theTarget === target);
+ return theTarget.apply(thisArg, argArray);
+ }
+ };
+
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ let result = proxy(i);
+ assert(result === i);
+ called = false;
+ }
+}
+
+{
+ let called = false;
+ let self = this;
+ let target = (x) => {
+ assert(this === self);
+ return x;
+ };
+
+ let handler = {
+ apply: function(theTarget, thisArg, argArray) {
+ called = true;
+ assert(theTarget === target);
+ return theTarget.apply(null, argArray);
+ }
+ };
+
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ let result = proxy(i);
+ assert(called);
+ assert(result === i);
+ called = false;
+ }
+}
+
+{
+ let called = false;
+ let target = (x) => { };
+ let error = null;
+
+ let handler = {
+ apply: function(theTarget, thisArg, argArray) {
+ error = new Error();
+ throw error;
+ }
+ };
+
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ let threw = false;
+ try {
+ proxy();
+ } catch(e) {
+ assert(e === error);
+ threw = true;
+ }
+ assert(threw);
+ }
+}
+
+{
+ let called = false;
+ let error = null;
+ let target = (x) => {
+ error = new Error();
+ throw error;
+ };
+
+ let handler = {
+ apply: function(theTarget, thisArg, argArray) {
+ assert(theTarget === target);
+ return theTarget.apply(null, argArray);
+ }
+ };
+
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ let threw = false;
+ try {
+ proxy();
+ } catch(e) {
+ assert(e === error);
+ threw = true;
+ }
+ assert(threw);
+ }
+}
+
+{
+ let called = false;
+ let error = null;
+ let target = new Proxy((x) => x, {});
+
+ let handler = {
+ apply: function(theTarget, thisArg, argArray) {
+ assert(theTarget === target);
+ called = true;
+ return theTarget.apply(null, argArray);
+ }
+ };
+
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ assert(proxy(i) === i);
+ assert(called);
+ called = false;
+ }
+}
+
+{
+ let target = (x) => x;
+ let handler = {
+ apply: function(theTarget, thisArg, argArray) {
+ return theTarget.apply(thisArg, argArray);
+ }
+ };
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ assert(typeof proxy === "function");
+ }
+}
+
+{
+ let target = function() { }
+ let handler = {
+ apply: function(theTarget, thisArg, argArray) {
+ return theTarget.apply(thisArg, argArray);
+ }
+ };
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ assert(typeof proxy === "function");
+ }
+}
+
+{
+ let target = Error;
+ let handler = {
+ apply: function(theTarget, thisArg, argArray) {
+ return theTarget.apply(thisArg, argArray);
+ }
+ };
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ assert(typeof proxy === "function");
+ }
+}
+
+{
+ let target = (function foo() { }).bind({});
+ let handler = {
+ apply: function(theTarget, thisArg, argArray) {
+ return theTarget.apply(thisArg, argArray);
+ }
+ };
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ assert(typeof proxy === "function");
+ }
+}
+
+{
+ let target = function() { };
+ let handler = {};
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ assert(typeof proxy === "function");
+ }
+}
+
+{
+ let target = {};
+ let handler = {};
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ assert(typeof proxy === "object");
+ }
+}
+
+{
+ let target = [];
+ let handler = {};
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ assert(typeof proxy === "object");
+ }
+}
+
+{
+ let target = new String("foo");
+ let handler = {};
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ assert(typeof proxy === "object");
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>