Changeset 273777 in webkit

Timestamp:

Mar 2, 2021, 5:37:34 PM (6 years ago)

Author:

ysuzuki@apple.com

Message:

[JSC] Remove ImpureProxyType
​https://bugs.webkit.org/show_bug.cgi?id=222626

Reviewed by Alexey Shvayka.

Source/JavaScriptCore:

ImpureProxyType is no longer used. This patch just removes it.

• API/tests/JSObjectGetProxyTargetTest.cpp:

(testJSObjectGetProxyTarget):

• runtime/HasOwnPropertyCache.h:

(JSC::HasOwnPropertyCache::tryAdd):

• runtime/JSCast.h:
• runtime/JSCellInlines.h:

(JSC::JSCell::isProxy const):

• runtime/JSGlobalObject.cpp:

(JSC::JSGlobalObject::resetPrototype):
(JSC::JSGlobalObject::finishCreation):

• runtime/JSProxy.h:

(JSC::JSProxy::createStructure):

• runtime/JSType.cpp:

(WTF::printInternal):

• runtime/JSType.h:
• runtime/Structure.h:

(JSC::Structure::isProxy const):

• tools/JSDollarVM.cpp:

(JSC::JSC_DEFINE_HOST_FUNCTION):

Source/WebCore:

• workers/WorkerOrWorkletScriptController.cpp:

(WebCore::WorkerOrWorkletScriptController::initScriptWithSubclass):

Location:

trunk/Source

Files:

• JavaScriptCore/API/tests/JSObjectGetProxyTargetTest.cpp (modified) (1 diff)
• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/runtime/HasOwnPropertyCache.h (modified) (1 diff)
• JavaScriptCore/runtime/JSCast.h (modified) (1 diff)
• JavaScriptCore/runtime/JSCellInlines.h (modified) (1 diff)
• JavaScriptCore/runtime/JSGlobalObject.cpp (modified) (2 diffs)
• JavaScriptCore/runtime/JSProxy.h (modified) (1 diff)
• JavaScriptCore/runtime/JSType.cpp (modified) (1 diff)
• JavaScriptCore/runtime/JSType.h (modified) (1 diff)
• JavaScriptCore/runtime/Structure.h (modified) (1 diff)
• JavaScriptCore/tools/JSDollarVM.cpp (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/workers/WorkerOrWorkletScriptController.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/API/tests/JSObjectGetProxyTargetTest.cpp

@@ -61 +61 @@
         JSProxy* globalObjectProxyObject = jsCast<JSProxy*>(toJS(globalObjectProxy));
         globalObjectObject = jsCast<JSGlobalObject*>(globalObjectProxyObject->target());
-        Structure* proxyStructure = JSProxy::createStructure(vm, globalObjectObject, globalObjectObject->objectPrototype(), PureForwardingProxyType);
+        Structure* proxyStructure = JSProxy::createStructure(vm, globalObjectObject, globalObjectObject->objectPrototype());
         globalObjectRef = toRef(jsCast<JSObject*>(globalObjectObject));
         jsProxyObject = JSProxy::create(vm, proxyStructure);

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2021-03-02  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] Remove ImpureProxyType
+        https://bugs.webkit.org/show_bug.cgi?id=222626
+
+        Reviewed by Alexey Shvayka.
+
+        ImpureProxyType is no longer used. This patch just removes it.
+
+        * API/tests/JSObjectGetProxyTargetTest.cpp:
+        (testJSObjectGetProxyTarget):
+        * runtime/HasOwnPropertyCache.h:
+        (JSC::HasOwnPropertyCache::tryAdd):
+        * runtime/JSCast.h:
+        * runtime/JSCellInlines.h:
+        (JSC::JSCell::isProxy const):
+        * runtime/JSGlobalObject.cpp:
+        (JSC::JSGlobalObject::resetPrototype):
+        (JSC::JSGlobalObject::finishCreation):
+        * runtime/JSProxy.h:
+        (JSC::JSProxy::createStructure):
+        * runtime/JSType.cpp:
+        (WTF::printInternal):
+        * runtime/JSType.h:
+        * runtime/Structure.h:
+        (JSC::Structure::isProxy const):
+        * tools/JSDollarVM.cpp:
+        (JSC::JSC_DEFINE_HOST_FUNCTION):
+
 2021-03-02  Saam Barati  <sbarati@apple.com>
 

trunk/Source/JavaScriptCore/runtime/HasOwnPropertyCache.h

@@ -88 +88 @@
             return;
 
-        if (object->type() == PureForwardingProxyType || object->type() == ImpureProxyType)
+        if (object->type() == PureForwardingProxyType)
             return;
 

trunk/Source/JavaScriptCore/runtime/JSCast.h

@@ -80 +80 @@
     macro(JSArrayBufferView, FirstTypedArrayType, LastTypedArrayType) \
     macro(JSPromise, JSType::JSPromiseType, JSType::JSPromiseType) \
-    macro(JSProxy, JSType::PureForwardingProxyType, JSType::ImpureProxyType) \
+    macro(JSProxy, JSType::PureForwardingProxyType, JSType::PureForwardingProxyType) \
     macro(JSSet, JSType::JSSetType, JSType::JSSetType) \
     macro(JSMap, JSType::JSMapType, JSType::JSMapType) \

trunk/Source/JavaScriptCore/runtime/JSCellInlines.h

@@ -245 +245 @@
 inline bool JSCell::isProxy() const
 {
-    return m_type == ImpureProxyType || m_type == PureForwardingProxyType || m_type == ProxyObjectType;
+    return m_type == PureForwardingProxyType || m_type == ProxyObjectType;
 }
 

trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp

@@ -1904 +1904 @@
     fixupPrototypeChainWithObjectPrototype(vm);
     // Whenever we change the prototype of the global object, we need to create a new JSProxy with the correct prototype.
-    setGlobalThis(vm, JSProxy::create(vm, JSProxy::createStructure(vm, this, prototype, PureForwardingProxyType), this));
+    setGlobalThis(vm, JSProxy::create(vm, JSProxy::createStructure(vm, this, prototype), this));
 }
 
@@ -2377 +2377 @@
     m_runtimeFlags = m_globalObjectMethodTable->javaScriptRuntimeFlags(this);
     init(vm);
-    setGlobalThis(vm, JSProxy::create(vm, JSProxy::createStructure(vm, this, getPrototypeDirect(vm), PureForwardingProxyType), this));
+    setGlobalThis(vm, JSProxy::create(vm, JSProxy::createStructure(vm, this, getPrototypeDirect(vm)), this));
     ASSERT(type() == GlobalObjectType);
 }

trunk/Source/JavaScriptCore/runtime/JSProxy.h

@@ -56 +56 @@
     }
 
-    static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype, JSType proxyType)
+    static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
     {
-        ASSERT(proxyType == ImpureProxyType || proxyType == PureForwardingProxyType);
-        return Structure::create(vm, globalObject, prototype, TypeInfo(proxyType, StructureFlags), info());
+        return Structure::create(vm, globalObject, prototype, TypeInfo(PureForwardingProxyType, StructureFlags), info());
     }
 

trunk/Source/JavaScriptCore/runtime/JSType.cpp

@@ -69 +69 @@
     CASE(ErrorInstanceType)
     CASE(PureForwardingProxyType)
-    CASE(ImpureProxyType)
     CASE(DirectArgumentsType)
     CASE(ScopedArgumentsType)

trunk/Source/JavaScriptCore/runtime/JSType.h

@@ -66 +66 @@
     ErrorInstanceType,
     PureForwardingProxyType,
-    ImpureProxyType,
     DirectArgumentsType,
     ScopedArgumentsType,

trunk/Source/JavaScriptCore/runtime/Structure.h

@@ -184 +184 @@
     {
         JSType type = m_blob.type();
-        return type == ImpureProxyType || type == PureForwardingProxyType || type == ProxyObjectType;
+        return type == PureForwardingProxyType || type == ProxyObjectType;
     }
 

trunk/Source/JavaScriptCore/tools/JSDollarVM.cpp

@@ -2716 +2716 @@
         return JSValue::encode(jsUndefined());
     JSObject* jsTarget = asObject(target.asCell());
-    Structure* structure = JSProxy::createStructure(vm, globalObject, jsTarget->getPrototypeDirect(vm), ImpureProxyType);
+    Structure* structure = JSProxy::createStructure(vm, globalObject, jsTarget->getPrototypeDirect(vm));
     JSProxy* proxy = JSProxy::create(vm, structure, jsTarget);
     return JSValue::encode(proxy);

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-03-02  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] Remove ImpureProxyType
+        https://bugs.webkit.org/show_bug.cgi?id=222626
+
+        Reviewed by Alexey Shvayka.
+
+        * workers/WorkerOrWorkletScriptController.cpp:
+        (WebCore::WorkerOrWorkletScriptController::initScriptWithSubclass):
+
 2021-03-02  Sam Weinig  <weinig@apple.com>
 

trunk/Source/WebCore/workers/WorkerOrWorkletScriptController.cpp

@@ -489 +489 @@
     auto* contextPrototype = JSGlobalScopePrototype::create(*m_vm, nullptr, contextPrototypeStructure);
     Structure* structure = JSGlobalScope::createStructure(*m_vm, nullptr, contextPrototype);
-    auto* proxyStructure = JSProxy::createStructure(*m_vm, nullptr, jsNull(), PureForwardingProxyType);
+    auto* proxyStructure = JSProxy::createStructure(*m_vm, nullptr, jsNull());
     auto* proxy = JSProxy::create(*m_vm, proxyStructure);