Changeset 254447 in webkit

Timestamp:

Jan 13, 2020 1:28:45 PM (4 years ago)

Author:

ysuzuki@apple.com

Message:

[JSC] Put JSProxy in IsoSubspace
​https://bugs.webkit.org/show_bug.cgi?id=206187

Reviewed by Mark Lam.

1. Put JSProxy in IsoSubspace.
2. Make JSProxy non-destructible since derived class JSWindowProxy is having its own IsoSubspace with destructibility.

• CMakeLists.txt:
• JavaScriptCore.xcodeproj/project.pbxproj:
• Sources.txt:
• runtime/JSGlobalObject.cpp:

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

• runtime/JSNonDestructibleProxy.cpp: Removed.
• runtime/JSNonDestructibleProxy.h: Removed.
• runtime/JSProxy.h:

(JSC::JSProxy::subspaceFor):

• runtime/JSStringIterator.h:
• runtime/VM.cpp:

(JSC::VM::VM):

• runtime/VM.h:

Location:

trunk/Source/JavaScriptCore

Files:

• CMakeLists.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• JavaScriptCore.xcodeproj/project.pbxproj (modified) (4 diffs)
• Sources.txt (modified) (1 diff)
• runtime/JSGlobalObject.cpp (modified) (3 diffs)
• runtime/JSNonDestructibleProxy.cpp (deleted)
• runtime/JSNonDestructibleProxy.h (deleted)
• runtime/JSProxy.h (modified) (1 diff)
• runtime/JSStringIterator.h (modified) (1 diff)
• runtime/VM.cpp (modified) (2 diffs)
• runtime/VM.h (modified) (1 diff)

trunk/Source/JavaScriptCore/CMakeLists.txt

@@ -901 +901 @@
     runtime/JSModuleRecord.h
     runtime/JSNativeStdFunction.h
-    runtime/JSNonDestructibleProxy.h
     runtime/JSONObject.h
     runtime/JSObject.h

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2020-01-13  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] Put JSProxy in IsoSubspace
+        https://bugs.webkit.org/show_bug.cgi?id=206187
+
+        Reviewed by Mark Lam.
+
+        1. Put JSProxy in IsoSubspace.
+        2. Make JSProxy non-destructible since derived class JSWindowProxy is having its own IsoSubspace with destructibility.
+
+        * CMakeLists.txt:
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+        * Sources.txt:
+        * runtime/JSGlobalObject.cpp:
+        (JSC::JSGlobalObject::resetPrototype):
+        (JSC::JSGlobalObject::finishCreation):
+        * runtime/JSNonDestructibleProxy.cpp: Removed.
+        * runtime/JSNonDestructibleProxy.h: Removed.
+        * runtime/JSProxy.h:
+        (JSC::JSProxy::subspaceFor):
+        * runtime/JSStringIterator.h:
+        * runtime/VM.cpp:
+        (JSC::VM::VM):
+        * runtime/VM.h:
+
 2020-01-11  Keith Miller  <keith_miller@apple.com>
 

trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -1822 +1822 @@
                 E38652E3237CA0C900E1D5EE /* BlockDirectoryBits.h in Headers */ = {isa = PBXBuildFile; fileRef = E38652E2237CA0C800E1D5EE /* BlockDirectoryBits.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 E3893A1D2203A7C600E79A74 /* AsyncFromSyncIteratorPrototype.lut.h in Headers */ = {isa = PBXBuildFile; fileRef = E3893A1C2203A7C600E79A74 /* AsyncFromSyncIteratorPrototype.lut.h */; };
-                E38D999C221B78BB00D50474 /* JSNonDestructibleProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = E38D999A221B789F00D50474 /* JSNonDestructibleProxy.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 E39006212208BFC4001019CF /* SubspaceAccess.h in Headers */ = {isa = PBXBuildFile; fileRef = E39006202208BFC3001019CF /* SubspaceAccess.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 E393ADD81FE702D00022D681 /* WeakMapImplInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = E393ADD71FE702CC0022D681 /* WeakMapImplInlines.h */; };
@@ -4970 +4969 @@
                 E38D060C1F8E814100649CF2 /* ScriptFetchParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptFetchParameters.h; sourceTree = "<group>"; };
                 E38D060D1F8E814100649CF2 /* JSScriptFetchParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSScriptFetchParameters.cpp; sourceTree = "<group>"; };
-                E38D999A221B789F00D50474 /* JSNonDestructibleProxy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JSNonDestructibleProxy.h; sourceTree = "<group>"; };
-                E38D999B221B789F00D50474 /* JSNonDestructibleProxy.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = JSNonDestructibleProxy.cpp; sourceTree = "<group>"; };
                 E39006202208BFC3001019CF /* SubspaceAccess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SubspaceAccess.h; sourceTree = "<group>"; };
                 E3915C062309682900CB2561 /* WasmContext.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WasmContext.cpp; sourceTree = "<group>"; };
@@ -7325 +7322 @@
                                 E33E8D1A1B9013C300346B52 /* JSNativeStdFunction.cpp */,
                                 E33E8D1B1B9013C300346B52 /* JSNativeStdFunction.h */,
-                                E38D999B221B789F00D50474 /* JSNonDestructibleProxy.cpp */,
-                                E38D999A221B789F00D50474 /* JSNonDestructibleProxy.h */,
                                 BC22A3980E16E14800AF21C8 /* JSObject.cpp */,
                                 BC22A3990E16E14800AF21C8 /* JSObject.h */,
@@ -9810 +9805 @@
                                 E39DA4A71B7E8B7C0084F33A /* JSModuleRecord.h in Headers */,
                                 E33E8D1D1B9013C300346B52 /* JSNativeStdFunction.h in Headers */,
-                                E38D999C221B78BB00D50474 /* JSNonDestructibleProxy.h in Headers */,
                                 BC18C4240E16F5CD00B34460 /* JSObject.h in Headers */,
                                 0F93275F1C21EF7F00CF6564 /* JSObjectInlines.h in Headers */,

trunk/Source/JavaScriptCore/Sources.txt

@@ -855 +855 @@
 runtime/JSModuleRecord.cpp
 runtime/JSNativeStdFunction.cpp
-runtime/JSNonDestructibleProxy.cpp
 runtime/JSONObject.cpp
 runtime/JSObject.cpp

trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp

@@ -111 +111 @@
 #include "JSModuleRecord.h"
 #include "JSNativeStdFunction.h"
-#include "JSNonDestructibleProxy.h"
 #include "JSONObject.h"
 #include "JSPromise.h"
@@ -1707 +1706 @@
     fixupPrototypeChainWithObjectPrototype(vm);
     // Whenever we change the prototype of the global object, we need to create a new JSProxy with the correct prototype.
-    setGlobalThis(vm, JSNonDestructibleProxy::create(vm, JSNonDestructibleProxy::createStructure(vm, this, prototype, PureForwardingProxyType), this));
+    setGlobalThis(vm, JSProxy::create(vm, JSProxy::createStructure(vm, this, prototype, PureForwardingProxyType), this));
 }
 
@@ -2211 +2210 @@
     m_runtimeFlags = m_globalObjectMethodTable->javaScriptRuntimeFlags(this);
     init(vm);
-    setGlobalThis(vm, JSNonDestructibleProxy::create(vm, JSNonDestructibleProxy::createStructure(vm, this, getPrototypeDirect(vm), PureForwardingProxyType), this));
+    setGlobalThis(vm, JSProxy::create(vm, JSProxy::createStructure(vm, this, getPrototypeDirect(vm), PureForwardingProxyType), this));
     ASSERT(type() == GlobalObjectType);
 }

trunk/Source/JavaScriptCore/runtime/JSProxy.h

@@ -26 +26 @@
 #pragma once
 
-#include "JSDestructibleObject.h"
+#include "JSObject.h"
 
 namespace JSC {
 
-class JSProxy : public JSDestructibleObject {
+class JSProxy : public JSNonFinalObject {
 public:
-    using Base = JSDestructibleObject;
+    using Base = JSNonFinalObject;
     static constexpr unsigned StructureFlags = Base::StructureFlags | OverridesGetOwnPropertySlot | OverridesGetPropertyNames | InterceptsGetOwnPropertySlotByIndexEvenWhenLengthIsNotZero;
+
+    template<typename CellType, SubspaceAccess>
+    static IsoSubspace* subspaceFor(VM& vm)
+    {
+        static_assert(sizeof(CellType) == sizeof(JSProxy));
+        return &vm.jsProxySpace;
+    }
 
     static JSProxy* create(VM& vm, Structure* structure, JSObject* target)

trunk/Source/JavaScriptCore/runtime/JSStringIterator.h

@@ -26 +26 @@
 #pragma once
 
-#include "JSObject.h"
+#include "JSInternalFieldObjectImpl.h"
 
 namespace JSC {

trunk/Source/JavaScriptCore/runtime/VM.cpp

@@ -112 +112 @@
 #include "JSPromise.h"
 #include "JSPropertyNameEnumerator.h"
+#include "JSProxy.h"
 #include "JSScriptFetchParameters.h"
 #include "JSScriptFetcher.h"
@@ -370 +371 @@
     , globalLexicalEnvironmentSpace ISO_SUBSPACE_INIT(heap, globalLexicalEnvironmentHeapCellType.get(), JSGlobalLexicalEnvironment)
     , internalFunctionSpace ISO_SUBSPACE_INIT(heap, cellHeapCellType.get(), InternalFunction) // Hash:0xf845c464
+    , jsProxySpace ISO_SUBSPACE_INIT(heap, cellHeapCellType.get(), JSProxy)
     , nativeExecutableSpace ISO_SUBSPACE_INIT(heap, destructibleCellHeapCellType.get(), NativeExecutable) // Hash:0x67567f95
     , numberObjectSpace ISO_SUBSPACE_INIT(heap, cellHeapCellType.get(), NumberObject)

trunk/Source/JavaScriptCore/runtime/VM.h

@@ -453 +453 @@
     IsoSubspace globalLexicalEnvironmentSpace;
     IsoSubspace internalFunctionSpace;
+    IsoSubspace jsProxySpace;
     IsoSubspace nativeExecutableSpace;
     IsoSubspace numberObjectSpace;