Changeset 212710 in webkit

Timestamp:

Feb 21, 2017 1:07:41 AM (7 years ago)

Author:

Yusuke Suzuki

Message:

ASSERTION FAILED: "!scope.exception()" with Object.isSealed/isFrozen and uninitialized module bindings
​https://bugs.webkit.org/show_bug.cgi?id=168605

Reviewed by Saam Barati.

JSTests:

• modules/module-namespace-is-frozen.js: Added.

(from.string_appeared_here.shouldThrow):
(export.b):

• modules/module-namespace-is-sealed.js: Added.

(from.string_appeared_here.shouldThrow):
(export.b):

Source/JavaScriptCore:

We should check exception state after calling getOwnPropertyDescriptor() since it can throw errors.

• runtime/ObjectConstructor.cpp:

(JSC::objectConstructorIsSealed):
(JSC::objectConstructorIsFrozen):

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/modules/module-namespace-is-frozen.js (added)
• JSTests/modules/module-namespace-is-sealed.js (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/runtime/ObjectConstructor.cpp (modified) (6 diffs)

trunk/JSTests/ChangeLog

@@ +1 @@
+2017-02-21  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        ASSERTION FAILED: "!scope.exception()" with Object.isSealed/isFrozen and uninitialized module bindings
+        https://bugs.webkit.org/show_bug.cgi?id=168605
+
+        Reviewed by Saam Barati.
+
+        * modules/module-namespace-is-frozen.js: Added.
+        (from.string_appeared_here.shouldThrow):
+        (export.b):
+        * modules/module-namespace-is-sealed.js: Added.
+        (from.string_appeared_here.shouldThrow):
+        (export.b):
+
 2017-02-19  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2017-02-21  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        ASSERTION FAILED: "!scope.exception()" with Object.isSealed/isFrozen and uninitialized module bindings
+        https://bugs.webkit.org/show_bug.cgi?id=168605
+
+        Reviewed by Saam Barati.
+
+        We should check exception state after calling getOwnPropertyDescriptor() since it can throw errors.
+
+        * runtime/ObjectConstructor.cpp:
+        (JSC::objectConstructorIsSealed):
+        (JSC::objectConstructorIsFrozen):
+
 2017-02-20  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp

@@ -632 +632 @@
     PropertyNameArray properties(exec, PropertyNameMode::StringsAndSymbols);
     object->methodTable(vm)->getOwnPropertyNames(object, exec, properties, EnumerationMode(DontEnumPropertiesMode::Include));
-    RETURN_IF_EXCEPTION(scope, encodedJSValue());
+    RETURN_IF_EXCEPTION(scope, { });
     PropertyNameArray::const_iterator end = properties.end();
     for (PropertyNameArray::const_iterator iter = properties.begin(); iter != end; ++iter) {
@@ -640 +640 @@
         // a. Let desc be the result of calling the [[GetOwnProperty]] internal method of O with P.
         PropertyDescriptor desc;
-        if (!object->getOwnPropertyDescriptor(exec, propertyName, desc))
+        bool didGetDescriptor = object->getOwnPropertyDescriptor(exec, propertyName, desc);
+        RETURN_IF_EXCEPTION(scope, { });
+        if (!didGetDescriptor)
             continue;
         // b. If desc.[[Configurable]] is true, then return false.
@@ -650 +652 @@
     // 4. Otherwise, return false.
     bool isExtensible = object->isExtensible(exec);
-    RETURN_IF_EXCEPTION(scope, encodedJSValue());
+    RETURN_IF_EXCEPTION(scope, { });
     return JSValue::encode(jsBoolean(!isExtensible));
 }
@@ -671 +673 @@
     PropertyNameArray properties(exec, PropertyNameMode::StringsAndSymbols);
     object->methodTable(vm)->getOwnPropertyNames(object, exec, properties, EnumerationMode(DontEnumPropertiesMode::Include));
-    RETURN_IF_EXCEPTION(scope, encodedJSValue());
+    RETURN_IF_EXCEPTION(scope, { });
     PropertyNameArray::const_iterator end = properties.end();
     for (PropertyNameArray::const_iterator iter = properties.begin(); iter != end; ++iter) {
@@ -679 +681 @@
         // a. Let desc be the result of calling the [[GetOwnProperty]] internal method of O with P.
         PropertyDescriptor desc;
-        if (!object->getOwnPropertyDescriptor(exec, propertyName, desc))
+        bool didGetDescriptor = object->getOwnPropertyDescriptor(exec, propertyName, desc);
+        RETURN_IF_EXCEPTION(scope, { });
+        if (!didGetDescriptor)
             continue;
         // b. If IsDataDescriptor(desc) is true then
@@ -690 +694 @@
     // 4. Otherwise, return false.
     bool isExtensible = object->isExtensible(exec);
-    RETURN_IF_EXCEPTION(scope, encodedJSValue());
+    RETURN_IF_EXCEPTION(scope, { });
     return JSValue::encode(jsBoolean(!isExtensible));
 }