Changeset 252421 in webkit

Timestamp:

Nov 13, 2019, 11:40:11 AM (7 years ago)

Author:

ysuzuki@apple.com

Message:

[JSC] Put more into IsoSubspace part 2
​https://bugs.webkit.org/show_bug.cgi?id=204144

Reviewed by Mark Lam.

We are doing this step by step to carefully watch the bot status.
This patch puts following things into IsoSubspace.

1. FunctionRareData
2. ProxyObject
3. SparseArrayValueMap

• runtime/FunctionRareData.h:
• runtime/ProxyObject.h:
• runtime/SparseArrayValueMap.h:
• runtime/VM.cpp:

(JSC::VM::VM):

• runtime/VM.h:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/FunctionRareData.h (modified) (1 diff)
• runtime/ProxyObject.h (modified) (1 diff)
• runtime/SparseArrayValueMap.h (modified) (2 diffs)
• runtime/VM.cpp (modified) (2 diffs)
• runtime/VM.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-11-13  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] Put more into IsoSubspace part 2
+        https://bugs.webkit.org/show_bug.cgi?id=204144
+
+        Reviewed by Mark Lam.
+
+        We are doing this step by step to carefully watch the bot status.
+        This patch puts following things into IsoSubspace.
+
+            1. FunctionRareData
+            2. ProxyObject
+            3. SparseArrayValueMap
+
+        * runtime/FunctionRareData.h:
+        * runtime/ProxyObject.h:
+        * runtime/SparseArrayValueMap.h:
+        * runtime/VM.cpp:
+        (JSC::VM::VM):
+        * runtime/VM.h:
+
 2019-11-13  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/JavaScriptCore/runtime/FunctionRareData.h

@@ -54 +54 @@
 
     static constexpr bool needsDestruction = true;
+
+    template<typename CellType, SubspaceAccess mode>
+    static IsoSubspace* subspaceFor(VM& vm)
+    {
+        return vm.functionRareDataSpace<mode>();
+    }
+
     static void destroy(JSCell*);
 

trunk/Source/JavaScriptCore/runtime/ProxyObject.h

@@ -36 +36 @@
 
     static constexpr unsigned StructureFlags = Base::StructureFlags | OverridesGetOwnPropertySlot | OverridesGetCallData | InterceptsGetOwnPropertySlotByIndexEvenWhenLengthIsNotZero | OverridesGetPropertyNames | ProhibitsPropertyCaching;
+
+    template<typename CellType, SubspaceAccess mode>
+    static IsoSubspace* subspaceFor(VM& vm)
+    {
+        return vm.proxyObjectSpace<mode>();
+    }
 
     static ProxyObject* create(JSGlobalObject* globalObject, JSValue target, JSValue handler)

trunk/Source/JavaScriptCore/runtime/SparseArrayValueMap.h

@@ -30 +30 @@
 #include "PropertyDescriptor.h"
 #include "PutDirectIndexMode.h"
+#include "VM.h"
 #include "WriteBarrier.h"
 #include <wtf/HashMap.h>
@@ -106 +107 @@
     static constexpr bool needsDestruction = true;
     static void destroy(JSCell*);
+
+    template<typename CellType, SubspaceAccess>
+    static IsoSubspace* subspaceFor(VM& vm)
+    {
+        return &vm.sparseArrayValueMapSpace;
+    }
     
     static Structure* createStructure(VM&, JSGlobalObject*, JSValue prototype);

trunk/Source/JavaScriptCore/runtime/VM.cpp

@@ -282 +282 @@
     , nativeExecutableSpace ISO_SUBSPACE_INIT(heap, destructibleCellHeapCellType.get(), NativeExecutable) // Hash:0x67567f95
     , propertyTableSpace ISO_SUBSPACE_INIT(heap, destructibleCellHeapCellType.get(), PropertyTable) // Hash:0xc6bc9f12
+    , ropeStringSpace ISO_SUBSPACE_INIT(heap, stringHeapCellType.get(), JSRopeString)
+    , sparseArrayValueMapSpace ISO_SUBSPACE_INIT(heap, destructibleCellHeapCellType.get(), SparseArrayValueMap)
     , stringSpace ISO_SUBSPACE_INIT(heap, stringHeapCellType.get(), JSString) // Hash:0x90cf758f
-    , ropeStringSpace ISO_SUBSPACE_INIT(heap, stringHeapCellType.get(), JSRopeString)
     , structureRareDataSpace ISO_SUBSPACE_INIT(heap, destructibleCellHeapCellType.get(), StructureRareData) // Hash:0xaca4e62d
     , structureSpace ISO_SUBSPACE_INIT(heap, destructibleCellHeapCellType.get(), Structure) // Hash:0x1f1bcdca
@@ -1294 +1295 @@
 DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER_SLOW(customGetterSetterFunctionSpace, cellHeapCellType.get(), JSCustomGetterSetterFunction) // Hash:0x18091000
 DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER_SLOW(errorInstanceSpace, destructibleObjectHeapCellType.get(), ErrorInstance) // Hash:0x3f40d4a
+DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER_SLOW(functionRareDataSpace, destructibleCellHeapCellType.get(), FunctionRareData)
 DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER_SLOW(nativeStdFunctionSpace, cellHeapCellType.get(), JSNativeStdFunction) // Hash:0x70ed61e4
+DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER_SLOW(proxyObjectSpace, cellHeapCellType.get(), ProxyObject)
 DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER_SLOW(proxyRevokeSpace, destructibleObjectHeapCellType.get(), ProxyRevoke) // Hash:0xb506a939
 DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER_SLOW(symbolSpace, destructibleCellHeapCellType.get(), Symbol)

trunk/Source/JavaScriptCore/runtime/VM.h

@@ -383 +383 @@
     IsoSubspace nativeExecutableSpace;
     IsoSubspace propertyTableSpace;
+    IsoSubspace ropeStringSpace;
+    IsoSubspace sparseArrayValueMapSpace;
     IsoSubspace stringSpace;
-    IsoSubspace ropeStringSpace;
     IsoSubspace structureRareDataSpace;
     IsoSubspace structureSpace;
@@ -397 +398 @@
         return name##Slow(); \
     } \
-    IsoSubspace* name##Slow(); \
+    JS_EXPORT_PRIVATE IsoSubspace* name##Slow(); \
     std::unique_ptr<IsoSubspace> m_##name;
 
@@ -408 +409 @@
     DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER(customGetterSetterFunctionSpace)
     DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER(errorInstanceSpace)
+    DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER(functionRareDataSpace)
     DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER(nativeStdFunctionSpace)
+    DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER(proxyObjectSpace)
     DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER(proxyRevokeSpace)
     DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER(symbolSpace)