Diff
Modified: trunk/Source/_javascript_Core/API/JSCallbackFunction.h (240964 => 240965)
--- trunk/Source/_javascript_Core/API/JSCallbackFunction.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/API/JSCallbackFunction.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -37,10 +37,10 @@
public:
typedef InternalFunction Base;
- template<typename CellType>
+ template<typename CellType, SubspaceAccess mode>
static IsoSubspace* subspaceFor(VM& vm)
{
- return &vm.callbackFunctionSpace;
+ return vm.callbackFunctionSpace<mode>();
}
static JSCallbackFunction* create(VM&, JSGlobalObject*, JSObjectCallAsFunctionCallback, const String& name);
Modified: trunk/Source/_javascript_Core/API/ObjCCallbackFunction.h (240964 => 240965)
--- trunk/Source/_javascript_Core/API/ObjCCallbackFunction.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/API/ObjCCallbackFunction.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -48,10 +48,10 @@
public:
typedef InternalFunction Base;
- template<typename CellType>
+ template<typename CellType, SubspaceAccess mode>
static IsoSubspace* subspaceFor(VM& vm)
{
- return &vm.objCCallbackFunctionSpace;
+ return vm.objCCallbackFunctionSpace<mode>();
}
static ObjCCallbackFunction* create(VM&, JSGlobalObject*, const String& name, std::unique_ptr<ObjCCallbackFunctionImpl>);
Modified: trunk/Source/_javascript_Core/API/glib/JSCCallbackFunction.h (240964 => 240965)
--- trunk/Source/_javascript_Core/API/glib/JSCCallbackFunction.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/API/glib/JSCCallbackFunction.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -40,7 +40,7 @@
public:
typedef InternalFunction Base;
- template<typename CellType>
+ template<typename CellType, SubspaceAccess>
static IsoSubspace* subspaceFor(VM& vm)
{
return subspaceForImpl(vm);
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (240964 => 240965)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2019-02-05 06:32:08 UTC (rev 240965)
@@ -937,6 +937,7 @@
runtime/StructureRareData.h
runtime/StructureRareDataInlines.h
runtime/StructureTransitionTable.h
+ runtime/SubspaceAccess.h
runtime/Symbol.h
runtime/SymbolPrototype.h
runtime/SymbolTable.h
Modified: trunk/Source/_javascript_Core/ChangeLog (240964 => 240965)
--- trunk/Source/_javascript_Core/ChangeLog 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/ChangeLog 2019-02-05 06:32:08 UTC (rev 240965)
@@ -1,3 +1,139 @@
+2019-02-04 Yusuke Suzuki <[email protected]>
+
+ [JSC] Shrink size of VM by lazily allocating IsoSubspaces for non-common types
+ https://bugs.webkit.org/show_bug.cgi?id=193993
+
+ Reviewed by Keith Miller.
+
+ JSC::VM has a lot of IsoSubspaces, and each takes 504B. This unnecessarily makes VM so large.
+ And some of them are rarely used. We should allocate it lazily.
+
+ In this patch, we make some `IsoSubspaces` `std::unique_ptr<IsoSubspace>`. And we add ensureXXXSpace
+ functions which allocate IsoSubspaces lazily. This function is used by subspaceFor<> in each class.
+ And we also add subspaceForConcurrently<> function, which is called from concurrent JIT tiers. This
+ returns nullptr if the subspace is not allocated yet. JSCell::subspaceFor now takes second template
+ parameter which tells the function whether subspaceFor is concurrently done. If the IsoSubspace is
+ lazily created, we may return nullptr for the concurrent access. We ensure the space's initialization
+ by using WTF::storeStoreFence when lazily allocating it.
+
+ In GC's constraint solving, we may touch these lazily allocated spaces. At that time, we check the
+ existence of the space before touching this. This is not racy because the main thread is stopped when
+ the constraint solving is working.
+
+ This changes sizeof(VM) from 64736 to 56472.
+
+ Another interesting thing is that we removed `PreventCollectionScope preventCollectionScope(heap);` in
+ `Subspace::initialize`. This is really dangerous API since it easily causes dead-lock between the
+ collector and the mutator if IsoSubspace is dynamically created. We do want to make IsoSubspaces
+ dynamically-created ones since the requirement of the pre-allocation poses a scalability problem
+ of IsoSubspace adoption because IsoSubspace is large. Registered Subspace is only touched in the
+ EndPhase, and the peripheries should be stopped when running EndPhase. Thus, as long as the main thread
+ can run this IsoSubspace code, the collector is never EndPhase. So this is safe.
+
+ * API/JSCallbackFunction.h:
+ * API/ObjCCallbackFunction.h:
+ (JSC::ObjCCallbackFunction::subspaceFor):
+ * API/glib/JSCCallbackFunction.h:
+ * CMakeLists.txt:
+ * _javascript_Core.xcodeproj/project.pbxproj:
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::visitChildren):
+ (JSC::CodeBlock::finalizeUnconditionally):
+ * bytecode/CodeBlock.h:
+ * bytecode/EvalCodeBlock.h:
+ * bytecode/ExecutableToCodeBlockEdge.h:
+ * bytecode/FunctionCodeBlock.h:
+ * bytecode/ModuleProgramCodeBlock.h:
+ * bytecode/ProgramCodeBlock.h:
+ * bytecode/UnlinkedFunctionExecutable.cpp:
+ (JSC::UnlinkedFunctionExecutable::unlinkedCodeBlockFor):
+ * bytecode/UnlinkedFunctionExecutable.h:
+ * dfg/DFGSpeculativeJIT.cpp:
+ (JSC::DFG::SpeculativeJIT::emitAllocateRawObject):
+ (JSC::DFG::SpeculativeJIT::compileMakeRope):
+ (JSC::DFG::SpeculativeJIT::compileNewObject):
+ * ftl/FTLLowerDFGToB3.cpp:
+ (JSC::FTL::DFG::LowerDFGToB3::compileMakeRope):
+ (JSC::FTL::DFG::LowerDFGToB3::compileMaterializeNewObject):
+ (JSC::FTL::DFG::LowerDFGToB3::allocateObject):
+ (JSC::FTL::DFG::LowerDFGToB3::allocateVariableSizedObject):
+ (JSC::FTL::DFG::LowerDFGToB3::allocateVariableSizedCell):
+ * heap/Heap.cpp:
+ (JSC::Heap::finalizeUnconditionalFinalizers):
+ (JSC::Heap::deleteAllCodeBlocks):
+ (JSC::Heap::deleteAllUnlinkedCodeBlocks):
+ (JSC::Heap::addCoreConstraints):
+ * heap/Subspace.cpp:
+ (JSC::Subspace::initialize):
+ * jit/AssemblyHelpers.h:
+ (JSC::AssemblyHelpers::emitAllocateJSObjectWithKnownSize):
+ (JSC::AssemblyHelpers::emitAllocateVariableSizedCell):
+ * jit/JITOpcodes.cpp:
+ (JSC::JIT::emit_op_new_object):
+ * jit/JITOpcodes32_64.cpp:
+ (JSC::JIT::emit_op_new_object):
+ * runtime/DirectArguments.h:
+ * runtime/DirectEvalExecutable.h:
+ * runtime/ErrorInstance.h:
+ (JSC::ErrorInstance::subspaceFor):
+ * runtime/ExecutableBase.h:
+ * runtime/FunctionExecutable.h:
+ * runtime/IndirectEvalExecutable.h:
+ * runtime/InferredValue.cpp:
+ (JSC::InferredValue::visitChildren):
+ * runtime/InferredValue.h:
+ * runtime/InferredValueInlines.h:
+ (JSC::InferredValue::finalizeUnconditionally):
+ * runtime/InternalFunction.h:
+ * runtime/JSAsyncFunction.h:
+ * runtime/JSAsyncGeneratorFunction.h:
+ * runtime/JSBoundFunction.h:
+ * runtime/JSCell.h:
+ (JSC::subspaceFor):
+ (JSC::subspaceForConcurrently):
+ * runtime/JSCellInlines.h:
+ (JSC::allocatorForNonVirtualConcurrently):
+ * runtime/JSCustomGetterSetterFunction.h:
+ * runtime/JSDestructibleObject.h:
+ * runtime/JSFunction.h:
+ * runtime/JSGeneratorFunction.h:
+ * runtime/JSImmutableButterfly.h:
+ * runtime/JSLexicalEnvironment.h:
+ (JSC::JSLexicalEnvironment::subspaceFor):
+ * runtime/JSNativeStdFunction.h:
+ * runtime/JSSegmentedVariableObject.h:
+ * runtime/JSString.h:
+ * runtime/ModuleProgramExecutable.h:
+ * runtime/NativeExecutable.h:
+ * runtime/ProgramExecutable.h:
+ * runtime/PropertyMapHashTable.h:
+ * runtime/ProxyRevoke.h:
+ * runtime/ScopedArguments.h:
+ * runtime/ScriptExecutable.cpp:
+ (JSC::ScriptExecutable::clearCode):
+ (JSC::ScriptExecutable::installCode):
+ * runtime/Structure.h:
+ * runtime/StructureRareData.h:
+ * runtime/SubspaceAccess.h: Copied from Source/_javascript_Core/runtime/InferredValueInlines.h.
+ * runtime/VM.cpp:
+ (JSC::VM::VM):
+ * runtime/VM.h:
+ (JSC::VM::SpaceAndSet::SpaceAndSet):
+ (JSC::VM::SpaceAndSet::setFor):
+ (JSC::VM::forEachScriptExecutableSpace):
+ (JSC::VM::SpaceAndFinalizerSet::SpaceAndFinalizerSet): Deleted.
+ (JSC::VM::SpaceAndFinalizerSet::finalizerSetFor): Deleted.
+ (JSC::VM::ScriptExecutableSpaceAndSet::ScriptExecutableSpaceAndSet): Deleted.
+ (JSC::VM::ScriptExecutableSpaceAndSet::clearableCodeSetFor): Deleted.
+ (JSC::VM::UnlinkedFunctionExecutableSpaceAndSet::UnlinkedFunctionExecutableSpaceAndSet): Deleted.
+ (JSC::VM::UnlinkedFunctionExecutableSpaceAndSet::clearableCodeSetFor): Deleted.
+ * runtime/WeakMapImpl.h:
+ (JSC::WeakMapImpl::subspaceFor):
+ * wasm/js/JSWebAssemblyCodeBlock.h:
+ * wasm/js/JSWebAssemblyMemory.h:
+ * wasm/js/WebAssemblyFunction.h:
+ * wasm/js/WebAssemblyWrapperFunction.h:
+
2019-02-04 Keith Miller <[email protected]>
Change llint operand macros to inline functions
Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (240964 => 240965)
--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2019-02-05 06:32:08 UTC (rev 240965)
@@ -1765,6 +1765,7 @@
E36CC9472086314F0051FFD6 /* WasmCreationMode.h in Headers */ = {isa = PBXBuildFile; fileRef = E36CC9462086314F0051FFD6 /* WasmCreationMode.h */; settings = {ATTRIBUTES = (Private, ); }; };
E3794E761B77EB97005543AE /* ModuleAnalyzer.h in Headers */ = {isa = PBXBuildFile; fileRef = E3794E741B77EB97005543AE /* ModuleAnalyzer.h */; settings = {ATTRIBUTES = (Private, ); }; };
E3893A1D2203A7C600E79A74 /* AsyncFromSyncIteratorPrototype.lut.h in Headers */ = {isa = PBXBuildFile; fileRef = E3893A1C2203A7C600E79A74 /* AsyncFromSyncIteratorPrototype.lut.h */; };
+ 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 */; };
E39D45F51D39005600B3B377 /* InterpreterInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = E39D9D841D39000600667282 /* InterpreterInlines.h */; settings = {ATTRIBUTES = (Private, ); }; };
E39DA4A71B7E8B7C0084F33A /* JSModuleRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = E39DA4A51B7E8B7C0084F33A /* JSModuleRecord.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -4703,10 +4704,11 @@
E3794E741B77EB97005543AE /* ModuleAnalyzer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModuleAnalyzer.h; sourceTree = "<group>"; };
E380A76B1DCD7195000F89E6 /* MacroAssemblerHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MacroAssemblerHelpers.h; sourceTree = "<group>"; };
E380D66B1F19249D00A59095 /* BuiltinNames.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BuiltinNames.cpp; sourceTree = "<group>"; };
- E3893A1C2203A7C600E79A74 /* AsyncFromSyncIteratorPrototype.lut.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AsyncFromSyncIteratorPrototype.lut.h; path = AsyncFromSyncIteratorPrototype.lut.h; sourceTree = "<group>"; };
+ E3893A1C2203A7C600E79A74 /* AsyncFromSyncIteratorPrototype.lut.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AsyncFromSyncIteratorPrototype.lut.h; sourceTree = "<group>"; };
E38D060B1F8E814100649CF2 /* JSScriptFetchParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSScriptFetchParameters.h; sourceTree = "<group>"; };
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>"; };
+ E39006202208BFC3001019CF /* SubspaceAccess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SubspaceAccess.h; sourceTree = "<group>"; };
E393ADD71FE702CC0022D681 /* WeakMapImplInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WeakMapImplInlines.h; sourceTree = "<group>"; };
E3963CEC1B73F75000EB4CE5 /* NodesAnalyzeModule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NodesAnalyzeModule.cpp; sourceTree = "<group>"; };
E39D9D841D39000600667282 /* InterpreterInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InterpreterInlines.h; sourceTree = "<group>"; };
@@ -7164,6 +7166,7 @@
C2FE18A316BAEC4000AF3061 /* StructureRareData.h */,
C20BA92C16BB1C1500B3AEA2 /* StructureRareDataInlines.h */,
BC9041470EB9250900FE26FA /* StructureTransitionTable.h */,
+ E39006202208BFC3001019CF /* SubspaceAccess.h */,
705B41A31A6E501E00716757 /* Symbol.cpp */,
705B41A41A6E501E00716757 /* Symbol.h */,
705B41A51A6E501E00716757 /* SymbolConstructor.cpp */,
@@ -9692,6 +9695,7 @@
BC9041480EB9250900FE26FA /* StructureTransitionTable.h in Headers */,
0F44767020C5E2B4008B2C36 /* StubInfoSummary.h in Headers */,
0F7DF1371E2970E10095951B /* Subspace.h in Headers */,
+ E39006212208BFC4001019CF /* SubspaceAccess.h in Headers */,
0F7DF1381E2970E40095951B /* SubspaceInlines.h in Headers */,
0F4A38FA1C8E13DF00190318 /* SuperSampler.h in Headers */,
530A66CD1FB1346D0026A545 /* SuperSamplerBytecodeScope.h in Headers */,
Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp (240964 => 240965)
--- trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2019-02-05 06:32:08 UTC (rev 240965)
@@ -997,7 +997,7 @@
stronglyVisitStrongReferences(locker, visitor);
stronglyVisitWeakReferences(locker, visitor);
- VM::SpaceAndFinalizerSet::finalizerSetFor(*subspace()).add(this);
+ VM::SpaceAndSet::setFor(*subspace()).add(this);
}
bool CodeBlock::shouldVisitStrongly(const ConcurrentJSLocker& locker)
@@ -1392,7 +1392,7 @@
}
#endif // ENABLE(DFG_JIT)
- VM::SpaceAndFinalizerSet::finalizerSetFor(*subspace()).remove(this);
+ VM::SpaceAndSet::setFor(*subspace()).remove(this);
}
void CodeBlock::destroy(JSCell* cell)
Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.h (240964 => 240965)
--- trunk/Source/_javascript_Core/bytecode/CodeBlock.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -114,7 +114,7 @@
static const unsigned StructureFlags = Base::StructureFlags | StructureIsImmortal;
static const bool needsDestruction = true;
- template<typename>
+ template<typename, SubspaceAccess>
static void subspaceFor(VM&) { }
DECLARE_INFO;
Modified: trunk/Source/_javascript_Core/bytecode/EvalCodeBlock.h (240964 => 240965)
--- trunk/Source/_javascript_Core/bytecode/EvalCodeBlock.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/bytecode/EvalCodeBlock.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -38,7 +38,7 @@
typedef GlobalCodeBlock Base;
DECLARE_INFO;
- template<typename>
+ template<typename, SubspaceAccess>
static IsoSubspace* subspaceFor(VM& vm)
{
return &vm.codeBlockSpace.space;
Modified: trunk/Source/_javascript_Core/bytecode/ExecutableToCodeBlockEdge.h (240964 => 240965)
--- trunk/Source/_javascript_Core/bytecode/ExecutableToCodeBlockEdge.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/bytecode/ExecutableToCodeBlockEdge.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -40,7 +40,7 @@
typedef JSCell Base;
static const unsigned StructureFlags = Base::StructureFlags | StructureIsImmortal;
- template<typename CellType>
+ template<typename CellType, SubspaceAccess>
static IsoSubspace* subspaceFor(VM& vm)
{
return &vm.executableToCodeBlockEdgeSpace;
Modified: trunk/Source/_javascript_Core/bytecode/FunctionCodeBlock.h (240964 => 240965)
--- trunk/Source/_javascript_Core/bytecode/FunctionCodeBlock.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/bytecode/FunctionCodeBlock.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -39,7 +39,7 @@
typedef CodeBlock Base;
DECLARE_INFO;
- template<typename>
+ template<typename, SubspaceAccess>
static IsoSubspace* subspaceFor(VM& vm)
{
return &vm.codeBlockSpace.space;
Modified: trunk/Source/_javascript_Core/bytecode/ModuleProgramCodeBlock.h (240964 => 240965)
--- trunk/Source/_javascript_Core/bytecode/ModuleProgramCodeBlock.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/bytecode/ModuleProgramCodeBlock.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -39,7 +39,7 @@
typedef GlobalCodeBlock Base;
DECLARE_INFO;
- template<typename>
+ template<typename, SubspaceAccess>
static IsoSubspace* subspaceFor(VM& vm)
{
return &vm.codeBlockSpace.space;
Modified: trunk/Source/_javascript_Core/bytecode/ProgramCodeBlock.h (240964 => 240965)
--- trunk/Source/_javascript_Core/bytecode/ProgramCodeBlock.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/bytecode/ProgramCodeBlock.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -39,7 +39,7 @@
typedef GlobalCodeBlock Base;
DECLARE_INFO;
- template<typename>
+ template<typename, SubspaceAccess>
static IsoSubspace* subspaceFor(VM& vm)
{
return &vm.codeBlockSpace.space;
Modified: trunk/Source/_javascript_Core/bytecode/UnlinkedFunctionExecutable.cpp (240964 => 240965)
--- trunk/Source/_javascript_Core/bytecode/UnlinkedFunctionExecutable.cpp 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/bytecode/UnlinkedFunctionExecutable.cpp 2019-02-05 06:32:08 UTC (rev 240965)
@@ -237,7 +237,7 @@
m_unlinkedCodeBlockForConstruct.set(vm, this, result);
break;
}
- vm.unlinkedFunctionExecutableSpace.clearableCodeSet.add(this);
+ vm.unlinkedFunctionExecutableSpace.set.add(this);
return result;
}
Modified: trunk/Source/_javascript_Core/bytecode/UnlinkedFunctionExecutable.h (240964 => 240965)
--- trunk/Source/_javascript_Core/bytecode/UnlinkedFunctionExecutable.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/bytecode/UnlinkedFunctionExecutable.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -61,7 +61,7 @@
typedef JSCell Base;
static const unsigned StructureFlags = Base::StructureFlags | StructureIsImmortal;
- template<typename CellType>
+ template<typename CellType, SubspaceAccess>
static IsoSubspace* subspaceFor(VM& vm)
{
return &vm.unlinkedFunctionExecutableSpace.space;
@@ -120,7 +120,7 @@
{
m_unlinkedCodeBlockForCall.clear();
m_unlinkedCodeBlockForConstruct.clear();
- vm.unlinkedFunctionExecutableSpace.clearableCodeSet.remove(this);
+ vm.unlinkedFunctionExecutableSpace.set.remove(this);
}
void recordParse(CodeFeatures features, bool hasCapturedVariables)
Modified: trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp (240964 => 240965)
--- trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp 2019-02-05 06:32:08 UTC (rev 240965)
@@ -130,7 +130,7 @@
}
size_t allocationSize = JSFinalObject::allocationSize(inlineCapacity);
- Allocator allocator = subspaceFor<JSFinalObject>(*m_jit.vm())->allocatorForNonVirtual(allocationSize, AllocatorForMode::AllocatorIfExists);
+ Allocator allocator = allocatorForNonVirtualConcurrently<JSFinalObject>(*m_jit.vm(), allocationSize, AllocatorForMode::AllocatorIfExists);
if (allocator) {
emitAllocateJSObject(resultGPR, JITAllocator::constant(allocator), scratchGPR, TrustedImmPtr(structure), storageGPR, scratch2GPR, slowCases);
m_jit.emitInitializeInlineStorage(resultGPR, structure->inlineCapacity());
@@ -4359,7 +4359,7 @@
GPRReg scratchGPR = scratch.gpr();
JITCompiler::JumpList slowPath;
- Allocator allocatorValue = subspaceFor<JSRopeString>(*m_jit.vm())->allocatorForNonVirtual(sizeof(JSRopeString), AllocatorForMode::AllocatorIfExists);
+ Allocator allocatorValue = allocatorForNonVirtualConcurrently<JSRopeString>(*m_jit.vm(), sizeof(JSRopeString), AllocatorForMode::AllocatorIfExists);
emitAllocateJSCell(resultGPR, JITAllocator::constant(allocatorValue), allocatorGPR, TrustedImmPtr(m_jit.graph().registerStructure(m_jit.vm()->stringStructure.get())), scratchGPR, slowPath);
m_jit.storePtr(TrustedImmPtr(nullptr), JITCompiler::Address(resultGPR, JSString::offsetOfValue()));
@@ -12540,8 +12540,7 @@
RegisteredStructure structure = node->structure();
size_t allocationSize = JSFinalObject::allocationSize(structure->inlineCapacity());
- Allocator allocatorValue = subspaceFor<JSFinalObject>(*m_jit.vm())->allocatorForNonVirtual(allocationSize, AllocatorForMode::AllocatorIfExists);
-
+ Allocator allocatorValue = allocatorForNonVirtualConcurrently<JSFinalObject>(*m_jit.vm(), allocationSize, AllocatorForMode::AllocatorIfExists);
if (!allocatorValue)
slowPath.append(m_jit.jump());
else {
Modified: trunk/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp (240964 => 240965)
--- trunk/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp 2019-02-05 06:32:08 UTC (rev 240965)
@@ -6472,7 +6472,7 @@
LBasicBlock lastNext = m_out.insertNewBlocksBefore(slowPath);
- Allocator allocator = subspaceFor<JSRopeString>(vm())->allocatorForNonVirtual(sizeof(JSRopeString), AllocatorForMode::AllocatorIfExists);
+ Allocator allocator = allocatorForNonVirtualConcurrently<JSRopeString>(vm(), sizeof(JSRopeString), AllocatorForMode::AllocatorIfExists);
LValue result = allocateCell(
m_out.constIntPtr(allocator.localAllocator()), vm().stringStructure.get(), slowPath);
@@ -10723,7 +10723,7 @@
if (structure->outOfLineCapacity() || hasIndexedProperties(structure->indexingType())) {
size_t allocationSize = JSFinalObject::allocationSize(structure->inlineCapacity());
- Allocator cellAllocator = subspaceFor<JSFinalObject>(vm())->allocatorForNonVirtual(allocationSize, AllocatorForMode::AllocatorIfExists);
+ Allocator cellAllocator = allocatorForNonVirtualConcurrently<JSFinalObject>(vm(), allocationSize, AllocatorForMode::AllocatorIfExists);
bool hasIndexingHeader = hasIndexedProperties(structure->indexingType());
unsigned indexingHeaderSize = 0;
@@ -13190,7 +13190,7 @@
LValue allocateObject(
size_t size, StructureType structure, LValue butterfly, LBasicBlock slowPath)
{
- Allocator allocator = subspaceFor<ClassType>(vm())->allocatorForNonVirtual(size, AllocatorForMode::AllocatorIfExists);
+ Allocator allocator = allocatorForNonVirtualConcurrently<ClassType>(vm(), size, AllocatorForMode::AllocatorIfExists);
return allocateObject(
m_out.constIntPtr(allocator.localAllocator()), structure, butterfly, slowPath);
}
@@ -13254,7 +13254,9 @@
LValue allocateVariableSizedObject(
LValue size, RegisteredStructure structure, LValue butterfly, LBasicBlock slowPath)
{
- LValue allocator = allocatorForSize(*subspaceFor<ClassType>(vm()), size, slowPath);
+ CompleteSubspace* subspace = subspaceForConcurrently<ClassType>(vm());
+ RELEASE_ASSERT_WITH_MESSAGE(subspace, "CompleteSubspace is always allocated");
+ LValue allocator = allocatorForSize(*subspace, size, slowPath);
return allocateObject(allocator, structure, butterfly, slowPath);
}
@@ -13262,7 +13264,9 @@
LValue allocateVariableSizedCell(
LValue size, Structure* structure, LBasicBlock slowPath)
{
- LValue allocator = allocatorForSize(*subspaceFor<ClassType>(vm()), size, slowPath);
+ CompleteSubspace* subspace = subspaceForConcurrently<ClassType>(vm());
+ RELEASE_ASSERT_WITH_MESSAGE(subspace, "CompleteSubspace is always allocated");
+ LValue allocator = allocatorForSize(*subspace, size, slowPath);
return allocateCell(allocator, structure, slowPath);
}
@@ -13269,7 +13273,7 @@
LValue allocateObject(RegisteredStructure structure)
{
size_t allocationSize = JSFinalObject::allocationSize(structure.get()->inlineCapacity());
- Allocator allocator = subspaceFor<JSFinalObject>(vm())->allocatorForNonVirtual(allocationSize, AllocatorForMode::AllocatorIfExists);
+ Allocator allocator = allocatorForNonVirtualConcurrently<JSFinalObject>(vm(), allocationSize, AllocatorForMode::AllocatorIfExists);
// FIXME: If the allocator is null, we could simply emit a normal C call to the allocator
// instead of putting it on the slow path.
Modified: trunk/Source/_javascript_Core/heap/AlignedMemoryAllocator.cpp (240964 => 240965)
--- trunk/Source/_javascript_Core/heap/AlignedMemoryAllocator.cpp 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/heap/AlignedMemoryAllocator.cpp 2019-02-05 06:32:08 UTC (rev 240965)
@@ -27,6 +27,7 @@
#include "AlignedMemoryAllocator.h"
#include "BlockDirectory.h"
+#include "Heap.h"
#include "Subspace.h"
namespace JSC {
@@ -44,6 +45,7 @@
RELEASE_ASSERT(!directory->nextDirectoryInAlignedMemoryAllocator());
if (m_directories.isEmpty()) {
+ ASSERT(!mayBeGCThread() || directory->heap()->worldIsStopped());
for (Subspace* subspace = m_subspaces.first(); subspace; subspace = subspace->nextSubspaceInAlignedMemoryAllocator())
subspace->didCreateFirstDirectory(directory);
}
Modified: trunk/Source/_javascript_Core/heap/Heap.cpp (240964 => 240965)
--- trunk/Source/_javascript_Core/heap/Heap.cpp 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/heap/Heap.cpp 2019-02-05 06:32:08 UTC (rev 240965)
@@ -567,18 +567,23 @@
void Heap::finalizeUnconditionalFinalizers()
{
- finalizeMarkedUnconditionalFinalizers<InferredValue>(vm()->inferredValuesWithFinalizers);
+ if (vm()->m_inferredValueSpace)
+ finalizeMarkedUnconditionalFinalizers<InferredValue>(vm()->m_inferredValueSpace->space);
vm()->forEachCodeBlockSpace(
[&] (auto& space) {
- this->finalizeMarkedUnconditionalFinalizers<CodeBlock>(space.finalizerSet);
+ this->finalizeMarkedUnconditionalFinalizers<CodeBlock>(space.set);
});
finalizeMarkedUnconditionalFinalizers<ExecutableToCodeBlockEdge>(vm()->executableToCodeBlockEdgesWithFinalizers);
- finalizeMarkedUnconditionalFinalizers<JSWeakSet>(vm()->weakSetSpace);
- finalizeMarkedUnconditionalFinalizers<JSWeakMap>(vm()->weakMapSpace);
- finalizeMarkedUnconditionalFinalizers<ErrorInstance>(vm()->errorInstanceSpace);
+ if (vm()->m_weakSetSpace)
+ finalizeMarkedUnconditionalFinalizers<JSWeakSet>(*vm()->m_weakSetSpace);
+ if (vm()->m_weakMapSpace)
+ finalizeMarkedUnconditionalFinalizers<JSWeakMap>(*vm()->m_weakMapSpace);
+ if (vm()->m_errorInstanceSpace)
+ finalizeMarkedUnconditionalFinalizers<ErrorInstance>(*vm()->m_errorInstanceSpace);
#if ENABLE(WEBASSEMBLY)
- finalizeMarkedUnconditionalFinalizers<JSWebAssemblyCodeBlock>(vm()->webAssemblyCodeBlockSpace);
+ if (vm()->m_webAssemblyCodeBlockSpace)
+ finalizeMarkedUnconditionalFinalizers<JSWebAssemblyCodeBlock>(*vm()->m_webAssemblyCodeBlockSpace);
#endif
}
@@ -880,11 +885,11 @@
vm.forEachScriptExecutableSpace(
[&] (auto& spaceAndSet) {
HeapIterationScope heapIterationScope(*this);
- auto& clearableCodeSet = spaceAndSet.clearableCodeSet;
- clearableCodeSet.forEachLiveCell(
+ auto& set = spaceAndSet.set;
+ set.forEachLiveCell(
[&] (HeapCell* cell, HeapCell::Kind) {
ScriptExecutable* executable = static_cast<ScriptExecutable*>(cell);
- executable->clearCode(clearableCodeSet);
+ executable->clearCode(set);
});
});
@@ -896,11 +901,13 @@
// points into a CodeBlock that could be dead. The IC will still succeed because
// it uses a callee check, but then it will call into dead code.
HeapIterationScope heapIterationScope(*this);
- vm.webAssemblyCodeBlockSpace.forEachLiveCell([&] (HeapCell* cell, HeapCell::Kind kind) {
- ASSERT_UNUSED(kind, kind == HeapCell::JSCell);
- JSWebAssemblyCodeBlock* codeBlock = static_cast<JSWebAssemblyCodeBlock*>(cell);
- codeBlock->clearJSCallICs(vm);
- });
+ if (vm.m_webAssemblyCodeBlockSpace) {
+ vm.m_webAssemblyCodeBlockSpace->forEachLiveCell([&] (HeapCell* cell, HeapCell::Kind kind) {
+ ASSERT_UNUSED(kind, kind == HeapCell::JSCell);
+ JSWebAssemblyCodeBlock* codeBlock = static_cast<JSWebAssemblyCodeBlock*>(cell);
+ codeBlock->clearJSCallICs(vm);
+ });
+ }
}
#endif
}
@@ -916,7 +923,7 @@
RELEASE_ASSERT(!m_collectionScope);
HeapIterationScope heapIterationScope(*this);
- vm.unlinkedFunctionExecutableSpace.clearableCodeSet.forEachLiveCell(
+ vm.unlinkedFunctionExecutableSpace.set.forEachLiveCell(
[&] (HeapCell* cell, HeapCell::Kind) {
UnlinkedFunctionExecutable* executable = static_cast<UnlinkedFunctionExecutable*>(cell);
executable->clearCode(vm);
@@ -2730,7 +2737,8 @@
};
add(vm.executableToCodeBlockEdgesWithConstraints);
- add(vm.weakMapSpace);
+ if (vm.m_weakMapSpace)
+ add(*vm.m_weakMapSpace);
},
ConstraintVolatility::GreyedByMarking,
ConstraintParallelism::Parallel);
Modified: trunk/Source/_javascript_Core/heap/MarkedSpace.cpp (240964 => 240965)
--- trunk/Source/_javascript_Core/heap/MarkedSpace.cpp 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/heap/MarkedSpace.cpp 2019-02-05 06:32:08 UTC (rev 240965)
@@ -258,6 +258,7 @@
void MarkedSpace::prepareForAllocation()
{
+ ASSERT(!mayBeGCThread() || m_heap->worldIsStopped());
for (Subspace* subspace : m_subspaces)
subspace->prepareForAllocation();
Modified: trunk/Source/_javascript_Core/heap/Subspace.cpp (240964 => 240965)
--- trunk/Source/_javascript_Core/heap/Subspace.cpp 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/heap/Subspace.cpp 2019-02-05 06:32:08 UTC (rev 240965)
@@ -50,7 +50,6 @@
m_directoryForEmptyAllocation = m_alignedMemoryAllocator->firstDirectory();
Heap& heap = *m_space.heap();
- PreventCollectionScope preventCollectionScope(heap);
heap.objectSpace().m_subspaces.append(this);
m_alignedMemoryAllocator->registerSubspace(this);
}
Modified: trunk/Source/_javascript_Core/jit/AssemblyHelpers.h (240964 => 240965)
--- trunk/Source/_javascript_Core/jit/AssemblyHelpers.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/jit/AssemblyHelpers.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -1752,7 +1752,7 @@
VM& vm, GPRReg resultGPR, StructureType structure, StorageType storage, GPRReg scratchGPR1,
GPRReg scratchGPR2, JumpList& slowPath, size_t size)
{
- Allocator allocator = subspaceFor<ClassType>(vm)->allocatorForNonVirtual(size, AllocatorForMode::AllocatorIfExists);
+ Allocator allocator = allocatorForNonVirtualConcurrently<ClassType>(vm, size, AllocatorForMode::AllocatorIfExists);
emitAllocateJSObject(resultGPR, JITAllocator::constant(allocator), scratchGPR1, structure, storage, scratchGPR2, slowPath);
}
@@ -1769,8 +1769,9 @@
template<typename ClassType, typename StructureType>
void emitAllocateVariableSizedCell(VM& vm, GPRReg resultGPR, StructureType structure, GPRReg allocationSize, GPRReg scratchGPR1, GPRReg scratchGPR2, JumpList& slowPath)
{
- CompleteSubspace& subspace = *subspaceFor<ClassType>(vm);
- emitAllocateVariableSized(resultGPR, subspace, allocationSize, scratchGPR1, scratchGPR2, slowPath);
+ CompleteSubspace* subspace = subspaceForConcurrently<ClassType>(vm);
+ RELEASE_ASSERT_WITH_MESSAGE(subspace, "CompleteSubspace is always allocated");
+ emitAllocateVariableSized(resultGPR, *subspace, allocationSize, scratchGPR1, scratchGPR2, slowPath);
emitStoreStructureWithTypeInfo(structure, resultGPR, scratchGPR2);
}
Modified: trunk/Source/_javascript_Core/jit/JITOpcodes.cpp (240964 => 240965)
--- trunk/Source/_javascript_Core/jit/JITOpcodes.cpp 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/jit/JITOpcodes.cpp 2019-02-05 06:32:08 UTC (rev 240965)
@@ -96,7 +96,7 @@
auto& metadata = bytecode.metadata(m_codeBlock);
Structure* structure = metadata.m_objectAllocationProfile.structure();
size_t allocationSize = JSFinalObject::allocationSize(structure->inlineCapacity());
- Allocator allocator = subspaceFor<JSFinalObject>(*m_vm)->allocatorForNonVirtual(allocationSize, AllocatorForMode::AllocatorIfExists);
+ Allocator allocator = allocatorForNonVirtualConcurrently<JSFinalObject>(*m_vm, allocationSize, AllocatorForMode::AllocatorIfExists);
RegisterID resultReg = regT0;
RegisterID allocatorReg = regT1;
Modified: trunk/Source/_javascript_Core/jit/JITOpcodes32_64.cpp (240964 => 240965)
--- trunk/Source/_javascript_Core/jit/JITOpcodes32_64.cpp 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/jit/JITOpcodes32_64.cpp 2019-02-05 06:32:08 UTC (rev 240965)
@@ -84,7 +84,7 @@
auto& metadata = bytecode.metadata(m_codeBlock);
Structure* structure = metadata.m_objectAllocationProfile.structure();
size_t allocationSize = JSFinalObject::allocationSize(structure->inlineCapacity());
- Allocator allocator = subspaceFor<JSFinalObject>(*m_vm)->allocatorForNonVirtual(allocationSize, AllocatorForMode::AllocatorIfExists);
+ Allocator allocator = allocatorForNonVirtualConcurrently<JSFinalObject>(*m_vm, allocationSize, AllocatorForMode::AllocatorIfExists);
RegisterID resultReg = returnValueGPR;
RegisterID allocatorReg = regT1;
Modified: trunk/Source/_javascript_Core/runtime/DirectArguments.h (240964 => 240965)
--- trunk/Source/_javascript_Core/runtime/DirectArguments.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/runtime/DirectArguments.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -46,10 +46,10 @@
DirectArguments(VM&, Structure*, unsigned length, unsigned capacity);
public:
- template<typename CellType>
+ template<typename CellType, SubspaceAccess>
static CompleteSubspace* subspaceFor(VM& vm)
{
- RELEASE_ASSERT(!CellType::needsDestruction);
+ static_assert(!CellType::needsDestruction, "");
return &vm.jsValueGigacageCellSpace;
}
Modified: trunk/Source/_javascript_Core/runtime/DirectEvalExecutable.h (240964 => 240965)
--- trunk/Source/_javascript_Core/runtime/DirectEvalExecutable.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/runtime/DirectEvalExecutable.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -31,10 +31,10 @@
class DirectEvalExecutable final : public EvalExecutable {
public:
- template<typename CellType>
+ template<typename CellType, SubspaceAccess mode>
static IsoSubspace* subspaceFor(VM& vm)
{
- return &vm.directEvalExecutableSpace.space;
+ return vm.directEvalExecutableSpace<mode>();
}
static DirectEvalExecutable* create(ExecState*, const SourceCode&, bool isInStrictContext, DerivedContextType, bool isArrowFunctionContext, EvalContextType, const VariableEnvironment*);
Modified: trunk/Source/_javascript_Core/runtime/ErrorInstance.h (240964 => 240965)
--- trunk/Source/_javascript_Core/runtime/ErrorInstance.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/runtime/ErrorInstance.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -72,10 +72,10 @@
bool materializeErrorInfoIfNeeded(VM&);
bool materializeErrorInfoIfNeeded(VM&, PropertyName);
- template<typename CellType>
+ template<typename CellType, SubspaceAccess mode>
static IsoSubspace* subspaceFor(VM& vm)
{
- return &vm.errorInstanceSpace;
+ return vm.errorInstanceSpace<mode>();
}
void finalizeUnconditionally(VM&);
Modified: trunk/Source/_javascript_Core/runtime/ExecutableBase.h (240964 => 240965)
--- trunk/Source/_javascript_Core/runtime/ExecutableBase.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/runtime/ExecutableBase.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -84,7 +84,7 @@
static void destroy(JSCell*);
// Force subclasses to override this.
- template<typename>
+ template<typename, SubspaceAccess>
static void subspaceFor(VM&) { }
CodeBlockHash hashFor(CodeSpecializationKind) const;
Modified: trunk/Source/_javascript_Core/runtime/FunctionExecutable.h (240964 => 240965)
--- trunk/Source/_javascript_Core/runtime/FunctionExecutable.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/runtime/FunctionExecutable.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -40,7 +40,7 @@
typedef ScriptExecutable Base;
static const unsigned StructureFlags = Base::StructureFlags | StructureIsImmortal;
- template<typename CellType>
+ template<typename CellType, SubspaceAccess>
static IsoSubspace* subspaceFor(VM& vm)
{
return &vm.functionExecutableSpace.space;
Modified: trunk/Source/_javascript_Core/runtime/IndirectEvalExecutable.h (240964 => 240965)
--- trunk/Source/_javascript_Core/runtime/IndirectEvalExecutable.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/runtime/IndirectEvalExecutable.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -31,10 +31,10 @@
class IndirectEvalExecutable final : public EvalExecutable {
public:
- template<typename CellType>
+ template<typename CellType, SubspaceAccess mode>
static IsoSubspace* subspaceFor(VM& vm)
{
- return &vm.indirectEvalExecutableSpace.space;
+ return vm.indirectEvalExecutableSpace<mode>();
}
static IndirectEvalExecutable* create(ExecState*, const SourceCode&, bool isInStrictContext, DerivedContextType, bool isArrowFunctionContext, EvalContextType);
Modified: trunk/Source/_javascript_Core/runtime/InferredValue.cpp (240964 => 240965)
--- trunk/Source/_javascript_Core/runtime/InferredValue.cpp 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/runtime/InferredValue.cpp 2019-02-05 06:32:08 UTC (rev 240965)
@@ -63,7 +63,7 @@
if (!value.isCell())
return;
- visitor.vm().inferredValuesWithFinalizers.add(inferredValue);
+ VM::SpaceAndSet::setFor(*inferredValue->subspace()).add(inferredValue);
}
InferredValue::InferredValue(VM& vm)
Modified: trunk/Source/_javascript_Core/runtime/InferredValue.h (240964 => 240965)
--- trunk/Source/_javascript_Core/runtime/InferredValue.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/runtime/InferredValue.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -45,10 +45,10 @@
public:
typedef JSCell Base;
- template<typename CellType>
+ template<typename CellType, SubspaceAccess mode>
static IsoSubspace* subspaceFor(VM& vm)
{
- return &vm.inferredValueSpace;
+ return vm.inferredValueSpace<mode>();
}
static InferredValue* create(VM&);
Modified: trunk/Source/_javascript_Core/runtime/InferredValueInlines.h (240964 => 240965)
--- trunk/Source/_javascript_Core/runtime/InferredValueInlines.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/runtime/InferredValueInlines.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -40,7 +40,7 @@
invalidate(vm, StringFireDetail("InferredValue clean-up during GC"));
}
- vm.inferredValuesWithFinalizers.remove(this);
+ VM::SpaceAndSet::setFor(*subspace()).remove(this);
}
} // namespace JSC
Modified: trunk/Source/_javascript_Core/runtime/InternalFunction.h (240964 => 240965)
--- trunk/Source/_javascript_Core/runtime/InternalFunction.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/runtime/InternalFunction.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -38,7 +38,7 @@
typedef JSDestructibleObject Base;
static const unsigned StructureFlags = Base::StructureFlags | ImplementsHasInstance | ImplementsDefaultHasInstance | OverridesGetCallData;
- template<typename CellType>
+ template<typename CellType, SubspaceAccess>
static IsoSubspace* subspaceFor(VM& vm)
{
static_assert(sizeof(CellType) == sizeof(InternalFunction), "InternalFunction subclasses that add fields need to override subspaceFor<>()");
Modified: trunk/Source/_javascript_Core/runtime/JSAsyncFunction.h (240964 => 240965)
--- trunk/Source/_javascript_Core/runtime/JSAsyncFunction.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/runtime/JSAsyncFunction.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -38,7 +38,7 @@
const static unsigned StructureFlags = Base::StructureFlags;
- template<typename CellType>
+ template<typename CellType, SubspaceAccess>
static IsoSubspace* subspaceFor(VM& vm)
{
return &vm.functionSpace;
Modified: trunk/Source/_javascript_Core/runtime/JSAsyncGeneratorFunction.h (240964 => 240965)
--- trunk/Source/_javascript_Core/runtime/JSAsyncGeneratorFunction.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/runtime/JSAsyncGeneratorFunction.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -38,7 +38,7 @@
const static unsigned StructureFlags = Base::StructureFlags;
- template<typename CellType>
+ template<typename CellType, SubspaceAccess>
static IsoSubspace* subspaceFor(VM& vm)
{
return &vm.functionSpace;
Modified: trunk/Source/_javascript_Core/runtime/JSBoundFunction.h (240964 => 240965)
--- trunk/Source/_javascript_Core/runtime/JSBoundFunction.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/runtime/JSBoundFunction.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -42,10 +42,10 @@
const static unsigned StructureFlags = Base::StructureFlags & ~ImplementsDefaultHasInstance;
static_assert(StructureFlags & ImplementsHasInstance, "");
- template<typename CellType>
+ template<typename CellType, SubspaceAccess mode>
static IsoSubspace* subspaceFor(VM& vm)
{
- return &vm.boundFunctionSpace;
+ return vm.boundFunctionSpace<mode>();
}
static JSBoundFunction* create(VM&, ExecState*, JSGlobalObject*, JSObject* targetFunction, JSValue boundThis, JSArray* boundArgs, int, const String& name);
Modified: trunk/Source/_javascript_Core/runtime/JSCell.h (240964 => 240965)
--- trunk/Source/_javascript_Core/runtime/JSCell.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/runtime/JSCell.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -32,6 +32,7 @@
#include "JSLock.h"
#include "JSTypeInfo.h"
#include "SlotVisitor.h"
+#include "SubspaceAccess.h"
#include "TypedArrayType.h"
#include "WriteBarrier.h"
@@ -88,7 +89,7 @@
// Don't call this directly. Call JSC::subspaceFor<Type>(vm) instead.
// FIXME: Refer to Subspace by reference.
// https://bugs.webkit.org/show_bug.cgi?id=166988
- template<typename CellType>
+ template<typename CellType, SubspaceAccess>
static CompleteSubspace* subspaceFor(VM&);
static JSCell* seenMultipleCalleeObjects() { return bitwise_cast<JSCell*>(static_cast<uintptr_t>(1)); }
@@ -294,7 +295,13 @@
template<typename Type>
inline auto subspaceFor(VM& vm)
{
- return Type::template subspaceFor<Type>(vm);
+ return Type::template subspaceFor<Type, SubspaceAccess::OnMainThread>(vm);
}
+template<typename Type>
+inline auto subspaceForConcurrently(VM& vm)
+{
+ return Type::template subspaceFor<Type, SubspaceAccess::Concurrently>(vm);
+}
+
} // namespace JSC
Modified: trunk/Source/_javascript_Core/runtime/JSCellInlines.h (240964 => 240965)
--- trunk/Source/_javascript_Core/runtime/JSCellInlines.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/runtime/JSCellInlines.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -25,6 +25,7 @@
#pragma once
+#include "AllocatorForMode.h"
#include "AllocatorInlines.h"
#include "CompleteSubspaceInlines.h"
#include "CPU.h"
@@ -145,7 +146,7 @@
return *callee->markedBlock().vm();
}
-template<typename CellType>
+template<typename CellType, SubspaceAccess>
CompleteSubspace* JSCell::subspaceFor(VM& vm)
{
if (CellType::needsDestruction)
@@ -153,6 +154,14 @@
return &vm.cellSpace;
}
+template<typename Type>
+inline Allocator allocatorForNonVirtualConcurrently(VM& vm, size_t allocationSize, AllocatorForMode mode)
+{
+ if (auto* subspace = subspaceForConcurrently<Type>(vm))
+ return subspace->allocatorForNonVirtual(allocationSize, mode);
+ return { };
+}
+
template<typename T>
ALWAYS_INLINE void* tryAllocateCellHelper(Heap& heap, size_t size, GCDeferralContext* deferralContext, AllocationFailureMode failureMode)
{
Modified: trunk/Source/_javascript_Core/runtime/JSCustomGetterSetterFunction.h (240964 => 240965)
--- trunk/Source/_javascript_Core/runtime/JSCustomGetterSetterFunction.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/runtime/JSCustomGetterSetterFunction.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -40,10 +40,10 @@
static const unsigned StructureFlags = Base::StructureFlags;
- template<typename CellType>
+ template<typename CellType, SubspaceAccess mode>
static IsoSubspace* subspaceFor(VM& vm)
{
- return &vm.customGetterSetterFunctionSpace;
+ return vm.customGetterSetterFunctionSpace<mode>();
}
static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
Modified: trunk/Source/_javascript_Core/runtime/JSDestructibleObject.h (240964 => 240965)
--- trunk/Source/_javascript_Core/runtime/JSDestructibleObject.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/runtime/JSDestructibleObject.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -37,7 +37,7 @@
static const bool needsDestruction = true;
- template<typename CellType>
+ template<typename CellType, SubspaceAccess>
static CompleteSubspace* subspaceFor(VM& vm)
{
return &vm.destructibleObjectSpace;
Modified: trunk/Source/_javascript_Core/runtime/JSFunction.h (240964 => 240965)
--- trunk/Source/_javascript_Core/runtime/JSFunction.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/runtime/JSFunction.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -62,7 +62,7 @@
public:
- template<typename CellType>
+ template<typename CellType, SubspaceAccess>
static IsoSubspace* subspaceFor(VM& vm)
{
return &vm.functionSpace;
Modified: trunk/Source/_javascript_Core/runtime/JSGeneratorFunction.h (240964 => 240965)
--- trunk/Source/_javascript_Core/runtime/JSGeneratorFunction.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/runtime/JSGeneratorFunction.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -66,7 +66,7 @@
const static unsigned StructureFlags = Base::StructureFlags;
- template<typename CellType>
+ template<typename CellType, SubspaceAccess>
static IsoSubspace* subspaceFor(VM& vm)
{
return &vm.functionSpace;
Modified: trunk/Source/_javascript_Core/runtime/JSImmutableButterfly.h (240964 => 240965)
--- trunk/Source/_javascript_Core/runtime/JSImmutableButterfly.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/runtime/JSImmutableButterfly.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -88,7 +88,7 @@
void copyToArguments(ExecState*, VirtualRegister firstElementDest, unsigned offset, unsigned length);
- template<typename>
+ template<typename, SubspaceAccess>
static CompleteSubspace* subspaceFor(VM& vm)
{
// We allocate out of the JSValue gigacage as other code expects all butterflies to live there.
Modified: trunk/Source/_javascript_Core/runtime/JSLexicalEnvironment.h (240964 => 240965)
--- trunk/Source/_javascript_Core/runtime/JSLexicalEnvironment.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/runtime/JSLexicalEnvironment.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -40,10 +40,10 @@
friend class JIT;
friend class LLIntOffsetsExtractor;
public:
- template<typename CellType>
+ template<typename CellType, SubspaceAccess>
static CompleteSubspace* subspaceFor(VM& vm)
{
- RELEASE_ASSERT(!CellType::needsDestruction);
+ static_assert(!CellType::needsDestruction, "");
return &vm.jsValueGigacageCellSpace;
}
Modified: trunk/Source/_javascript_Core/runtime/JSNativeStdFunction.h (240964 => 240965)
--- trunk/Source/_javascript_Core/runtime/JSNativeStdFunction.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/runtime/JSNativeStdFunction.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -40,10 +40,10 @@
const static unsigned StructureFlags = Base::StructureFlags;
- template<typename CellType>
+ template<typename CellType, SubspaceAccess mode>
static IsoSubspace* subspaceFor(VM& vm)
{
- return &vm.nativeStdFunctionSpace;
+ return vm.nativeStdFunctionSpace<mode>();
}
DECLARE_EXPORT_INFO;
Modified: trunk/Source/_javascript_Core/runtime/JSSegmentedVariableObject.h (240964 => 240965)
--- trunk/Source/_javascript_Core/runtime/JSSegmentedVariableObject.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/runtime/JSSegmentedVariableObject.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -90,7 +90,7 @@
static void destroy(JSCell*);
- template<typename>
+ template<typename, SubspaceAccess>
static CompleteSubspace* subspaceFor(VM& vm)
{
return &vm.segmentedVariableObjectSpace;
Modified: trunk/Source/_javascript_Core/runtime/JSString.h (240964 => 240965)
--- trunk/Source/_javascript_Core/runtime/JSString.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/runtime/JSString.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -89,7 +89,7 @@
// We specialize the string subspace to get the fastest possible sweep. This wouldn't be
// necessary if JSString didn't have a destructor.
- template<typename>
+ template<typename, SubspaceAccess>
static CompleteSubspace* subspaceFor(VM& vm)
{
return &vm.stringSpace;
Modified: trunk/Source/_javascript_Core/runtime/ModuleProgramExecutable.h (240964 => 240965)
--- trunk/Source/_javascript_Core/runtime/ModuleProgramExecutable.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/runtime/ModuleProgramExecutable.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -36,10 +36,10 @@
typedef ScriptExecutable Base;
static const unsigned StructureFlags = Base::StructureFlags | StructureIsImmortal;
- template<typename CellType>
+ template<typename CellType, SubspaceAccess mode>
static IsoSubspace* subspaceFor(VM& vm)
{
- return &vm.moduleProgramExecutableSpace.space;
+ return vm.moduleProgramExecutableSpace<mode>();
}
static ModuleProgramExecutable* create(ExecState*, const SourceCode&);
Modified: trunk/Source/_javascript_Core/runtime/NativeExecutable.h (240964 => 240965)
--- trunk/Source/_javascript_Core/runtime/NativeExecutable.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/runtime/NativeExecutable.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -44,7 +44,7 @@
static void destroy(JSCell*);
- template<typename CellType>
+ template<typename CellType, SubspaceAccess>
static IsoSubspace* subspaceFor(VM& vm)
{
return &vm.nativeExecutableSpace;
Modified: trunk/Source/_javascript_Core/runtime/ProgramExecutable.h (240964 => 240965)
--- trunk/Source/_javascript_Core/runtime/ProgramExecutable.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/runtime/ProgramExecutable.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -36,7 +36,7 @@
typedef ScriptExecutable Base;
static const unsigned StructureFlags = Base::StructureFlags | StructureIsImmortal;
- template<typename CellType>
+ template<typename CellType, SubspaceAccess>
static IsoSubspace* subspaceFor(VM& vm)
{
return &vm.programExecutableSpace.space;
Modified: trunk/Source/_javascript_Core/runtime/PropertyMapHashTable.h (240964 => 240965)
--- trunk/Source/_javascript_Core/runtime/PropertyMapHashTable.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/runtime/PropertyMapHashTable.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -123,7 +123,7 @@
typedef JSCell Base;
static const unsigned StructureFlags = Base::StructureFlags | StructureIsImmortal;
- template<typename CellType>
+ template<typename CellType, SubspaceAccess>
static IsoSubspace* subspaceFor(VM& vm)
{
return &vm.propertyTableSpace;
Modified: trunk/Source/_javascript_Core/runtime/ProxyRevoke.h (240964 => 240965)
--- trunk/Source/_javascript_Core/runtime/ProxyRevoke.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/runtime/ProxyRevoke.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -36,10 +36,10 @@
typedef InternalFunction Base;
static const unsigned StructureFlags = Base::StructureFlags;
- template<typename CellType>
+ template<typename CellType, SubspaceAccess mode>
static IsoSubspace* subspaceFor(VM& vm)
{
- return &vm.proxyRevokeSpace;
+ return vm.proxyRevokeSpace<mode>();
}
static ProxyRevoke* create(VM&, Structure*, ProxyObject*);
Modified: trunk/Source/_javascript_Core/runtime/ScopedArguments.h (240964 => 240965)
--- trunk/Source/_javascript_Core/runtime/ScopedArguments.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/runtime/ScopedArguments.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -43,10 +43,10 @@
using Base = GenericArguments<ScopedArguments>;
public:
- template<typename CellType>
+ template<typename CellType, SubspaceAccess>
static CompleteSubspace* subspaceFor(VM& vm)
{
- RELEASE_ASSERT(!CellType::needsDestruction);
+ static_assert(!CellType::needsDestruction, "");
return &vm.jsValueGigacageCellSpace;
}
Modified: trunk/Source/_javascript_Core/runtime/ScriptExecutable.cpp (240964 => 240965)
--- trunk/Source/_javascript_Core/runtime/ScriptExecutable.cpp 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/runtime/ScriptExecutable.cpp 2019-02-05 06:32:08 UTC (rev 240965)
@@ -68,7 +68,7 @@
void ScriptExecutable::clearCode(IsoCellSet& clearableCodeSet)
{
Base::clearCode();
- ASSERT(&VM::ScriptExecutableSpaceAndSet::clearableCodeSetFor(*subspace()) == &clearableCodeSet);
+ ASSERT(&VM::SpaceAndSet::setFor(*subspace()) == &clearableCodeSet);
clearableCodeSet.remove(this);
}
@@ -149,7 +149,7 @@
break;
}
- auto& clearableCodeSet = VM::ScriptExecutableSpaceAndSet::clearableCodeSetFor(*subspace());
+ auto& clearableCodeSet = VM::SpaceAndSet::setFor(*subspace());
if (hasClearableCode())
clearableCodeSet.add(this);
else
Modified: trunk/Source/_javascript_Core/runtime/Structure.h (240964 => 240965)
--- trunk/Source/_javascript_Core/runtime/Structure.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/runtime/Structure.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -132,7 +132,7 @@
~Structure();
- template<typename CellType>
+ template<typename CellType, SubspaceAccess>
static IsoSubspace* subspaceFor(VM& vm)
{
return &vm.structureSpace;
Modified: trunk/Source/_javascript_Core/runtime/StructureRareData.h (240964 => 240965)
--- trunk/Source/_javascript_Core/runtime/StructureRareData.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/runtime/StructureRareData.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -43,7 +43,7 @@
typedef JSCell Base;
static const unsigned StructureFlags = Base::StructureFlags | StructureIsImmortal;
- template<typename CellType>
+ template<typename CellType, SubspaceAccess>
static IsoSubspace* subspaceFor(VM& vm)
{
return &vm.structureRareDataSpace;
Copied: trunk/Source/_javascript_Core/runtime/SubspaceAccess.h (from rev 240964, trunk/Source/_javascript_Core/runtime/InferredValueInlines.h) (0 => 240965)
--- trunk/Source/_javascript_Core/runtime/SubspaceAccess.h (rev 0)
+++ trunk/Source/_javascript_Core/runtime/SubspaceAccess.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2019 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+namespace JSC {
+
+enum class SubspaceAccess {
+ OnMainThread,
+ Concurrently,
+};
+
+}
Modified: trunk/Source/_javascript_Core/runtime/VM.cpp (240964 => 240965)
--- trunk/Source/_javascript_Core/runtime/VM.cpp 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/runtime/VM.cpp 2019-02-05 06:32:08 UTC (rev 240965)
@@ -287,38 +287,17 @@
, destructibleObjectSpace("JSDestructibleObject", heap, destructibleObjectHeapCellType.get(), fastMallocAllocator.get())
, eagerlySweptDestructibleObjectSpace("Eagerly Swept JSDestructibleObject", heap, destructibleObjectHeapCellType.get(), fastMallocAllocator.get())
, segmentedVariableObjectSpace("JSSegmentedVariableObjectSpace", heap, segmentedVariableObjectHeapCellType.get(), fastMallocAllocator.get())
- , boundFunctionSpace ISO_SUBSPACE_INIT(heap, cellHeapCellType.get(), JSBoundFunction)
- , callbackFunctionSpace ISO_SUBSPACE_INIT(heap, destructibleObjectHeapCellType.get(), JSCallbackFunction)
- , customGetterSetterFunctionSpace ISO_SUBSPACE_INIT(heap, cellHeapCellType.get(), JSCustomGetterSetterFunction)
, executableToCodeBlockEdgeSpace ISO_SUBSPACE_INIT(heap, cellHeapCellType.get(), ExecutableToCodeBlockEdge)
, functionSpace ISO_SUBSPACE_INIT(heap, cellHeapCellType.get(), JSFunction)
- , inferredValueSpace ISO_SUBSPACE_INIT(heap, destructibleCellHeapCellType.get(), InferredValue)
, internalFunctionSpace ISO_SUBSPACE_INIT(heap, destructibleObjectHeapCellType.get(), InternalFunction)
, nativeExecutableSpace ISO_SUBSPACE_INIT(heap, destructibleCellHeapCellType.get(), NativeExecutable)
- , nativeStdFunctionSpace ISO_SUBSPACE_INIT(heap, cellHeapCellType.get(), JSNativeStdFunction)
-#if JSC_OBJC_API_ENABLED
- , objCCallbackFunctionSpace ISO_SUBSPACE_INIT(heap, destructibleObjectHeapCellType.get(), ObjCCallbackFunction)
-#endif
, propertyTableSpace ISO_SUBSPACE_INIT(heap, destructibleCellHeapCellType.get(), PropertyTable)
- , proxyRevokeSpace ISO_SUBSPACE_INIT(heap, destructibleObjectHeapCellType.get(), ProxyRevoke)
, structureRareDataSpace ISO_SUBSPACE_INIT(heap, destructibleCellHeapCellType.get(), StructureRareData)
, structureSpace ISO_SUBSPACE_INIT(heap, destructibleCellHeapCellType.get(), Structure)
- , weakSetSpace ISO_SUBSPACE_INIT(heap, destructibleObjectHeapCellType.get(), JSWeakSet)
- , weakMapSpace ISO_SUBSPACE_INIT(heap, destructibleObjectHeapCellType.get(), JSWeakMap)
- , errorInstanceSpace ISO_SUBSPACE_INIT(heap, destructibleObjectHeapCellType.get(), ErrorInstance)
-#if ENABLE(WEBASSEMBLY)
- , webAssemblyCodeBlockSpace ISO_SUBSPACE_INIT(heap, webAssemblyCodeBlockHeapCellType.get(), JSWebAssemblyCodeBlock)
- , webAssemblyFunctionSpace ISO_SUBSPACE_INIT(heap, cellHeapCellType.get(), WebAssemblyFunction)
- , webAssemblyWrapperFunctionSpace ISO_SUBSPACE_INIT(heap, cellHeapCellType.get(), WebAssemblyWrapperFunction)
-#endif
, executableToCodeBlockEdgesWithConstraints(executableToCodeBlockEdgeSpace)
, executableToCodeBlockEdgesWithFinalizers(executableToCodeBlockEdgeSpace)
- , inferredValuesWithFinalizers(inferredValueSpace)
, codeBlockSpace ISO_SUBSPACE_INIT(heap, destructibleCellHeapCellType.get(), CodeBlock)
- , directEvalExecutableSpace ISO_SUBSPACE_INIT(heap, destructibleCellHeapCellType.get(), DirectEvalExecutable)
, functionExecutableSpace ISO_SUBSPACE_INIT(heap, destructibleCellHeapCellType.get(), FunctionExecutable)
- , indirectEvalExecutableSpace ISO_SUBSPACE_INIT(heap, destructibleCellHeapCellType.get(), IndirectEvalExecutable)
- , moduleProgramExecutableSpace ISO_SUBSPACE_INIT(heap, destructibleCellHeapCellType.get(), ModuleProgramExecutable)
, programExecutableSpace ISO_SUBSPACE_INIT(heap, destructibleCellHeapCellType.get(), ProgramExecutable)
, unlinkedFunctionExecutableSpace ISO_SUBSPACE_INIT(heap, destructibleCellHeapCellType.get(), UnlinkedFunctionExecutable)
, vmType(vmType)
@@ -1239,6 +1218,53 @@
m_shadowChicken = std::make_unique<ShadowChicken>();
}
+#define DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER_SLOW(name, heapCellType, type) \
+ IsoSubspace* VM::name##Slow() \
+ { \
+ ASSERT(!m_##name); \
+ auto space = std::make_unique<IsoSubspace> ISO_SUBSPACE_INIT(heap, heapCellType, type); \
+ WTF::storeStoreFence(); \
+ m_##name = WTFMove(space); \
+ return m_##name.get(); \
+ }
+
+
+DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER_SLOW(boundFunctionSpace, cellHeapCellType.get(), JSBoundFunction)
+DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER_SLOW(callbackFunctionSpace, destructibleObjectHeapCellType.get(), JSCallbackFunction)
+DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER_SLOW(customGetterSetterFunctionSpace, cellHeapCellType.get(), JSCustomGetterSetterFunction)
+DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER_SLOW(errorInstanceSpace, destructibleObjectHeapCellType.get(), ErrorInstance)
+DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER_SLOW(nativeStdFunctionSpace, cellHeapCellType.get(), JSNativeStdFunction)
+DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER_SLOW(proxyRevokeSpace, destructibleObjectHeapCellType.get(), ProxyRevoke)
+DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER_SLOW(weakMapSpace, destructibleObjectHeapCellType.get(), JSWeakMap)
+DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER_SLOW(weakSetSpace, destructibleObjectHeapCellType.get(), JSWeakSet)
+#if JSC_OBJC_API_ENABLED
+DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER_SLOW(objCCallbackFunctionSpace, destructibleObjectHeapCellType.get(), ObjCCallbackFunction)
+#endif
+#if ENABLE(WEBASSEMBLY)
+DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER_SLOW(webAssemblyCodeBlockSpace, webAssemblyCodeBlockHeapCellType.get(), JSWebAssemblyCodeBlock)
+DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER_SLOW(webAssemblyFunctionSpace, cellHeapCellType.get(), WebAssemblyFunction)
+DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER_SLOW(webAssemblyWrapperFunctionSpace, cellHeapCellType.get(), WebAssemblyWrapperFunction)
+#endif
+
+#undef DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER_SLOW
+
+#define DYNAMIC_SPACE_AND_SET_DEFINE_MEMBER_SLOW(name, heapCellType, type) \
+ IsoSubspace* VM::name##Slow() \
+ { \
+ ASSERT(!m_##name); \
+ auto space = std::make_unique<SpaceAndSet> ISO_SUBSPACE_INIT(heap, heapCellType, type); \
+ WTF::storeStoreFence(); \
+ m_##name = WTFMove(space); \
+ return &m_##name->space; \
+ }
+
+DYNAMIC_SPACE_AND_SET_DEFINE_MEMBER_SLOW(inferredValueSpace, destructibleCellHeapCellType.get(), InferredValue)
+DYNAMIC_SPACE_AND_SET_DEFINE_MEMBER_SLOW(directEvalExecutableSpace, destructibleCellHeapCellType.get(), DirectEvalExecutable)
+DYNAMIC_SPACE_AND_SET_DEFINE_MEMBER_SLOW(indirectEvalExecutableSpace, destructibleCellHeapCellType.get(), IndirectEvalExecutable)
+DYNAMIC_SPACE_AND_SET_DEFINE_MEMBER_SLOW(moduleProgramExecutableSpace, destructibleCellHeapCellType.get(), ModuleProgramExecutable)
+
+#undef DYNAMIC_SPACE_AND_SET_DEFINE_MEMBER_SLOW
+
JSGlobalObject* VM::vmEntryGlobalObject(const CallFrame* callFrame) const
{
if (callFrame && callFrame->isGlobalExec()) {
Modified: trunk/Source/_javascript_Core/runtime/VM.h (240964 => 240965)
--- trunk/Source/_javascript_Core/runtime/VM.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/runtime/VM.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -51,6 +51,7 @@
#include "SmallStrings.h"
#include "Strong.h"
#include "StructureCache.h"
+#include "SubspaceAccess.h"
#include "VMTraps.h"
#include "WasmContext.h"
#include "Watchpoint.h"
@@ -366,56 +367,85 @@
CompleteSubspace eagerlySweptDestructibleObjectSpace;
CompleteSubspace segmentedVariableObjectSpace;
- IsoSubspace boundFunctionSpace;
- IsoSubspace callbackFunctionSpace;
- IsoSubspace customGetterSetterFunctionSpace;
IsoSubspace executableToCodeBlockEdgeSpace;
IsoSubspace functionSpace;
- IsoSubspace inferredValueSpace;
IsoSubspace internalFunctionSpace;
IsoSubspace nativeExecutableSpace;
- IsoSubspace nativeStdFunctionSpace;
-#if JSC_OBJC_API_ENABLED
- IsoSubspace objCCallbackFunctionSpace;
-#endif
IsoSubspace propertyTableSpace;
- IsoSubspace proxyRevokeSpace;
IsoSubspace structureRareDataSpace;
IsoSubspace structureSpace;
- IsoSubspace weakSetSpace;
- IsoSubspace weakMapSpace;
- IsoSubspace errorInstanceSpace;
+
+#define DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER(name) \
+ template<SubspaceAccess mode> \
+ IsoSubspace* name() \
+ { \
+ if (m_##name || mode == SubspaceAccess::Concurrently) \
+ return m_##name.get(); \
+ return name##Slow(); \
+ } \
+ IsoSubspace* name##Slow(); \
+ std::unique_ptr<IsoSubspace> m_##name;
+
+
+#if JSC_OBJC_API_ENABLED
+ DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER(objCCallbackFunctionSpace)
+#endif
+ DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER(boundFunctionSpace)
+ DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER(callbackFunctionSpace)
+ DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER(customGetterSetterFunctionSpace)
+ DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER(errorInstanceSpace)
+ DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER(nativeStdFunctionSpace)
+ DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER(proxyRevokeSpace)
+ DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER(weakSetSpace)
+ DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER(weakMapSpace)
#if ENABLE(WEBASSEMBLY)
- IsoSubspace webAssemblyCodeBlockSpace;
- IsoSubspace webAssemblyFunctionSpace;
- IsoSubspace webAssemblyWrapperFunctionSpace;
+ DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER(webAssemblyCodeBlockSpace)
+ DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER(webAssemblyFunctionSpace)
+ DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER(webAssemblyWrapperFunctionSpace)
#endif
+
+#undef DYNAMIC_ISO_SUBSPACE_DEFINE_MEMBER
IsoCellSet executableToCodeBlockEdgesWithConstraints;
IsoCellSet executableToCodeBlockEdgesWithFinalizers;
- IsoCellSet inferredValuesWithFinalizers;
+
+#define DYNAMIC_SPACE_AND_SET_DEFINE_MEMBER(name) \
+ template<SubspaceAccess mode> \
+ IsoSubspace* name() \
+ { \
+ if (auto* spaceAndSet = m_##name.get()) \
+ return &spaceAndSet->space; \
+ if (mode == SubspaceAccess::Concurrently) \
+ return nullptr; \
+ return name##Slow(); \
+ } \
+ IsoSubspace* name##Slow(); \
+ std::unique_ptr<SpaceAndSet> m_##name;
- struct SpaceAndFinalizerSet {
+ struct SpaceAndSet {
+ WTF_MAKE_STRUCT_FAST_ALLOCATED;
+
IsoSubspace space;
- IsoCellSet finalizerSet;
+ IsoCellSet set;
template<typename... Arguments>
- SpaceAndFinalizerSet(Arguments&&... arguments)
+ SpaceAndSet(Arguments&&... arguments)
: space(std::forward<Arguments>(arguments)...)
- , finalizerSet(space)
+ , set(space)
{
}
- static IsoCellSet& finalizerSetFor(Subspace& space)
+ static IsoCellSet& setFor(Subspace& space)
{
return *bitwise_cast<IsoCellSet*>(
bitwise_cast<char*>(&space) -
- OBJECT_OFFSETOF(SpaceAndFinalizerSet, space) +
- OBJECT_OFFSETOF(SpaceAndFinalizerSet, finalizerSet));
+ OBJECT_OFFSETOF(SpaceAndSet, space) +
+ OBJECT_OFFSETOF(SpaceAndSet, set));
}
};
- SpaceAndFinalizerSet codeBlockSpace;
+ SpaceAndSet codeBlockSpace;
+ DYNAMIC_SPACE_AND_SET_DEFINE_MEMBER(inferredValueSpace)
template<typename Func>
void forEachCodeBlockSpace(const Func& func)
@@ -425,62 +455,29 @@
func(codeBlockSpace);
}
- struct ScriptExecutableSpaceAndSet {
- IsoSubspace space;
- IsoCellSet clearableCodeSet;
+ DYNAMIC_SPACE_AND_SET_DEFINE_MEMBER(directEvalExecutableSpace)
+ DYNAMIC_SPACE_AND_SET_DEFINE_MEMBER(indirectEvalExecutableSpace)
+ DYNAMIC_SPACE_AND_SET_DEFINE_MEMBER(moduleProgramExecutableSpace)
+ SpaceAndSet functionExecutableSpace;
+ SpaceAndSet programExecutableSpace;
- template<typename... Arguments>
- ScriptExecutableSpaceAndSet(Arguments&&... arguments)
- : space(std::forward<Arguments>(arguments)...)
- , clearableCodeSet(space)
- { }
-
- static IsoCellSet& clearableCodeSetFor(Subspace& space)
- {
- return *bitwise_cast<IsoCellSet*>(
- bitwise_cast<char*>(&space) -
- OBJECT_OFFSETOF(ScriptExecutableSpaceAndSet, space) +
- OBJECT_OFFSETOF(ScriptExecutableSpaceAndSet, clearableCodeSet));
- }
- };
-
- ScriptExecutableSpaceAndSet directEvalExecutableSpace;
- ScriptExecutableSpaceAndSet functionExecutableSpace;
- ScriptExecutableSpaceAndSet indirectEvalExecutableSpace;
- ScriptExecutableSpaceAndSet moduleProgramExecutableSpace;
- ScriptExecutableSpaceAndSet programExecutableSpace;
-
template<typename Func>
void forEachScriptExecutableSpace(const Func& func)
{
- func(directEvalExecutableSpace);
+ if (m_directEvalExecutableSpace)
+ func(*m_directEvalExecutableSpace);
func(functionExecutableSpace);
- func(indirectEvalExecutableSpace);
- func(moduleProgramExecutableSpace);
+ if (m_indirectEvalExecutableSpace)
+ func(*m_indirectEvalExecutableSpace);
+ if (m_moduleProgramExecutableSpace)
+ func(*m_moduleProgramExecutableSpace);
func(programExecutableSpace);
}
- struct UnlinkedFunctionExecutableSpaceAndSet {
- IsoSubspace space;
- IsoCellSet clearableCodeSet;
+ SpaceAndSet unlinkedFunctionExecutableSpace;
- template<typename... Arguments>
- UnlinkedFunctionExecutableSpaceAndSet(Arguments&&... arguments)
- : space(std::forward<Arguments>(arguments)...)
- , clearableCodeSet(space)
- { }
-
- static IsoCellSet& clearableCodeSetFor(Subspace& space)
- {
- return *bitwise_cast<IsoCellSet*>(
- bitwise_cast<char*>(&space) -
- OBJECT_OFFSETOF(UnlinkedFunctionExecutableSpaceAndSet, space) +
- OBJECT_OFFSETOF(UnlinkedFunctionExecutableSpaceAndSet, clearableCodeSet));
- }
- };
+#undef DYNAMIC_SPACE_AND_SET_DEFINE_MEMBER
- UnlinkedFunctionExecutableSpaceAndSet unlinkedFunctionExecutableSpace;
-
VMType vmType;
ClientData* clientData;
EntryFrame* topEntryFrame;
Modified: trunk/Source/_javascript_Core/runtime/WeakMapImpl.h (240964 => 240965)
--- trunk/Source/_javascript_Core/runtime/WeakMapImpl.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/runtime/WeakMapImpl.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -302,12 +302,12 @@
return std::is_same<WeakMapBucketType, JSC::WeakMapBucket<WeakMapBucketDataKey>>::value;
}
- template<typename CellType>
+ template<typename CellType, SubspaceAccess mode>
static IsoSubspace* subspaceFor(VM& vm)
{
if (isWeakMap())
- return &vm.weakMapSpace;
- return &vm.weakSetSpace;
+ return vm.weakMapSpace<mode>();
+ return vm.weakSetSpace<mode>();
}
static void visitOutputConstraints(JSCell*, SlotVisitor&);
Modified: trunk/Source/_javascript_Core/wasm/js/JSWebAssemblyCodeBlock.h (240964 => 240965)
--- trunk/Source/_javascript_Core/wasm/js/JSWebAssemblyCodeBlock.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/wasm/js/JSWebAssemblyCodeBlock.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -59,10 +59,10 @@
return Structure::create(vm, globalObject, prototype, TypeInfo(CellType, StructureFlags), info());
}
- template<typename CellType>
+ template<typename CellType, SubspaceAccess mode>
static IsoSubspace* subspaceFor(VM& vm)
{
- return &vm.webAssemblyCodeBlockSpace;
+ return vm.webAssemblyCodeBlockSpace<mode>();
}
Wasm::CodeBlock& codeBlock() { return m_codeBlock.get(); }
Modified: trunk/Source/_javascript_Core/wasm/js/JSWebAssemblyMemory.h (240964 => 240965)
--- trunk/Source/_javascript_Core/wasm/js/JSWebAssemblyMemory.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/wasm/js/JSWebAssemblyMemory.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -43,7 +43,7 @@
public:
typedef JSDestructibleObject Base;
- template<typename CellType>
+ template<typename CellType, SubspaceAccess>
static CompleteSubspace* subspaceFor(VM& vm)
{
// We hold onto a lot of memory, so it makes a lot of sense to be swept eagerly.
Modified: trunk/Source/_javascript_Core/wasm/js/WebAssemblyFunction.h (240964 => 240965)
--- trunk/Source/_javascript_Core/wasm/js/WebAssemblyFunction.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/wasm/js/WebAssemblyFunction.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -49,10 +49,10 @@
const static unsigned StructureFlags = Base::StructureFlags;
- template<typename CellType>
+ template<typename CellType, SubspaceAccess mode>
static IsoSubspace* subspaceFor(VM& vm)
{
- return &vm.webAssemblyFunctionSpace;
+ return vm.webAssemblyFunctionSpace<mode>();
}
DECLARE_EXPORT_INFO;
Modified: trunk/Source/_javascript_Core/wasm/js/WebAssemblyWrapperFunction.h (240964 => 240965)
--- trunk/Source/_javascript_Core/wasm/js/WebAssemblyWrapperFunction.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/_javascript_Core/wasm/js/WebAssemblyWrapperFunction.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -40,10 +40,10 @@
const static unsigned StructureFlags = Base::StructureFlags;
- template<typename CellType>
+ template<typename CellType, SubspaceAccess mode>
static IsoSubspace* subspaceFor(VM& vm)
{
- return &vm.webAssemblyWrapperFunctionSpace;
+ return vm.webAssemblyWrapperFunctionSpace<mode>();
}
DECLARE_INFO;
Modified: trunk/Source/WebCore/ChangeLog (240964 => 240965)
--- trunk/Source/WebCore/ChangeLog 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/WebCore/ChangeLog 2019-02-05 06:32:08 UTC (rev 240965)
@@ -1,3 +1,14 @@
+2019-02-04 Yusuke Suzuki <[email protected]>
+
+ [JSC] Shrink size of VM by lazily allocating IsoSubspaces for non-common types
+ https://bugs.webkit.org/show_bug.cgi?id=193993
+
+ Reviewed by Keith Miller.
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateHeader):
+ * bridge/runtime_method.h:
+
2019-02-04 Simon Fraser <[email protected]>
Move some macOS/iOS scrolling code into the scrolling/cocoa directory
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (240964 => 240965)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2019-02-05 06:32:08 UTC (rev 240965)
@@ -2758,7 +2758,7 @@
# this just calls visitAdditionalChildren, you usually don't have to worry about this.
push(@headerContent, " static void visitOutputConstraints(JSCell*, JSC::SlotVisitor&);\n");
my $subspaceFunc = IsDOMGlobalObject($interface) ? "globalObjectOutputConstraintSubspaceFor" : "outputConstraintSubspaceFor";
- push(@headerContent, " template<typename> static JSC::CompleteSubspace* subspaceFor(JSC::VM& vm) { return $subspaceFunc(vm); }\n");
+ push(@headerContent, " template<typename, JSC::SubspaceAccess> static JSC::CompleteSubspace* subspaceFor(JSC::VM& vm) { return $subspaceFunc(vm); }\n");
}
}
Modified: trunk/Source/WebCore/bridge/runtime_method.h (240964 => 240965)
--- trunk/Source/WebCore/bridge/runtime_method.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/WebCore/bridge/runtime_method.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -37,7 +37,7 @@
typedef InternalFunction Base;
static const unsigned StructureFlags = Base::StructureFlags | OverridesGetOwnPropertySlot | OverridesGetCallData;
- template<typename CellType>
+ template<typename CellType, JSC::SubspaceAccess>
static IsoSubspace* subspaceFor(VM& vm)
{
static_assert(sizeof(CellType) == sizeof(RuntimeMethod), "RuntimeMethod subclasses that add fields need to override subspaceFor<>()");
Modified: trunk/Source/WebKit/ChangeLog (240964 => 240965)
--- trunk/Source/WebKit/ChangeLog 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/WebKit/ChangeLog 2019-02-05 06:32:08 UTC (rev 240965)
@@ -1,3 +1,13 @@
+2019-02-04 Yusuke Suzuki <[email protected]>
+
+ [JSC] Shrink size of VM by lazily allocating IsoSubspaces for non-common types
+ https://bugs.webkit.org/show_bug.cgi?id=193993
+
+ Reviewed by Keith Miller.
+
+ * WebProcess/Plugins/Netscape/JSNPMethod.h:
+ * WebProcess/Plugins/Netscape/JSNPObject.h:
+
2019-02-04 Simon Fraser <[email protected]>
Move some macOS/iOS scrolling code into the scrolling/cocoa directory
Modified: trunk/Source/WebKit/WebProcess/Plugins/Netscape/JSNPMethod.h (240964 => 240965)
--- trunk/Source/WebKit/WebProcess/Plugins/Netscape/JSNPMethod.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/WebKit/WebProcess/Plugins/Netscape/JSNPMethod.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -41,7 +41,7 @@
public:
typedef JSC::InternalFunction Base;
- template<typename CellType>
+ template<typename CellType, JSC::SubspaceAccess>
static JSC::IsoSubspace* subspaceFor(JSC::VM& vm)
{
return subspaceForImpl(vm);
Modified: trunk/Source/WebKit/WebProcess/Plugins/Netscape/JSNPObject.h (240964 => 240965)
--- trunk/Source/WebKit/WebProcess/Plugins/Netscape/JSNPObject.h 2019-02-05 06:19:50 UTC (rev 240964)
+++ trunk/Source/WebKit/WebProcess/Plugins/Netscape/JSNPObject.h 2019-02-05 06:32:08 UTC (rev 240965)
@@ -46,7 +46,7 @@
typedef JSC::JSDestructibleObject Base;
static const unsigned StructureFlags = Base::StructureFlags | JSC::OverridesGetOwnPropertySlot | JSC::OverridesGetPropertyNames | JSC::OverridesGetCallData;
- template<typename CellType>
+ template<typename CellType, JSC::SubspaceAccess>
static JSC::IsoSubspace* subspaceFor(JSC::VM& vm)
{
return subspaceForImpl(vm);
