Changeset 204848 in webkit

Timestamp:

Aug 23, 2016, 12:07:33 PM (9 years ago)

Author:

Yusuke Suzuki

Message:

[ES6] Module namespace object's Symbol.iterator method should only accept module namespace objects
​https://bugs.webkit.org/show_bug.cgi?id=161097

Reviewed by Keith Miller.

JSTests:

• test262.yaml:

Source/JavaScriptCore:

• runtime/JSModuleNamespaceObject.cpp:

(JSC::moduleNamespaceObjectSymbolIterator):

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/test262.yaml (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/runtime/JSModuleNamespaceObject.cpp (modified) (1 diff)

trunk/JSTests/ChangeLog

@@ +1 @@
+2016-08-23  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        [ES6] Module namespace object's Symbol.iterator method should only accept module namespace objects
+        https://bugs.webkit.org/show_bug.cgi?id=161097
+
+        Reviewed by Keith Miller.
+
+        * test262.yaml:
+
 2016-08-22  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/JSTests/test262.yaml

@@ -71255 +71255 @@
   cmd: runTest262 :normal, "NoException", ["../../../../../harness/assert.js", "../../../../../harness/sta.js"], [:module]
 - path: test262/test/language/module-code/namespace/Symbol.iterator/this-val-not-ns.js
-  cmd: runTest262 :fail, "NoException", ["../../../../../harness/assert.js", "../../../../../harness/sta.js"], [:module]
+  cmd: runTest262 :normal, "NoException", ["../../../../../harness/assert.js", "../../../../../harness/sta.js"], [:module]
 - path: test262/test/language/module-code/namespace/Symbol.iterator/values-binding-types.js
   cmd: runTest262 :normal, "NoException", ["../../../../../harness/assert.js", "../../../../../harness/sta.js"], [:module]

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-08-23  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        [ES6] Module namespace object's Symbol.iterator method should only accept module namespace objects
+        https://bugs.webkit.org/show_bug.cgi?id=161097
+
+        Reviewed by Keith Miller.
+
+        * runtime/JSModuleNamespaceObject.cpp:
+        (JSC::moduleNamespaceObjectSymbolIterator):
+
 2016-08-22  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/Source/JavaScriptCore/runtime/JSModuleNamespaceObject.cpp

@@ -202 +202 @@
 EncodedJSValue JSC_HOST_CALL moduleNamespaceObjectSymbolIterator(ExecState* exec)
 {
-    JSValue thisValue = exec->thisValue();
-    if (!thisValue.isObject())
-        return JSValue::encode(throwTypeError(exec, ASCIILiteral("|this| should be an object")));
-    return JSValue::encode(JSPropertyNameIterator::create(exec, exec->lexicalGlobalObject()->propertyNameIteratorStructure(), asObject(thisValue)));
+    JSModuleNamespaceObject* object = jsDynamicCast<JSModuleNamespaceObject*>(exec->thisValue());
+    if (!object)
+        return throwVMTypeError(exec, ASCIILiteral("|this| should be a module namespace object"));
+    return JSValue::encode(JSPropertyNameIterator::create(exec, exec->lexicalGlobalObject()->propertyNameIteratorStructure(), object));
 }