Changeset 246333 in webkit

Timestamp:

Jun 11, 2019 2:42:41 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Error message for non-callable Proxy construct trap is misleading
​https://bugs.webkit.org/show_bug.cgi?id=198637

Patch by Alexey Shvayka <Alexey Shvayka> on 2019-06-11
Reviewed by Saam Barati.

JSTests:

• stress/proxy-construct.js:

Source/JavaScriptCore:

Just like other traps, Proxy construct trap is invoked with Call?, not Construct?.

• runtime/ProxyObject.cpp:

(JSC::performProxyConstruct): Tweak error message.

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/stress/proxy-construct.js (modified) (2 diffs)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/runtime/ProxyObject.cpp (modified) (1 diff)

trunk/JSTests/ChangeLog

@@ +1 @@
+2019-06-11  Alexey Shvayka  <shvaikalesh@gmail.com>
+
+        Error message for non-callable Proxy `construct` trap is misleading
+        https://bugs.webkit.org/show_bug.cgi?id=198637
+
+        Reviewed by Saam Barati.
+
+        * stress/proxy-construct.js:
+
 2019-06-10  Tadeu Zagallo  <tzagallo@apple.com>
 

trunk/JSTests/stress/proxy-construct.js

@@ -16 +16 @@
         } catch(e) {
             threw = true;
-            assert(e.toString() === "TypeError: 'construct' property of a Proxy's handler should be constructible");
+            assert(e.toString() === "TypeError: 'construct' property of a Proxy's handler should be callable");
         }
         assert(threw);
@@ -34 +34 @@
         } catch(e) {
             threw = true;
-            assert(e.toString() === "TypeError: 'construct' property of a Proxy's handler should be constructible");
+            assert(e.toString() === "TypeError: 'construct' property of a Proxy's handler should be callable");
         }
         assert(threw);

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-06-11  Alexey Shvayka  <shvaikalesh@gmail.com>
+
+        Error message for non-callable Proxy `construct` trap is misleading
+        https://bugs.webkit.org/show_bug.cgi?id=198637
+
+        Reviewed by Saam Barati.
+
+        Just like other traps, Proxy `construct` trap is invoked with [[Call]], not [[Construct]].
+
+        * runtime/ProxyObject.cpp:
+        (JSC::performProxyConstruct): Tweak error message.
+
 2019-06-10  Tadeu Zagallo  <tzagallo@apple.com>
 

trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp

@@ -572 +572 @@
     CallData callData;
     CallType callType;
-    JSValue constructMethod = handler->getMethod(exec, callData, callType, makeIdentifier(vm, "construct"), "'construct' property of a Proxy's handler should be constructible"_s);
+    JSValue constructMethod = handler->getMethod(exec, callData, callType, makeIdentifier(vm, "construct"), "'construct' property of a Proxy's handler should be callable"_s);
     RETURN_IF_EXCEPTION(scope, encodedJSValue());
     JSObject* target = proxy->target();