Changeset 267440 in webkit

Timestamp:

Sep 22, 2020, 3:23:08 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

Coerce computed property before adding to |excludedList|
​https://bugs.webkit.org/show_bug.cgi?id=216437

Patch by HyeockJin Kim <​kherootz@gmail.com> on 2020-09-22
Reviewed by Yusuke Suzuki.

JSTests:

• stress/object-rest-deconstruct.js:

(get 3):

Source/JavaScriptCore:

• bytecompiler/NodesCodegen.cpp:

(JSC::ObjectPatternNode::bindValue const):

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/stress/object-rest-deconstruct.js (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp (modified) (1 diff)

trunk/JSTests/ChangeLog

@@ +1 @@
+2020-09-22  HyeockJin Kim  <kherootz@gmail.com>
+
+        Coerce computed property before adding to |excludedList|
+        https://bugs.webkit.org/show_bug.cgi?id=216437
+
+        Reviewed by Yusuke Suzuki.
+
+        * stress/object-rest-deconstruct.js:
+        (get 3):
+
 2020-09-21  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/JSTests/stress/object-rest-deconstruct.js

@@ -203 +203 @@
 })();
 
+// Destructuring non-string computed property
+(() => {
+    var a = 1;
+    var {[a]: b, ...r} = {[a]: 1, b: 2, c: 3};
+    assert(b === 1);
+    assert(r[1] === undefined);
+    assert(r.b === 2);
+    assert(r.c === 3);
+})();
+
+// Destructuring Symbol computed property
+(() => {
+    var a = Symbol('a');
+    var b = Symbol('a');
+    var {[a]: c, ...r} = {[b]: 1, b: 2, c: 3};
+    assert(c === undefined);
+    assert(r[b] === 1);
+    assert(r.b === 2);
+    assert(r.c === 3);
+})();
+
 // Catch case
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2020-09-22  HyeockJin Kim  <kherootz@gmail.com>
+
+        Coerce computed property before adding to |excludedList|
+        https://bugs.webkit.org/show_bug.cgi?id=216437
+
+        Reviewed by Yusuke Suzuki.
+
+        * bytecompiler/NodesCodegen.cpp:
+        (JSC::ObjectPatternNode::bindValue const):
+
 2020-09-21  Paulo Matos  <pmatos@igalia.com>
 

trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp

@@ -5234 +5234 @@
             if (m_containsRestElement) {
                 if (m_containsComputedProperty) {
-                    if (!target.propertyExpression)
+                    if (target.propertyExpression)
+                        generator.emitToPropertyKey(propertyName.get(), propertyName.get());
+                    else
                         propertyName = generator.emitLoad(nullptr, target.propertyName);