Changeset 259587 in webkit

Timestamp:

Apr 6, 2020 12:01:57 PM (4 years ago)

Author:

Alexey Shvayka

Message:

Remove unnecessary Test262 harness file and implement $262.IsHTMLDDA
​https://bugs.webkit.org/show_bug.cgi?id=187526

Reviewed by Darin Adler.

JSTests:

• stress/optional-chaining.js: Adjust test for callable masquerader.

Source/JavaScriptCore:

Test262 harness requires [1] $262.IsHTMLDDA to be an object with IsHTMLDDA? slot [2],
much like document.all. It is used in a few tests to make sure that runtimes strictly
compare values with null and undefined.

With this change, makeMasquerader returns callable masquerader to mimic document.all
in the wild. In order to avoid masqueradesAsUndefinedWatchpoint being fired during
initialization of JSC shell, $262.IsHTMLDDA is a getter.

[1]: ​https://github.com/tc39/test262/blob/master/INTERPRETING.md#host-defined-functions
[2]: ​https://tc39.es/ecma262/#sec-IsHTMLDDA-internal-slot

• jsc.cpp:

(functionMakeMasquerader):
(functionCallMasquerader):
(JSC::Masquerader::Masquerader): Deleted.
(JSC::Masquerader::subspaceFor): Deleted.
(JSC::Masquerader::create): Deleted.
(JSC::Masquerader::createStructure): Deleted.

• runtime/JSObject.h:

Tools:

Removed file duplicates functionality of jsc.cpp's GlobalObject::finishCreation.

• Scripts/test262/Runner.pm:
• Scripts/test262/agent.js: Removed.

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/stress/optional-chaining.js (modified) (2 diffs)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/jsc.cpp (modified) (4 diffs)
• Source/JavaScriptCore/runtime/JSObject.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/test262/Runner.pm (modified) (1 diff)
• Tools/Scripts/test262/agent.js (deleted)

trunk/JSTests/ChangeLog

@@ +1 @@
+2020-04-06  Rick Waldron  <waldron.rick@gmail.com> and Alexey Shvayka  <shvaikalesh@gmail.com>
+
+        Remove unnecessary Test262 harness file and implement $262.IsHTMLDDA
+        https://bugs.webkit.org/show_bug.cgi?id=187526
+
+        Reviewed by Darin Adler.
+
+        * stress/optional-chaining.js: Adjust test for callable masquerader.
+
 2020-04-06  Justin Michaud  <justin_michaud@apple.com>
 

trunk/JSTests/stress/optional-chaining.js

@@ -80 +80 @@
     shouldThrowTypeError(() => []?.(), '[] is not a function');
     shouldThrowTypeError(() => ['hi']?.(), '[\'hi\'] is not a function');
-    shouldThrowTypeError(() => masquerader?.(), 'masquerader is not a function');
 }
 noInline(testBasicFailureCases);
@@ -106 +105 @@
 shouldBe((() => {})?.()?.(), undefined);
 shouldBe(null?.()().a['b'], undefined);
+shouldBe(masquerader?.(), null);
 
 const o0 = { a: { b() { return this._b.bind(this); }, _b() { return this.__b; }, __b: { c: 42 } } };

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2020-04-06  Rick Waldron  <waldron.rick@gmail.com> and Alexey Shvayka  <shvaikalesh@gmail.com>
+
+        Remove unnecessary Test262 harness file and implement $262.IsHTMLDDA
+        https://bugs.webkit.org/show_bug.cgi?id=187526
+
+        Reviewed by Darin Adler.
+
+        Test262 harness requires [1] $262.IsHTMLDDA to be an object with [[IsHTMLDDA]] slot [2],
+        much like `document.all`. It is used in a few tests to make sure that runtimes strictly
+        compare values with `null` and `undefined`.
+
+        With this change, `makeMasquerader` returns callable masquerader to mimic `document.all`
+        in the wild. In order to avoid `masqueradesAsUndefinedWatchpoint` being fired during
+        initialization of JSC shell, $262.IsHTMLDDA is a getter.
+
+        [1]: https://github.com/tc39/test262/blob/master/INTERPRETING.md#host-defined-functions
+        [2]: https://tc39.es/ecma262/#sec-IsHTMLDDA-internal-slot
+
+        * jsc.cpp:
+        (functionMakeMasquerader):
+        (functionCallMasquerader):
+        (JSC::Masquerader::Masquerader): Deleted.
+        (JSC::Masquerader::subspaceFor): Deleted.
+        (JSC::Masquerader::create): Deleted.
+        (JSC::Masquerader::createStructure): Deleted.
+        * runtime/JSObject.h:
+
 2020-04-06  Justin Michaud  <justin_michaud@apple.com>
 

trunk/Source/JavaScriptCore/jsc.cpp

@@ -197 +197 @@
 }
 
-class Masquerader : public JSNonFinalObject {
-public:
-    Masquerader(VM& vm, Structure* structure)
-        : Base(vm, structure)
-    {
-    }
-
-    typedef JSNonFinalObject Base;
-    static constexpr unsigned StructureFlags = Base::StructureFlags | JSC::MasqueradesAsUndefined;
-
-    template<typename CellType, SubspaceAccess>
-    static CompleteSubspace* subspaceFor(VM& vm)
-    {
-        return &vm.cellSpace;
-    }
-
-    static Masquerader* create(VM& vm, JSGlobalObject* globalObject)
-    {
-        globalObject->masqueradesAsUndefinedWatchpoint()->fireAll(vm, "Masquerading object allocated");
-        Structure* structure = createStructure(vm, globalObject, jsNull());
-        Masquerader* result = new (NotNull, allocateCell<Masquerader>(vm.heap)) Masquerader(vm, structure);
-        result->finishCreation(vm);
-        return result;
-    }
-
-    static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
-    {
-        return Structure::create(vm, globalObject, prototype, TypeInfo(ObjectType, StructureFlags), info());
-    }
-
-    DECLARE_INFO;
-};
-
-const ClassInfo Masquerader::s_info = { "Masquerader", &Base::s_info, nullptr, nullptr, CREATE_METHOD_TABLE(Masquerader) };
 static unsigned asyncTestPasses { 0 };
 static unsigned asyncTestExpectedPasses { 0 };
@@ -349 +315 @@
 static EncodedJSValue JSC_HOST_CALL functionIdentity(JSGlobalObject*, CallFrame*);
 static EncodedJSValue JSC_HOST_CALL functionMakeMasquerader(JSGlobalObject*, CallFrame*);
+static EncodedJSValue JSC_HOST_CALL functionCallMasquerader(JSGlobalObject*, CallFrame*);
 static EncodedJSValue JSC_HOST_CALL functionHasCustomProperties(JSGlobalObject*, CallFrame*);
 static EncodedJSValue JSC_HOST_CALL functionDumpTypesForAllVariables(JSGlobalObject*, CallFrame*);
@@ -630 +597 @@
         
         dollar->putDirect(vm, Identifier::fromString(vm, "global"), this);
+
+        JSFunction* IsHTMLDDAGetter = JSFunction::create(vm, this, 0, "IsHTMLDDA"_s, functionMakeMasquerader);
+        dollar->putGetter(this, Identifier::fromString(vm, "IsHTMLDDA"), IsHTMLDDAGetter, static_cast<unsigned>(PropertyAttribute::Accessor));
         
         JSObject* agent = JSFinalObject::create(vm, plainObjectStructure);
@@ -2220 +2190 @@
 {
     VM& vm = globalObject->vm();
-    return JSValue::encode(Masquerader::create(vm, globalObject));
+    return JSValue::encode(JSFunction::createFunctionThatMasqueradesAsUndefined(vm, globalObject, 0, "IsHTMLDDA"_s, functionCallMasquerader));
+}
+
+EncodedJSValue JSC_HOST_CALL functionCallMasquerader(JSGlobalObject*, CallFrame*)
+{
+    return JSValue::encode(jsNull());
 }
 

trunk/Source/JavaScriptCore/runtime/JSObject.h

@@ -608 +608 @@
     JS_EXPORT_PRIVATE bool putDirectCustomAccessor(VM&, PropertyName, JSValue, unsigned attributes);
 
-    bool putGetter(JSGlobalObject*, PropertyName, JSValue, unsigned attributes);
+    JS_EXPORT_PRIVATE bool putGetter(JSGlobalObject*, PropertyName, JSValue, unsigned attributes);
     bool putSetter(JSGlobalObject*, PropertyName, JSValue, unsigned attributes);
 

trunk/Tools/ChangeLog

@@ +1 @@
+2020-04-06  Rick Waldron  <waldron.rick@gmail.com> and Alexey Shvayka  <shvaikalesh@gmail.com>
+
+        Remove unnecessary Test262 harness file and implement $262.IsHTMLDDA
+        https://bugs.webkit.org/show_bug.cgi?id=187526
+
+        Reviewed by Darin Adler.
+
+        Removed file duplicates functionality of jsc.cpp's GlobalObject::finishCreation.
+
+        * Scripts/test262/Runner.pm:
+        * Scripts/test262/agent.js: Removed.
+
 2020-04-06  Saam Barati  <sbarati@apple.com>
 

trunk/Tools/Scripts/test262/Runner.pm

@@ -328 +328 @@
         "$harnessDir/assert.js",
         "$harnessDir/doneprintHandle.js",
-        "$Bin/agent.js"
     );