Refactor to use VM& instead of VM* at as many places as possible.
https://bugs.webkit.org/show_bug.cgi?id=201172
Reviewed by Yusuke Suzuki.
Source/JavaScriptCore:
Using VM& documents more clearly that the VM pointer is expected to never be null
in most cases. There are a few places where it can be null (e.g JSLock, and
DFG::Plan). Those will be left using a VM*.
Also converted some uses of ExecState* to using VM& instead since the ExecState*
is only there to fetch the VM pointer. Doing this also reduces the number of
times we have to compute VM* from ExecState*.
This patch is not exhaustive in converting to use VM&, but applies the change to
many commonly used pieces of code for a start.
Also fixed a missing exception check in JSString::toIdentifier() and
JSValue::toPropertyKey() exposed by this patch.
* API/APICast.h:
(toJS):
* API/JSAPIGlobalObject.mm:
(JSC::JSAPIGlobalObject::moduleLoaderResolve):
(JSC::JSAPIGlobalObject::moduleLoaderImportModule):
(JSC::JSAPIGlobalObject::moduleLoaderFetch):
(JSC::JSAPIGlobalObject::moduleLoaderCreateImportMetaProperties):
(JSC::JSAPIGlobalObject::loadAndEvaluateJSScriptModule):
* API/JSCallbackConstructor.cpp:
(JSC::JSCallbackConstructor::finishCreation):
* API/JSCallbackObjectFunctions.h:
(JSC::JSCallbackObject<Parent>::asCallbackObject):
(JSC::JSCallbackObject<Parent>::~JSCallbackObject):
(JSC::JSCallbackObject<Parent>::getOwnPropertySlotByIndex):
(JSC::JSCallbackObject<Parent>::putByIndex):
(JSC::JSCallbackObject<Parent>::deletePropertyByIndex):
(JSC::JSCallbackObject<Parent>::getOwnNonIndexPropertyNames):
* API/JSContext.mm:
(-[JSContext dependencyIdentifiersForModuleJSScript:]):
* API/JSObjectRef.cpp:
(JSObjectMakeFunction):
(classInfoPrivate):
(JSObjectGetPrivate):
(JSObjectSetPrivate):
(JSObjectCopyPropertyNames):
(JSPropertyNameAccumulatorAddName):
(JSObjectGetProxyTarget):
* API/JSScriptRef.cpp:
(parseScript):
* API/JSValueRef.cpp:
(JSValueMakeString):
* API/OpaqueJSString.cpp:
(OpaqueJSString::identifier const):
* API/glib/JSCContext.cpp:
(jsc_context_check_syntax):
* KeywordLookupGenerator.py:
(Trie.printSubTreeAsC):
* Scripts/wkbuiltins/builtins_generate_wrapper_header.py:
(BuiltinsWrapperHeaderGenerator.generate_constructor):
* Scripts/wkbuiltins/builtins_templates.py:
* bindings/ScriptFunctionCall.cpp:
(Deprecated::ScriptCallArgumentHandler::appendArgument):
(Deprecated::ScriptFunctionCall::call):
* bindings/ScriptValue.cpp:
(Inspector::jsToInspectorValue):
* builtins/BuiltinExecutables.cpp:
(JSC::BuiltinExecutables::createExecutable):
* builtins/BuiltinNames.cpp:
(JSC::BuiltinNames::BuiltinNames):
* builtins/BuiltinNames.h:
(JSC::BuiltinNames::getPublicName const):
* bytecode/BytecodeDumper.cpp:
(JSC::BytecodeDumper<Block>::vm const):
* bytecode/BytecodeDumper.h:
* bytecode/BytecodeGeneratorification.cpp:
(JSC::BytecodeGeneratorification::BytecodeGeneratorification):
(JSC::BytecodeGeneratorification::storageForGeneratorLocal):
(JSC::BytecodeGeneratorification::run):
* bytecode/BytecodeIntrinsicRegistry.cpp:
(JSC::BytecodeIntrinsicRegistry::sentinelMapBucketValue):
(JSC::BytecodeIntrinsicRegistry::sentinelSetBucketValue):
* bytecode/CallVariant.h:
(JSC::CallVariant::internalFunction const):
(JSC::CallVariant::function const):
(JSC::CallVariant::isClosureCall const):
(JSC::CallVariant::executable const):
(JSC::CallVariant::functionExecutable const):
(JSC::CallVariant::nativeExecutable const):
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::dumpSource):
(JSC::CodeBlock::CodeBlock):
(JSC::CodeBlock::setConstantIdentifierSetRegisters):
(JSC::CodeBlock::setNumParameters):
(JSC::CodeBlock::finalizeBaselineJITInlineCaches):
(JSC::CodeBlock::unlinkIncomingCalls):
(JSC::CodeBlock::replacement):
(JSC::CodeBlock::computeCapabilityLevel):
(JSC::CodeBlock::noticeIncomingCall):
(JSC::CodeBlock::nameForRegister):
(JSC::CodeBlock::insertBasicBlockBoundariesForControlFlowProfiler):
* bytecode/CodeBlock.h:
(JSC::CodeBlock::vm const):
(JSC::CodeBlock::numberOfArgumentValueProfiles):
(JSC::CodeBlock::valueProfileForArgument):
* bytecode/DeferredSourceDump.cpp:
(JSC::DeferredSourceDump::DeferredSourceDump):
* bytecode/EvalCodeBlock.h:
* bytecode/FunctionCodeBlock.h:
* bytecode/GetByIdStatus.cpp:
(JSC::GetByIdStatus::computeFromLLInt):
* bytecode/GlobalCodeBlock.h:
(JSC::GlobalCodeBlock::GlobalCodeBlock):
* bytecode/ModuleProgramCodeBlock.h:
* bytecode/ObjectAllocationProfileInlines.h:
(JSC::ObjectAllocationProfileBase<Derived>::possibleDefaultPropertyCount):
* bytecode/PolyProtoAccessChain.cpp:
(JSC::PolyProtoAccessChain::create):
* bytecode/ProgramCodeBlock.h:
* bytecode/PropertyCondition.cpp:
(JSC::PropertyCondition::isWatchableWhenValid const):
* bytecode/PutByIdStatus.cpp:
(JSC::PutByIdStatus::computeFromLLInt):
* bytecode/StructureStubInfo.cpp:
(JSC::StructureStubInfo::initGetByIdSelf):
(JSC::StructureStubInfo::initPutByIdReplace):
(JSC::StructureStubInfo::initInByIdSelf):
(JSC::StructureStubInfo::addAccessCase):
(JSC::StructureStubInfo::visitWeakReferences):
* bytecode/UnlinkedCodeBlock.cpp:
(JSC::UnlinkedCodeBlock::UnlinkedCodeBlock):
* bytecode/UnlinkedCodeBlock.h:
(JSC::UnlinkedCodeBlock::addSetConstant):
(JSC::UnlinkedCodeBlock::addConstant):
(JSC::UnlinkedCodeBlock::addFunctionDecl):
(JSC::UnlinkedCodeBlock::addFunctionExpr):
* bytecode/UnlinkedEvalCodeBlock.h:
* bytecode/UnlinkedFunctionCodeBlock.h:
* bytecode/UnlinkedFunctionExecutable.cpp:
(JSC::generateUnlinkedFunctionCodeBlock):
(JSC::UnlinkedFunctionExecutable::UnlinkedFunctionExecutable):
* bytecode/UnlinkedFunctionExecutable.h:
* bytecode/UnlinkedGlobalCodeBlock.h:
(JSC::UnlinkedGlobalCodeBlock::UnlinkedGlobalCodeBlock):
* bytecode/UnlinkedModuleProgramCodeBlock.h:
* bytecode/UnlinkedProgramCodeBlock.h:
* bytecompiler/BytecodeGenerator.cpp:
(JSC::BytecodeGenerator::BytecodeGenerator):
(JSC::BytecodeGenerator::pushLexicalScopeInternal):
(JSC::BytecodeGenerator::emitDirectPutById):
(JSC::BytecodeGenerator::getVariablesUnderTDZ):
(JSC::BytecodeGenerator::addBigIntConstant):
(JSC::BytecodeGenerator::addTemplateObjectConstant):
(JSC::BytecodeGenerator::emitNewDefaultConstructor):
(JSC::BytecodeGenerator::emitSetFunctionNameIfNeeded):
* bytecompiler/BytecodeGenerator.h:
(JSC::BytecodeGenerator::vm const):
(JSC::BytecodeGenerator::propertyNames const):
(JSC::BytecodeGenerator::emitNodeInTailPosition):
(JSC::BytecodeGenerator::emitDefineClassElements):
(JSC::BytecodeGenerator::emitNodeInConditionContext):
* bytecompiler/NodesCodegen.cpp:
(JSC::RegExpNode::emitBytecode):
(JSC::ArrayNode::emitBytecode):
(JSC::FunctionCallResolveNode::emitBytecode):
(JSC::BytecodeIntrinsicNode::emit_intrinsic_getByIdDirectPrivate):
(JSC::BytecodeIntrinsicNode::emit_intrinsic_putByIdDirectPrivate):
(JSC::BytecodeIntrinsicNode::emit_intrinsic_toObject):
(JSC::InstanceOfNode::emitBytecode):
* debugger/Debugger.cpp:
* debugger/DebuggerParseData.cpp:
(JSC::gatherDebuggerParseData):
* debugger/DebuggerScope.cpp:
(JSC::DebuggerScope::next):
(JSC::DebuggerScope::name const):
(JSC::DebuggerScope::location const):
* dfg/DFGDesiredIdentifiers.cpp:
(JSC::DFG::DesiredIdentifiers::reallyAdd):
* dfg/DFGDesiredWatchpoints.cpp:
(JSC::DFG::ArrayBufferViewWatchpointAdaptor::add):
(JSC::DFG::AdaptiveStructureWatchpointAdaptor::add):
* dfg/DFGFrozenValue.h:
(JSC::DFG::FrozenValue::FrozenValue):
* dfg/DFGGraph.cpp:
(JSC::DFG::Graph::canOptimizeStringObjectAccess):
* dfg/DFGJITCompiler.cpp:
(JSC::DFG::JITCompiler::linkOSRExits):
(JSC::DFG::JITCompiler::compileExceptionHandlers):
(JSC::DFG::JITCompiler::link):
(JSC::DFG::emitStackOverflowCheck):
(JSC::DFG::JITCompiler::compileFunction):
(JSC::DFG::JITCompiler::exceptionCheck):
(JSC::DFG::JITCompiler::makeCatchOSREntryBuffer):
* dfg/DFGJITCompiler.h:
(JSC::DFG::JITCompiler::exceptionCheckWithCallFrameRollback):
(JSC::DFG::JITCompiler::fastExceptionCheck):
(JSC::DFG::JITCompiler::vm):
* dfg/DFGLazyJSValue.cpp:
(JSC::DFG::LazyJSValue::getValue const):
(JSC::DFG::LazyJSValue::emit const):
* dfg/DFGOSREntry.cpp:
(JSC::DFG::prepareOSREntry):
* dfg/DFGOSRExit.cpp:
(JSC::DFG::OSRExit::compileOSRExit):
(JSC::DFG::OSRExit::debugOperationPrintSpeculationFailure):
* dfg/DFGOSRExitCompilerCommon.h:
(JSC::DFG::adjustFrameAndStackInOSRExitCompilerThunk):
* dfg/DFGOperations.cpp:
(JSC::DFG::newTypedArrayWithSize):
(JSC::DFG::binaryOp):
(JSC::DFG::bitwiseBinaryOp):
* dfg/DFGPlan.cpp:
(JSC::DFG::Plan::Plan):
* dfg/DFGSpeculativeJIT.cpp:
(JSC::DFG::SpeculativeJIT::emitAllocateRawObject):
(JSC::DFG::SpeculativeJIT::compileStringSlice):
(JSC::DFG::SpeculativeJIT::compileCurrentBlock):
(JSC::DFG::SpeculativeJIT::compileCheckTraps):
(JSC::DFG::SpeculativeJIT::compileGetByValOnString):
(JSC::DFG::SpeculativeJIT::compileFromCharCode):
(JSC::DFG::SpeculativeJIT::compileStringZeroLength):
(JSC::DFG::SpeculativeJIT::compileLogicalNotStringOrOther):
(JSC::DFG::SpeculativeJIT::emitStringBranch):
(JSC::DFG::SpeculativeJIT::emitStringOrOtherBranch):
(JSC::DFG::SpeculativeJIT::cageTypedArrayStorage):
(JSC::DFG::SpeculativeJIT::compileGetGlobalObject):
(JSC::DFG::SpeculativeJIT::compileNewFunctionCommon):
(JSC::DFG::SpeculativeJIT::compileCreateActivation):
(JSC::DFG::SpeculativeJIT::compileCreateDirectArguments):
(JSC::DFG::SpeculativeJIT::compileSpread):
(JSC::DFG::SpeculativeJIT::compileNewArray):
(JSC::DFG::SpeculativeJIT::compileNewArrayWithSpread):
(JSC::DFG::SpeculativeJIT::compileArraySlice):
(JSC::DFG::SpeculativeJIT::compileArrayPush):
(JSC::DFG::SpeculativeJIT::compileTypeOf):
(JSC::DFG::SpeculativeJIT::compileAllocatePropertyStorage):
(JSC::DFG::SpeculativeJIT::compileReallocatePropertyStorage):
(JSC::DFG::SpeculativeJIT::compileNukeStructureAndSetButterfly):
(JSC::DFG::SpeculativeJIT::compileCallDOMGetter):
(JSC::DFG::SpeculativeJIT::compileCheckSubClass):
(JSC::DFG::SpeculativeJIT::compileNewStringObject):
(JSC::DFG::SpeculativeJIT::compileNewTypedArrayWithSize):
(JSC::DFG::SpeculativeJIT::compileNewRegexp):
(JSC::DFG::SpeculativeJIT::compileStoreBarrier):
(JSC::DFG::SpeculativeJIT::compileStringReplace):
(JSC::DFG::SpeculativeJIT::compileMaterializeNewObject):
(JSC::DFG::SpeculativeJIT::emitAllocateButterfly):
(JSC::DFG::SpeculativeJIT::compileGetMapBucketNext):
(JSC::DFG::SpeculativeJIT::compileObjectKeys):
(JSC::DFG::SpeculativeJIT::compileCreateThis):
(JSC::DFG::SpeculativeJIT::compileNewObject):
(JSC::DFG::SpeculativeJIT::compileLogShadowChickenPrologue):
(JSC::DFG::SpeculativeJIT::compileLogShadowChickenTail):
(JSC::DFG::SpeculativeJIT::compileGetPrototypeOf):
(JSC::DFG::SpeculativeJIT::compileAllocateNewArrayWithSize):
(JSC::DFG::SpeculativeJIT::compileProfileType):
(JSC::DFG::SpeculativeJIT::compileMakeRope):
* dfg/DFGSpeculativeJIT.h:
(JSC::DFG::SpeculativeJIT::vm):
(JSC::DFG::SpeculativeJIT::prepareForExternalCall):
(JSC::DFG::SpeculativeJIT::emitAllocateJSObjectWithKnownSize):
(JSC::DFG::SpeculativeJIT::emitAllocateJSObject):
(JSC::DFG::SpeculativeJIT::emitAllocateVariableSizedJSObject):
(JSC::DFG::SpeculativeJIT::emitAllocateDestructibleObject):
* dfg/DFGSpeculativeJIT32_64.cpp:
(JSC::DFG::SpeculativeJIT::emitCall):
(JSC::DFG::SpeculativeJIT::compileLogicalNot):
(JSC::DFG::SpeculativeJIT::emitBranch):
(JSC::DFG::SpeculativeJIT::compile):
* dfg/DFGSpeculativeJIT64.cpp:
(JSC::DFG::SpeculativeJIT::nonSpeculativeNonPeepholeCompareNullOrUndefined):
(JSC::DFG::SpeculativeJIT::nonSpeculativePeepholeBranchNullOrUndefined):
(JSC::DFG::SpeculativeJIT::emitCall):
(JSC::DFG::SpeculativeJIT::compileObjectOrOtherLogicalNot):
(JSC::DFG::SpeculativeJIT::compileLogicalNot):
(JSC::DFG::SpeculativeJIT::emitObjectOrOtherBranch):
(JSC::DFG::SpeculativeJIT::emitBranch):
(JSC::DFG::SpeculativeJIT::compile):
* dfg/DFGThunks.cpp:
(JSC::DFG::osrExitThunkGenerator):
(JSC::DFG::osrExitGenerationThunkGenerator):
(JSC::DFG::osrEntryThunkGenerator):
* dfg/DFGThunks.h:
* dfg/DFGToFTLForOSREntryDeferredCompilationCallback.cpp:
(JSC::DFG::ToFTLForOSREntryDeferredCompilationCallback::compilationDidComplete):
* dfg/DFGWorklist.cpp:
(JSC::DFG::Worklist::visitWeakReferences):
* dynbench.cpp:
(main):
* ftl/FTLLowerDFGToB3.cpp:
(JSC::FTL::DFG::LowerDFGToB3::compileMakeRope):
(JSC::FTL::DFG::LowerDFGToB3::compileStringSlice):
(JSC::FTL::DFG::LowerDFGToB3::boolify):
* ftl/FTLThunks.cpp:
(JSC::FTL::genericGenerationThunkGenerator):
(JSC::FTL::osrExitGenerationThunkGenerator):
(JSC::FTL::lazySlowPathGenerationThunkGenerator):
* ftl/FTLThunks.h:
* heap/CellContainer.h:
* heap/CellContainerInlines.h:
(JSC::CellContainer::vm const):
(JSC::CellContainer::heap const):
* heap/CompleteSubspace.cpp:
(JSC::CompleteSubspace::tryAllocateSlow):
(JSC::CompleteSubspace::reallocateLargeAllocationNonVirtual):
* heap/GCActivityCallback.h:
* heap/GCAssertions.h:
* heap/HandleSet.cpp:
(JSC::HandleSet::HandleSet):
* heap/HandleSet.h:
(JSC::HandleSet::vm):
* heap/Heap.cpp:
(JSC::Heap::Heap):
(JSC::Heap::lastChanceToFinalize):
(JSC::Heap::releaseDelayedReleasedObjects):
(JSC::Heap::protect):
(JSC::Heap::unprotect):
(JSC::Heap::finalizeMarkedUnconditionalFinalizers):
(JSC::Heap::finalizeUnconditionalFinalizers):
(JSC::Heap::completeAllJITPlans):
(JSC::Heap::iterateExecutingAndCompilingCodeBlocks):
(JSC::Heap::gatherJSStackRoots):
(JSC::Heap::gatherScratchBufferRoots):
(JSC::Heap::removeDeadCompilerWorklistEntries):
(JSC::Heap::isAnalyzingHeap const):
(JSC::Heap::gatherExtraHeapData):
(JSC::Heap::protectedObjectTypeCounts):
(JSC::Heap::objectTypeCounts):
(JSC::Heap::deleteAllCodeBlocks):
(JSC::Heap::deleteAllUnlinkedCodeBlocks):
(JSC::Heap::deleteUnmarkedCompiledCode):
(JSC::Heap::checkConn):
(JSC::Heap::runEndPhase):
(JSC::Heap::stopThePeriphery):
(JSC::Heap::finalize):
(JSC::Heap::requestCollection):
(JSC::Heap::sweepInFinalize):
(JSC::Heap::sweepArrayBuffers):
(JSC::Heap::deleteSourceProviderCaches):
(JSC::Heap::didFinishCollection):
(JSC::Heap::addCoreConstraints):
* heap/Heap.h:
* heap/HeapCell.h:
* heap/HeapCellInlines.h:
(JSC::HeapCell::heap const):
(JSC::HeapCell::vm const):
* heap/HeapInlines.h:
(JSC::Heap::vm const):
* heap/IsoSubspacePerVM.cpp:
(JSC::IsoSubspacePerVM::AutoremovingIsoSubspace::~AutoremovingIsoSubspace):
* heap/LargeAllocation.cpp:
(JSC::LargeAllocation::sweep):
(JSC::LargeAllocation::assertValidCell const):
* heap/LargeAllocation.h:
(JSC::LargeAllocation::vm const):
* heap/LocalAllocator.cpp:
(JSC::LocalAllocator::allocateSlowCase):
* heap/MarkedBlock.cpp:
(JSC::MarkedBlock::Handle::Handle):
(JSC::MarkedBlock::aboutToMarkSlow):
(JSC::MarkedBlock::assertMarksNotStale):
(JSC::MarkedBlock::areMarksStale):
(JSC::MarkedBlock::isMarked):
(JSC::MarkedBlock::assertValidCell const):
* heap/MarkedBlock.h:
(JSC::MarkedBlock::Handle::vm const):
(JSC::MarkedBlock::vm const):
* heap/MarkedBlockInlines.h:
(JSC::MarkedBlock::heap const):
(JSC::MarkedBlock::Handle::specializedSweep):
* heap/SlotVisitor.cpp:
(JSC::validate):
* heap/SlotVisitorInlines.h:
(JSC::SlotVisitor::vm):
(JSC::SlotVisitor::vm const):
* heap/StopIfNecessaryTimer.cpp:
(JSC::StopIfNecessaryTimer::StopIfNecessaryTimer):
* heap/StopIfNecessaryTimer.h:
* heap/Strong.h:
(JSC::Strong::operator=):
* heap/WeakSet.h:
(JSC::WeakSet::WeakSet):
(JSC::WeakSet::vm const):
* inspector/JSInjectedScriptHost.cpp:
(Inspector::JSInjectedScriptHost::savedResultAlias const):
(Inspector::JSInjectedScriptHost::internalConstructorName):
(Inspector::JSInjectedScriptHost::subtype):
(Inspector::JSInjectedScriptHost::functionDetails):
(Inspector::constructInternalProperty):
(Inspector::JSInjectedScriptHost::getInternalProperties):
(Inspector::JSInjectedScriptHost::weakMapEntries):
(Inspector::JSInjectedScriptHost::weakSetEntries):
(Inspector::JSInjectedScriptHost::iteratorEntries):
(Inspector::JSInjectedScriptHost::queryInstances):
(Inspector::JSInjectedScriptHost::queryHolders):
* inspector/JSJavaScriptCallFrame.cpp:
(Inspector::valueForScopeLocation):
(Inspector::JSJavaScriptCallFrame::scopeDescriptions):
(Inspector::JSJavaScriptCallFrame::functionName const):
(Inspector::JSJavaScriptCallFrame::type const):
* inspector/ScriptCallStackFactory.cpp:
(Inspector::extractSourceInformationFromException):
* inspector/agents/InspectorAuditAgent.cpp:
(Inspector::InspectorAuditAgent::populateAuditObject):
* inspector/agents/InspectorHeapAgent.cpp:
(Inspector::InspectorHeapAgent::gc):
* interpreter/FrameTracers.h:
(JSC::NativeCallFrameTracer::NativeCallFrameTracer):
* interpreter/Interpreter.cpp:
(JSC::Interpreter::executeProgram):
(JSC::Interpreter::prepareForRepeatCall):
(JSC::Interpreter::execute):
(JSC::Interpreter::executeModuleProgram):
* interpreter/StackVisitor.cpp:
(JSC::StackVisitor::Frame::calleeSaveRegistersForUnwinding):
(JSC::StackVisitor::Frame::computeLineAndColumn const):
* jit/AssemblyHelpers.cpp:
(JSC::AssemblyHelpers::emitDumbVirtualCall):
(JSC::AssemblyHelpers::emitConvertValueToBoolean):
(JSC::AssemblyHelpers::branchIfValue):
* jit/AssemblyHelpers.h:
(JSC::AssemblyHelpers::vm):
* jit/JIT.cpp:
(JSC::JIT::JIT):
(JSC::JIT::emitEnterOptimizationCheck):
(JSC::JIT::privateCompileMainPass):
(JSC::JIT::privateCompileExceptionHandlers):
* jit/JIT.h:
* jit/JITCall.cpp:
(JSC::JIT::compileCallEvalSlowCase):
* jit/JITCall32_64.cpp:
(JSC::JIT::compileCallEvalSlowCase):
* jit/JITExceptions.cpp:
(JSC::genericUnwind):
* jit/JITExceptions.h:
* jit/JITInlineCacheGenerator.cpp:
(JSC::JITGetByIdGenerator::JITGetByIdGenerator):
* jit/JITOpcodes.cpp:
(JSC::JIT::emit_op_is_undefined):
(JSC::JIT::emit_op_jfalse):
(JSC::JIT::emit_op_jeq_null):
(JSC::JIT::emit_op_jneq_null):
(JSC::JIT::emit_op_jtrue):
(JSC::JIT::emit_op_throw):
(JSC::JIT::emit_op_catch):
(JSC::JIT::emit_op_eq_null):
(JSC::JIT::emit_op_neq_null):
(JSC::JIT::emitSlow_op_loop_hint):
(JSC::JIT::emit_op_log_shadow_chicken_prologue):
(JSC::JIT::emit_op_log_shadow_chicken_tail):
* jit/JITOpcodes32_64.cpp:
(JSC::JIT::emit_op_jfalse):
(JSC::JIT::emit_op_jtrue):
(JSC::JIT::emit_op_throw):
(JSC::JIT::emit_op_catch):
(JSC::JIT::emit_op_log_shadow_chicken_prologue):
(JSC::JIT::emit_op_log_shadow_chicken_tail):
* jit/JITOperations.cpp:
(JSC::operationNewFunctionCommon):
(JSC::tryGetByValOptimize):
* jit/JITPropertyAccess.cpp:
(JSC::JIT::emitWriteBarrier):
* jit/JITThunks.cpp:
(JSC::JITThunks::ctiNativeCall):
(JSC::JITThunks::ctiNativeConstruct):
(JSC::JITThunks::ctiNativeTailCall):
(JSC::JITThunks::ctiNativeTailCallWithoutSavedTags):
(JSC::JITThunks::ctiInternalFunctionCall):
(JSC::JITThunks::ctiInternalFunctionConstruct):
(JSC::JITThunks::ctiStub):
(JSC::JITThunks::hostFunctionStub):
* jit/JITThunks.h:
* jit/JITWorklist.cpp:
(JSC::JITWorklist::Plan::vm):
(JSC::JITWorklist::completeAllForVM):
(JSC::JITWorklist::poll):
(JSC::JITWorklist::compileLater):
(JSC::JITWorklist::compileNow):
* jit/Repatch.cpp:
(JSC::readPutICCallTarget):
(JSC::ftlThunkAwareRepatchCall):
(JSC::linkSlowFor):
(JSC::linkFor):
(JSC::linkDirectFor):
(JSC::revertCall):
(JSC::unlinkFor):
(JSC::linkVirtualFor):
(JSC::linkPolymorphicCall):
* jit/SpecializedThunkJIT.h:
(JSC::SpecializedThunkJIT::SpecializedThunkJIT):
* jit/ThunkGenerator.h:
* jit/ThunkGenerators.cpp:
(JSC::throwExceptionFromCallSlowPathGenerator):
(JSC::slowPathFor):
(JSC::linkCallThunkGenerator):
(JSC::linkPolymorphicCallThunkGenerator):
(JSC::virtualThunkFor):
(JSC::nativeForGenerator):
(JSC::nativeCallGenerator):
(JSC::nativeTailCallGenerator):
(JSC::nativeTailCallWithoutSavedTagsGenerator):
(JSC::nativeConstructGenerator):
(JSC::internalFunctionCallGenerator):
(JSC::internalFunctionConstructGenerator):
(JSC::arityFixupGenerator):
(JSC::unreachableGenerator):
(JSC::stringGetByValGenerator):
(JSC::charToString):
(JSC::charCodeAtThunkGenerator):
(JSC::charAtThunkGenerator):
(JSC::fromCharCodeThunkGenerator):
(JSC::clz32ThunkGenerator):
(JSC::sqrtThunkGenerator):
(JSC::floorThunkGenerator):
(JSC::ceilThunkGenerator):
(JSC::truncThunkGenerator):
(JSC::roundThunkGenerator):
(JSC::expThunkGenerator):
(JSC::logThunkGenerator):
(JSC::absThunkGenerator):
(JSC::imulThunkGenerator):
(JSC::randomThunkGenerator):
(JSC::boundThisNoArgsFunctionCallGenerator):
* jit/ThunkGenerators.h:
* jsc.cpp:
(GlobalObject::finishCreation):
(GlobalObject::addFunction):
(GlobalObject::moduleLoaderImportModule):
(GlobalObject::moduleLoaderResolve):
(GlobalObject::moduleLoaderCreateImportMetaProperties):
(functionDescribe):
(functionDescribeArray):
(JSCMemoryFootprint::addProperty):
(functionRun):
(functionRunString):
(functionReadFile):
(functionCallerSourceOrigin):
(functionReadline):
(functionDollarCreateRealm):
(functionDollarEvalScript):
(functionDollarAgentGetReport):
(functionWaitForReport):
(functionJSCOptions):
(functionCheckModuleSyntax):
(functionGenerateHeapSnapshotForGCDebugging):
(functionWebAssemblyMemoryMode):
(dumpException):
(checkUncaughtException):
* llint/LLIntSlowPaths.cpp:
(JSC::LLInt::LLINT_SLOW_PATH_DECL):
(JSC::LLInt::handleHostCall):
* parser/ASTBuilder.h:
(JSC::ASTBuilder::ASTBuilder):
(JSC::ASTBuilder::createResolve):
(JSC::ASTBuilder::createGetterOrSetterProperty):
(JSC::ASTBuilder::createProperty):
(JSC::ASTBuilder::createFuncDeclStatement):
(JSC::ASTBuilder::makeFunctionCallNode):
* parser/Lexer.cpp:
(JSC::Lexer<T>::Lexer):
(JSC::Lexer<LChar>::parseIdentifier):
(JSC::Lexer<UChar>::parseIdentifier):
* parser/Lexer.h:
(JSC::Lexer<T>::lexExpectIdentifier):
* parser/ModuleAnalyzer.cpp:
(JSC::ModuleAnalyzer::ModuleAnalyzer):
* parser/ModuleAnalyzer.h:
(JSC::ModuleAnalyzer::vm):
* parser/Parser.cpp:
(JSC::Parser<LexerType>::Parser):
(JSC::Parser<LexerType>::parseInner):
(JSC::Parser<LexerType>::isArrowFunctionParameters):
(JSC::Parser<LexerType>::parseSourceElements):
(JSC::Parser<LexerType>::parseModuleSourceElements):
(JSC::Parser<LexerType>::parseGeneratorFunctionSourceElements):
(JSC::Parser<LexerType>::parseAsyncFunctionSourceElements):
(JSC::Parser<LexerType>::parseAsyncGeneratorFunctionSourceElements):
(JSC::Parser<LexerType>::parseSingleFunction):
(JSC::Parser<LexerType>::parseStatementListItem):
(JSC::Parser<LexerType>::parseObjectRestAssignmentElement):
(JSC::Parser<LexerType>::parseAssignmentElement):
(JSC::Parser<LexerType>::parseDestructuringPattern):
(JSC::Parser<LexerType>::parseForStatement):
(JSC::Parser<LexerType>::parseBreakStatement):
(JSC::Parser<LexerType>::parseContinueStatement):
(JSC::Parser<LexerType>::parseStatement):
(JSC::Parser<LexerType>::maybeParseAsyncFunctionDeclarationStatement):
(JSC::Parser<LexerType>::createGeneratorParameters):
(JSC::Parser<LexerType>::parseFunctionInfo):
(JSC::Parser<LexerType>::parseFunctionDeclaration):
(JSC::Parser<LexerType>::parseAsyncFunctionDeclaration):
(JSC::Parser<LexerType>::parseClassDeclaration):
(JSC::Parser<LexerType>::parseClass):
(JSC::Parser<LexerType>::parseImportClauseItem):
(JSC::Parser<LexerType>::parseImportDeclaration):
(JSC::Parser<LexerType>::parseExportSpecifier):
(JSC::Parser<LexerType>::parseExportDeclaration):
(JSC::Parser<LexerType>::parseAssignmentExpression):
(JSC::Parser<LexerType>::parseProperty):
(JSC::Parser<LexerType>::parseGetterSetter):
(JSC::Parser<LexerType>::parseObjectLiteral):
(JSC::Parser<LexerType>::parseStrictObjectLiteral):
(JSC::Parser<LexerType>::parseClassExpression):
(JSC::Parser<LexerType>::parseFunctionExpression):
(JSC::Parser<LexerType>::parseAsyncFunctionExpression):
(JSC::Parser<LexerType>::parsePrimaryExpression):
(JSC::Parser<LexerType>::parseMemberExpression):
(JSC::Parser<LexerType>::parseArrowFunctionExpression):
(JSC::Parser<LexerType>::parseUnaryExpression):
* parser/Parser.h:
(JSC::isArguments):
(JSC::isEval):
(JSC::isEvalOrArgumentsIdentifier):
(JSC::Scope::Scope):
(JSC::Scope::declareParameter):
(JSC::Scope::setInnerArrowFunctionUsesEvalAndUseArgumentsIfNeeded):
(JSC::Scope::collectFreeVariables):
(JSC::Parser::canRecurse):
(JSC::parse):
(JSC::parseFunctionForFunctionConstructor):
* parser/ParserArena.h:
(JSC::IdentifierArena::makeIdentifier):
(JSC::IdentifierArena::makeEmptyIdentifier):
(JSC::IdentifierArena::makeIdentifierLCharFromUChar):
(JSC::IdentifierArena::makeNumericIdentifier):
* parser/SyntaxChecker.h:
(JSC::SyntaxChecker::SyntaxChecker):
(JSC::SyntaxChecker::createProperty):
(JSC::SyntaxChecker::createGetterOrSetterProperty):
* profiler/ProfilerBytecode.cpp:
(JSC::Profiler::Bytecode::toJS const):
* profiler/ProfilerBytecodeSequence.cpp:
(JSC::Profiler::BytecodeSequence::addSequenceProperties const):
* profiler/ProfilerBytecodes.cpp:
(JSC::Profiler::Bytecodes::toJS const):
* profiler/ProfilerCompilation.cpp:
(JSC::Profiler::Compilation::toJS const):
* profiler/ProfilerCompiledBytecode.cpp:
(JSC::Profiler::CompiledBytecode::toJS const):
* profiler/ProfilerEvent.cpp:
(JSC::Profiler::Event::toJS const):
* profiler/ProfilerOSRExit.cpp:
(JSC::Profiler::OSRExit::toJS const):
* profiler/ProfilerOSRExitSite.cpp:
(JSC::Profiler::OSRExitSite::toJS const):
* profiler/ProfilerUID.cpp:
(JSC::Profiler::UID::toJS const):
* runtime/AbstractModuleRecord.cpp:
(JSC::AbstractModuleRecord::finishCreation):
(JSC::AbstractModuleRecord::hostResolveImportedModule):
(JSC::AbstractModuleRecord::resolveExportImpl):
(JSC::getExportedNames):
(JSC::AbstractModuleRecord::getModuleNamespace):
* runtime/ArrayBufferNeuteringWatchpointSet.cpp:
(JSC::ArrayBufferNeuteringWatchpointSet::fireAll):
* runtime/ArrayIteratorPrototype.cpp:
(JSC::ArrayIteratorPrototype::finishCreation):
* runtime/ArrayPrototype.cpp:
(JSC::fastJoin):
(JSC::arrayProtoFuncToLocaleString):
(JSC::slowJoin):
(JSC::arrayProtoFuncJoin):
(JSC::arrayProtoFuncPush):
* runtime/AsyncFunctionPrototype.cpp:
(JSC::AsyncFunctionPrototype::finishCreation):
* runtime/AsyncGeneratorFunctionPrototype.cpp:
(JSC::AsyncGeneratorFunctionPrototype::finishCreation):
* runtime/AsyncGeneratorPrototype.cpp:
(JSC::AsyncGeneratorPrototype::finishCreation):
* runtime/AtomicsObject.cpp:
(JSC::AtomicsObject::finishCreation):
(JSC::atomicsFuncWait):
(JSC::operationAtomicsAdd):
(JSC::operationAtomicsAnd):
(JSC::operationAtomicsCompareExchange):
(JSC::operationAtomicsExchange):
(JSC::operationAtomicsIsLockFree):
(JSC::operationAtomicsLoad):
(JSC::operationAtomicsOr):
(JSC::operationAtomicsStore):
(JSC::operationAtomicsSub):
(JSC::operationAtomicsXor):
* runtime/BigIntPrototype.cpp:
(JSC::BigIntPrototype::finishCreation):
(JSC::bigIntProtoFuncToString):
* runtime/CachedTypes.cpp:
(JSC::CachedUniquedStringImplBase::decode const):
(JSC::CachedIdentifier::decode const):
(JSC::CachedJSValue::decode const):
* runtime/CodeCache.cpp:
(JSC::CodeCacheMap::pruneSlowCase):
(JSC::CodeCache::getUnlinkedGlobalFunctionExecutable):
* runtime/CodeCache.h:
(JSC::generateUnlinkedCodeBlockImpl):
* runtime/CommonIdentifiers.cpp:
(JSC::CommonIdentifiers::CommonIdentifiers):
* runtime/CommonIdentifiers.h:
* runtime/CommonSlowPaths.cpp:
(JSC::SLOW_PATH_DECL):
* runtime/Completion.cpp:
(JSC::checkSyntaxInternal):
(JSC::checkModuleSyntax):
(JSC::loadAndEvaluateModule):
(JSC::loadModule):
* runtime/DateConstructor.cpp:
(JSC::callDate):
* runtime/DatePrototype.cpp:
(JSC::formatLocaleDate):
(JSC::formateDateInstance):
(JSC::DatePrototype::finishCreation):
(JSC::dateProtoFuncToISOString):
* runtime/Error.cpp:
(JSC::addErrorInfo):
* runtime/ErrorInstance.cpp:
(JSC::appendSourceToError):
(JSC::ErrorInstance::finishCreation):
(JSC::ErrorInstance::materializeErrorInfoIfNeeded):
* runtime/ErrorPrototype.cpp:
(JSC::ErrorPrototype::finishCreation):
(JSC::errorProtoFuncToString):
* runtime/ExceptionHelpers.cpp:
(JSC::TerminatedExecutionError::defaultValue):
* runtime/FunctionPrototype.cpp:
(JSC::functionProtoFuncToString):
* runtime/FunctionRareData.cpp:
(JSC::FunctionRareData::clear):
* runtime/GeneratorFunctionPrototype.cpp:
(JSC::GeneratorFunctionPrototype::finishCreation):
* runtime/GeneratorPrototype.cpp:
(JSC::GeneratorPrototype::finishCreation):
* runtime/GenericArgumentsInlines.h:
(JSC::GenericArguments<Type>::getOwnPropertyNames):
* runtime/GetterSetter.h:
* runtime/Identifier.cpp:
(JSC::Identifier::add):
(JSC::Identifier::add8):
(JSC::Identifier::from):
(JSC::Identifier::checkCurrentAtomStringTable):
* runtime/Identifier.h:
(JSC::Identifier::fromString):
(JSC::Identifier::createLCharFromUChar):
(JSC::Identifier::Identifier):
(JSC::Identifier::add):
* runtime/IdentifierInlines.h:
(JSC::Identifier::Identifier):
(JSC::Identifier::add):
(JSC::Identifier::fromUid):
(JSC::Identifier::fromString):
(JSC::identifierToJSValue):
(JSC::identifierToSafePublicJSValue):
* runtime/InternalFunction.cpp:
(JSC::InternalFunction::finishCreation):
* runtime/IntlCollator.cpp:
(JSC::IntlCollator::resolvedOptions):
* runtime/IntlCollatorPrototype.cpp:
(JSC::IntlCollatorPrototype::finishCreation):
* runtime/IntlDateTimeFormat.cpp:
(JSC::IntlDTFInternal::toDateTimeOptionsAnyDate):
(JSC::IntlDateTimeFormat::resolvedOptions):
(JSC::IntlDateTimeFormat::format):
(JSC::IntlDateTimeFormat::formatToParts):
* runtime/IntlDateTimeFormatPrototype.cpp:
(JSC::IntlDateTimeFormatPrototype::finishCreation):
* runtime/IntlNumberFormat.cpp:
(JSC::IntlNumberFormat::initializeNumberFormat):
(JSC::IntlNumberFormat::formatNumber):
(JSC::IntlNumberFormat::resolvedOptions):
(JSC::IntlNumberFormat::formatToParts):
* runtime/IntlNumberFormatPrototype.cpp:
(JSC::IntlNumberFormatPrototype::finishCreation):
* runtime/IntlObject.cpp:
(JSC::lookupSupportedLocales):
(JSC::supportedLocales):
(JSC::intlObjectFuncGetCanonicalLocales):
* runtime/IntlPluralRules.cpp:
(JSC::IntlPluralRules::initializePluralRules):
(JSC::IntlPluralRules::resolvedOptions):
(JSC::IntlPluralRules::select):
* runtime/IntlPluralRulesPrototype.cpp:
(JSC::IntlPluralRulesPrototype::finishCreation):
* runtime/JSArray.h:
(JSC::asArray):
(JSC::isJSArray):
* runtime/JSArrayBufferPrototype.cpp:
(JSC::JSArrayBufferPrototype::finishCreation):
* runtime/JSArrayBufferView.cpp:
(JSC::JSArrayBufferView::slowDownAndWasteMemory):
* runtime/JSCJSValue.cpp:
(JSC::JSValue::putToPrimitiveByIndex):
(JSC::JSValue::dumpForBacktrace const):
(JSC::JSValue::toStringSlowCase const):
* runtime/JSCJSValueInlines.h:
(JSC::JSValue::toPropertyKey const):
(JSC::JSValue::get const):
* runtime/JSCast.h:
(JSC::jsCast):
* runtime/JSCell.cpp:
(JSC::JSCell::dump const):
(JSC::JSCell::dumpToStream):
(JSC::JSCell::putByIndex):
* runtime/JSCellInlines.h:
(JSC::JSCell::structure const):
(JSC::ExecState::vm const):
(JSC::tryAllocateCellHelper):
* runtime/JSDataViewPrototype.cpp:
(JSC::JSDataViewPrototype::finishCreation):
* runtime/JSFixedArray.cpp:
(JSC::JSFixedArray::dumpToStream):
* runtime/JSFunction.cpp:
(JSC::JSFunction::finishCreation):
(JSC::RetrieveCallerFunctionFunctor::operator() const):
(JSC::JSFunction::reifyName):
(JSC::JSFunction::reifyLazyBoundNameIfNeeded):
(JSC::JSFunction::assertTypeInfoFlagInvariants):
* runtime/JSGenericTypedArrayViewInlines.h:
(JSC::JSGenericTypedArrayView<Adaptor>::deletePropertyByIndex):
(JSC::JSGenericTypedArrayView<Adaptor>::getOwnPropertyNames):
* runtime/JSGlobalObject.cpp:
(JSC::JSGlobalObject::init):
(JSC::JSGlobalObject::exposeDollarVM):
* runtime/JSGlobalObjectFunctions.cpp:
(JSC::encode):
(JSC::decode):
(JSC::globalFuncEscape):
(JSC::globalFuncUnescape):
(JSC::globalFuncBuiltinDescribe):
* runtime/JSLexicalEnvironment.cpp:
(JSC::JSLexicalEnvironment::getOwnNonIndexPropertyNames):
* runtime/JSModuleEnvironment.cpp:
(JSC::JSModuleEnvironment::getOwnPropertySlot):
(JSC::JSModuleEnvironment::put):
(JSC::JSModuleEnvironment::deleteProperty):
* runtime/JSModuleLoader.cpp:
(JSC::JSModuleLoader::finishCreation):
(JSC::JSModuleLoader::requestImportModule):
(JSC::moduleLoaderParseModule):
(JSC::moduleLoaderRequestedModules):
* runtime/JSModuleNamespaceObject.cpp:
(JSC::JSModuleNamespaceObject::finishCreation):
(JSC::JSModuleNamespaceObject::getOwnPropertySlotByIndex):
* runtime/JSModuleRecord.cpp:
(JSC::JSModuleRecord::instantiateDeclarations):
* runtime/JSONObject.cpp:
(JSC::JSONObject::finishCreation):
(JSC::PropertyNameForFunctionCall::value const):
(JSC::Stringifier::Stringifier):
(JSC::Stringifier::stringify):
(JSC::Stringifier::Holder::appendNextProperty):
(JSC::Walker::walk):
* runtime/JSObject.cpp:
(JSC::getClassPropertyNames):
(JSC::JSObject::getOwnPropertySlotByIndex):
(JSC::JSObject::putByIndex):
(JSC::JSObject::deletePropertyByIndex):
(JSC::JSObject::toString const):
(JSC::JSObject::reifyAllStaticProperties):
(JSC::JSObject::putDirectIndexSlowOrBeyondVectorLength):
* runtime/JSObject.h:
(JSC::JSObject::putByIndexInline):
(JSC::JSObject::butterflyPreCapacity):
(JSC::JSObject::butterflyTotalSize):
(JSC::makeIdentifier):
* runtime/JSPromisePrototype.cpp:
(JSC::JSPromisePrototype::finishCreation):
* runtime/JSPropertyNameEnumerator.cpp:
(JSC::JSPropertyNameEnumerator::finishCreation):
* runtime/JSPropertyNameEnumerator.h:
(JSC::propertyNameEnumerator):
* runtime/JSRunLoopTimer.cpp:
(JSC::JSRunLoopTimer::JSRunLoopTimer):
* runtime/JSRunLoopTimer.h:
* runtime/JSString.cpp:
(JSC::JSString::dumpToStream):
(JSC::JSRopeString::resolveRopeWithFunction const):
(JSC::jsStringWithCacheSlowCase):
* runtime/JSString.h:
(JSC::jsEmptyString):
(JSC::jsSingleCharacterString):
(JSC::jsNontrivialString):
(JSC::JSString::toIdentifier const):
(JSC::JSString::toAtomString const):
(JSC::JSString::toExistingAtomString const):
(JSC::JSString::value const):
(JSC::JSString::tryGetValue const):
(JSC::JSString::getIndex):
(JSC::jsString):
(JSC::jsSubstring):
(JSC::jsOwnedString):
(JSC::jsStringWithCache):
(JSC::JSRopeString::unsafeView const):
(JSC::JSRopeString::viewWithUnderlyingString const):
(JSC::JSString::unsafeView const):
* runtime/JSStringInlines.h:
(JSC::jsMakeNontrivialString):
(JSC::repeatCharacter):
* runtime/JSStringJoiner.cpp:
(JSC::JSStringJoiner::join):
* runtime/JSSymbolTableObject.cpp:
(JSC::JSSymbolTableObject::getOwnNonIndexPropertyNames):
* runtime/JSTemplateObjectDescriptor.cpp:
(JSC::JSTemplateObjectDescriptor::createTemplateObject):
* runtime/JSTypedArrayViewPrototype.cpp:
(JSC::typedArrayViewProtoGetterFuncToStringTag):
* runtime/LazyClassStructure.cpp:
(JSC::LazyClassStructure::Initializer::setConstructor):
* runtime/LazyProperty.h:
(JSC::LazyProperty::Initializer::Initializer):
* runtime/LiteralParser.cpp:
(JSC::LiteralParser<CharType>::tryJSONPParse):
(JSC::LiteralParser<CharType>::makeIdentifier):
(JSC::LiteralParser<CharType>::parse):
* runtime/Lookup.h:
(JSC::reifyStaticProperties):
* runtime/MapIteratorPrototype.cpp:
(JSC::MapIteratorPrototype::finishCreation):
* runtime/MapPrototype.cpp:
(JSC::MapPrototype::finishCreation):
* runtime/MathObject.cpp:
(JSC::MathObject::finishCreation):
* runtime/NumberConstructor.cpp:
(JSC::NumberConstructor::finishCreation):
* runtime/NumberPrototype.cpp:
(JSC::numberProtoFuncToExponential):
(JSC::numberProtoFuncToFixed):
(JSC::numberProtoFuncToPrecision):
(JSC::int32ToStringInternal):
(JSC::numberToStringInternal):
(JSC::int52ToString):
* runtime/ObjectConstructor.cpp:
(JSC::objectConstructorGetOwnPropertyDescriptors):
(JSC::objectConstructorAssign):
(JSC::objectConstructorValues):
(JSC::defineProperties):
(JSC::setIntegrityLevel):
(JSC::testIntegrityLevel):
(JSC::ownPropertyKeys):
* runtime/ObjectPrototype.cpp:
(JSC::objectProtoFuncToString):
* runtime/Operations.h:
(JSC::jsString):
(JSC::jsStringFromRegisterArray):
(JSC::jsStringFromArguments):
* runtime/ProgramExecutable.cpp:
(JSC::ProgramExecutable::initializeGlobalProperties):
* runtime/PromiseDeferredTimer.cpp:
(JSC::PromiseDeferredTimer::PromiseDeferredTimer):
(JSC::PromiseDeferredTimer::hasPendingPromise):
(JSC::PromiseDeferredTimer::hasDependancyInPendingPromise):
(JSC::PromiseDeferredTimer::cancelPendingPromise):
* runtime/PropertyNameArray.h:
(JSC::PropertyNameArray::PropertyNameArray):
(JSC::PropertyNameArray::vm):
* runtime/PropertySlot.h:
(JSC::PropertySlot::getValue const):
* runtime/ProxyObject.cpp:
(JSC::performProxyGet):
(JSC::ProxyObject::performInternalMethodGetOwnProperty):
(JSC::ProxyObject::performHasProperty):
(JSC::ProxyObject::getOwnPropertySlotByIndex):
(JSC::ProxyObject::performPut):
(JSC::ProxyObject::putByIndexCommon):
(JSC::ProxyObject::performDelete):
(JSC::ProxyObject::deletePropertyByIndex):
(JSC::ProxyObject::performDefineOwnProperty):
(JSC::ProxyObject::performGetOwnPropertyNames):
* runtime/RegExpGlobalData.cpp:
(JSC::RegExpGlobalData::getBackref):
(JSC::RegExpGlobalData::getLastParen):
* runtime/RegExpMatchesArray.cpp:
(JSC::createEmptyRegExpMatchesArray):
* runtime/RegExpMatchesArray.h:
(JSC::createRegExpMatchesArray):
* runtime/RegExpPrototype.cpp:
(JSC::regExpProtoGetterFlags):
(JSC::regExpProtoGetterSourceInternal):
(JSC::regExpProtoGetterSource):
* runtime/RegExpStringIteratorPrototype.cpp:
(JSC::RegExpStringIteratorPrototype::finishCreation):
* runtime/SamplingProfiler.cpp:
(JSC::SamplingProfiler::processUnverifiedStackTraces):
* runtime/ScriptExecutable.cpp:
(JSC::ScriptExecutable::installCode):
(JSC::ScriptExecutable::newCodeBlockFor):
(JSC::ScriptExecutable::newReplacementCodeBlockFor):
(JSC::setupJIT):
* runtime/SetIteratorPrototype.cpp:
(JSC::SetIteratorPrototype::finishCreation):
* runtime/SetPrototype.cpp:
(JSC::SetPrototype::finishCreation):
* runtime/StackFrame.cpp:
(JSC::StackFrame::computeLineAndColumn const):
* runtime/StringConstructor.cpp:
(JSC::stringFromCharCode):
(JSC::stringFromCodePoint):
(JSC::stringConstructor):
(JSC::callStringConstructor):
* runtime/StringIteratorPrototype.cpp:
(JSC::StringIteratorPrototype::finishCreation):
* runtime/StringObject.cpp:
(JSC::StringObject::getOwnPropertySlotByIndex):
(JSC::StringObject::getOwnPropertyNames):
* runtime/StringObject.h:
(JSC::StringObject::create):
(JSC::jsStringWithReuse):
(JSC::jsSubstring):
* runtime/StringPrototype.cpp:
(JSC::StringPrototype::finishCreation):
(JSC::StringPrototype::create):
(JSC::jsSpliceSubstrings):
(JSC::jsSpliceSubstringsWithSeparators):
(JSC::replaceUsingRegExpSearch):
(JSC::operationStringProtoFuncReplaceRegExpEmptyStr):
(JSC::operationStringProtoFuncReplaceRegExpString):
(JSC::replaceUsingStringSearch):
(JSC::operationStringProtoFuncReplaceGeneric):
(JSC::stringProtoFuncCharAt):
(JSC::stringProtoFuncSplitFast):
(JSC::stringProtoFuncSubstr):
(JSC::stringProtoFuncToLowerCase):
(JSC::stringProtoFuncToUpperCase):
(JSC::toLocaleCase):
(JSC::trimString):
(JSC::normalize):
* runtime/StringPrototypeInlines.h:
(JSC::stringSlice):
* runtime/StringRecursionChecker.cpp:
(JSC::StringRecursionChecker::emptyString):
* runtime/Structure.cpp:
(JSC::Structure::didTransitionFromThisStructure const):
* runtime/StructureInlines.h:
(JSC::Structure::didReplaceProperty):
(JSC::Structure::shouldConvertToPolyProto):
* runtime/SymbolConstructor.cpp:
(JSC::symbolConstructorKeyFor):
* runtime/SymbolPrototype.cpp:
(JSC::SymbolPrototype::finishCreation):
(JSC::symbolProtoGetterDescription):
(JSC::symbolProtoFuncToString):
* runtime/SymbolTable.cpp:
(JSC::SymbolTable::setRareDataCodeBlock):
* runtime/TestRunnerUtils.cpp:
(JSC::getExecutableForFunction):
* runtime/VM.cpp:
(JSC::VM::VM):
(JSC::VM::getHostFunction):
(JSC::VM::getCTIInternalFunctionTrampolineFor):
(JSC::VM::shrinkFootprintWhenIdle):
(JSC::logSanitizeStack):
(JSC::sanitizeStackForVM):
(JSC::VM::emptyPropertyNameEnumeratorSlow):
* runtime/VM.h:
(JSC::VM::getCTIStub):
(JSC::WeakSet::heap const):
* runtime/VMTraps.cpp:
* runtime/WeakMapPrototype.cpp:
(JSC::WeakMapPrototype::finishCreation):
* runtime/WeakObjectRefPrototype.cpp:
(JSC::WeakObjectRefPrototype::finishCreation):
* runtime/WeakSetPrototype.cpp:
(JSC::WeakSetPrototype::finishCreation):
* tools/HeapVerifier.cpp:
(JSC::HeapVerifier::printVerificationHeader):
(JSC::HeapVerifier::verifyCellList):
(JSC::HeapVerifier::validateJSCell):
(JSC::HeapVerifier::reportCell):
* tools/JSDollarVM.cpp:
(JSC::JSDollarVMCallFrame::finishCreation):
(JSC::JSDollarVMCallFrame::addProperty):
(JSC::CustomGetter::getOwnPropertySlot):
(JSC::CustomGetter::customGetter):
(JSC::CustomGetter::customGetterAcessor):
(JSC::DOMJITGetter::DOMJITAttribute::slowCall):
(JSC::DOMJITGetter::finishCreation):
(JSC::DOMJITGetterComplex::DOMJITAttribute::slowCall):
(JSC::DOMJITGetterComplex::finishCreation):
(JSC::DOMJITFunctionObject::functionWithoutTypeCheck):
(JSC::DOMJITFunctionObject::finishCreation):
(JSC::DOMJITCheckSubClassObject::functionWithoutTypeCheck):
(JSC::DOMJITCheckSubClassObject::finishCreation):
(JSC::DOMJITGetterBaseJSObject::DOMJITAttribute::slowCall):
(JSC::DOMJITGetterBaseJSObject::finishCreation):
(JSC::customSetAccessor):
(JSC::customSetValue):
(JSC::JSTestCustomGetterSetter::finishCreation):
(JSC::WasmStreamingParser::finishCreation):
(JSC::getExecutableForFunction):
(JSC::functionCodeBlockFor):
(JSC::functionIndexingMode):
(JSC::functionValue):
(JSC::functionCreateBuiltin):
(JSC::functionGetPrivateProperty):
(JSC::JSDollarVM::finishCreation):
(JSC::JSDollarVM::addFunction):
(JSC::JSDollarVM::addConstructibleFunction):
* tools/VMInspector.cpp:
(JSC::VMInspector::dumpRegisters):
(JSC::VMInspector::dumpCellMemoryToStream):
* wasm/WasmInstance.cpp:
(JSC::Wasm::Instance::setGlobal):
(JSC::Wasm::Instance::setFunctionWrapper):
(JSC::Wasm::setWasmTableElement):
(JSC::Wasm::doWasmRefFunc):
* wasm/WasmTable.cpp:
(JSC::Wasm::Table::set):
(JSC::Wasm::FuncRefTable::setFunction):
* wasm/js/JSWebAssembly.cpp:
(JSC::resolve):
* wasm/js/JSWebAssemblyInstance.cpp:
(JSC::JSWebAssemblyInstance::create):
* wasm/js/WasmToJS.cpp:
(JSC::Wasm::handleBadI64Use):
(JSC::Wasm::wasmToJS):
(JSC::Wasm::wasmToJSException):
* wasm/js/WebAssemblyFunction.cpp:
(JSC::WebAssemblyFunction::jsCallEntrypointSlow):
* wasm/js/WebAssemblyMemoryConstructor.cpp:
(JSC::constructJSWebAssemblyMemory):
* wasm/js/WebAssemblyModuleConstructor.cpp:
(JSC::webAssemblyModuleImports):
(JSC::webAssemblyModuleExports):
* wasm/js/WebAssemblyModuleRecord.cpp:
(JSC::WebAssemblyModuleRecord::finishCreation):
(JSC::WebAssemblyModuleRecord::link):
* wasm/js/WebAssemblyTableConstructor.cpp:
(JSC::constructJSWebAssemblyTable):
Source/WebCore:
No new tests. Covered by existing tests.
* Modules/encryptedmedia/legacy/LegacyCDMSessionClearKey.cpp:
(WebCore::CDMSessionClearKey::update):
* Modules/plugins/QuickTimePluginReplacement.mm:
(WebCore::QuickTimePluginReplacement::ensureReplacementScriptInjected):
(WebCore::QuickTimePluginReplacement::installReplacement):
* animation/KeyframeEffect.cpp:
(WebCore::processKeyframeLikeObject):
* bindings/js/GCController.cpp:
(WebCore::GCController::dumpHeap):
* bindings/js/IDBBindingUtilities.cpp:
(WebCore::get):
(WebCore::set):
* bindings/js/JSCSSRuleListCustom.cpp:
(WebCore::JSCSSRuleListOwner::isReachableFromOpaqueRoots):
* bindings/js/JSCustomElementRegistryCustom.cpp:
(WebCore::JSCustomElementRegistry::define):
* bindings/js/JSCustomXPathNSResolver.cpp:
(WebCore::JSCustomXPathNSResolver::lookupNamespaceURI):
* bindings/js/JSDOMConvertRecord.h:
* bindings/js/JSDOMConvertStrings.h:
(WebCore::JSConverter<IDLDOMString>::convert):
(WebCore::JSConverter<IDLByteString>::convert):
(WebCore::JSConverter<IDLUSVString>::convert):
* bindings/js/JSDOMWindowCustom.cpp:
(WebCore::JSDOMWindow::getOwnPropertySlotByIndex):
(WebCore::addScopedChildrenIndexes):
(WebCore::JSDOMWindow::defineOwnProperty):
(WebCore::DialogHandler::dialogCreated):
(WebCore::DialogHandler::returnValue const):
(WebCore::JSDOMWindow::setOpener):
(WebCore::JSDOMWindow::setOpenDatabase):
* bindings/js/JSDOMWindowProperties.cpp:
(WebCore::JSDOMWindowProperties::getOwnPropertySlotByIndex):
* bindings/js/JSDeprecatedCSSOMValueCustom.cpp:
(WebCore::JSDeprecatedCSSOMValueOwner::isReachableFromOpaqueRoots):
* bindings/js/JSEventListener.cpp:
(WebCore::JSEventListener::handleEvent):
* bindings/js/JSImageDataCustom.cpp:
(WebCore::toJSNewlyCreated):
* bindings/js/JSLazyEventListener.cpp:
(WebCore::JSLazyEventListener::initializeJSFunction const):
* bindings/js/JSLocationCustom.cpp:
(WebCore::JSLocation::getOwnPropertySlotByIndex):
(WebCore::JSLocation::putByIndex):
* bindings/js/JSNodeListCustom.cpp:
(WebCore::JSNodeListOwner::isReachableFromOpaqueRoots):
* bindings/js/JSPluginElementFunctions.cpp:
(WebCore::pluginElementCustomGetCallData):
* bindings/js/JSRemoteDOMWindowCustom.cpp:
(WebCore::JSRemoteDOMWindow::getOwnPropertySlotByIndex):
* bindings/js/ReadableStreamDefaultController.cpp:
(WebCore::ReadableStreamDefaultController::invoke):
* bindings/js/ScriptController.cpp:
(WebCore::ScriptController::linkAndEvaluateModuleScriptInWorld):
* bindings/js/ScriptModuleLoader.cpp:
(WebCore::ScriptModuleLoader::resolve):
(WebCore::ScriptModuleLoader::importModule):
(WebCore::ScriptModuleLoader::createImportMetaProperties):
* bindings/js/SerializedScriptValue.cpp:
(WebCore::CloneSerializer::CloneSerializer):
(WebCore::CloneSerializer::write):
(WebCore::CloneSerializer::serialize):
(WebCore::CloneDeserializer::CachedString::jsString):
(WebCore::CloneDeserializer::readTerminal):
(WebCore::CloneDeserializer::deserialize):
* bindings/js/WebCoreBuiltinNames.h:
(WebCore::WebCoreBuiltinNames::WebCoreBuiltinNames):
* bindings/js/WebCoreJSClientData.cpp:
(WebCore::JSVMClientData::JSVMClientData):
* bindings/js/WindowProxy.cpp:
(WebCore::WindowProxy::clearJSWindowProxiesNotMatchingDOMWindow):
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateGetOwnPropertySlotByIndex):
(GenerateGetOwnPropertyNames):
(GeneratePutByIndex):
(GenerateDeletePropertyByIndex):
(GenerateDictionaryImplementationContent):
(addUnscopableProperties):
(GenerateImplementation):
(GenerateAttributeSetterBodyDefinition):
(GenerateOperationDefinition):
(GenerateSerializerDefinition):
(GenerateCallbackImplementationContent):
(GenerateConstructorHelperMethods):
* bindings/scripts/test/JS/JSInterfaceName.cpp:
(WebCore::JSInterfaceNameConstructor::initializeProperties):
* bindings/scripts/test/JS/JSMapLike.cpp:
(WebCore::JSMapLikeConstructor::initializeProperties):
* bindings/scripts/test/JS/JSReadOnlyMapLike.cpp:
(WebCore::JSReadOnlyMapLikeConstructor::initializeProperties):
* bindings/scripts/test/JS/JSTestActiveDOMObject.cpp:
(WebCore::JSTestActiveDOMObjectConstructor::initializeProperties):
* bindings/scripts/test/JS/JSTestCEReactions.cpp:
(WebCore::JSTestCEReactionsConstructor::initializeProperties):
(WebCore::setJSTestCEReactionsAttributeWithCEReactionsSetter):
(WebCore::setJSTestCEReactionsReflectAttributeWithCEReactionsSetter):
(WebCore::setJSTestCEReactionsStringifierAttributeSetter):
(WebCore::setJSTestCEReactionsAttributeWithCEReactionsNotNeededSetter):
(WebCore::setJSTestCEReactionsReflectAttributeWithCEReactionsNotNeededSetter):
(WebCore::setJSTestCEReactionsStringifierAttributeNotNeededSetter):
* bindings/scripts/test/JS/JSTestCEReactionsStringifier.cpp:
(WebCore::JSTestCEReactionsStringifierConstructor::initializeProperties):
(WebCore::setJSTestCEReactionsStringifierValueSetter):
(WebCore::setJSTestCEReactionsStringifierValueWithoutReactionsSetter):
* bindings/scripts/test/JS/JSTestCallTracer.cpp:
(WebCore::JSTestCallTracerConstructor::initializeProperties):
(WebCore::setJSTestCallTracerTestAttributeInterfaceSetter):
(WebCore::setJSTestCallTracerTestAttributeSpecifiedSetter):
(WebCore::setJSTestCallTracerTestAttributeWithVariantSetter):
* bindings/scripts/test/JS/JSTestCallbackInterface.cpp:
(WebCore::convertDictionary<TestCallbackInterface::Dictionary>):
(WebCore::JSTestCallbackInterfaceConstructor::initializeProperties):
(WebCore::JSTestCallbackInterface::callbackWithNoParam):
(WebCore::JSTestCallbackInterface::callbackWithArrayParam):
(WebCore::JSTestCallbackInterface::callbackWithSerializedScriptValueParam):
(WebCore::JSTestCallbackInterface::callbackWithStringList):
(WebCore::JSTestCallbackInterface::callbackWithBoolean):
(WebCore::JSTestCallbackInterface::callbackRequiresThisToPass):
(WebCore::JSTestCallbackInterface::callbackWithAReturnValue):
(WebCore::JSTestCallbackInterface::callbackThatRethrowsExceptions):
(WebCore::JSTestCallbackInterface::callbackThatSkipsInvokeCheck):
(WebCore::JSTestCallbackInterface::callbackWithThisObject):
* bindings/scripts/test/JS/JSTestClassWithJSBuiltinConstructor.cpp:
(WebCore::JSTestClassWithJSBuiltinConstructorConstructor::initializeProperties):
* bindings/scripts/test/JS/JSTestDOMJIT.cpp:
(WebCore::JSTestDOMJITConstructor::initializeProperties):
(WebCore::jsTestDOMJITPrototypeFunctionGetAttributeWithoutTypeCheck):
(WebCore::jsTestDOMJITPrototypeFunctionItemWithoutTypeCheck):
(WebCore::jsTestDOMJITPrototypeFunctionHasAttributeWithoutTypeCheck):
(WebCore::jsTestDOMJITPrototypeFunctionGetElementByIdWithoutTypeCheck):
(WebCore::jsTestDOMJITPrototypeFunctionGetElementsByNameWithoutTypeCheck):
* bindings/scripts/test/JS/JSTestEnabledBySetting.cpp:
(WebCore::JSTestEnabledBySettingConstructor::initializeProperties):
(WebCore::JSTestEnabledBySettingPrototype::finishCreation):
(WebCore::setJSTestEnabledBySettingTestSubObjEnabledBySettingConstructorSetter):
(WebCore::setJSTestEnabledBySettingEnabledBySettingAttributeSetter):
* bindings/scripts/test/JS/JSTestEnabledForContext.cpp:
(WebCore::JSTestEnabledForContextConstructor::initializeProperties):
(WebCore::setJSTestEnabledForContextTestSubObjEnabledForContextConstructorSetter):
* bindings/scripts/test/JS/JSTestEventConstructor.cpp:
(WebCore::convertDictionary<TestEventConstructor::Init>):
(WebCore::JSTestEventConstructorConstructor::initializeProperties):
* bindings/scripts/test/JS/JSTestEventTarget.cpp:
(WebCore::JSTestEventTargetConstructor::initializeProperties):
(WebCore::JSTestEventTarget::getOwnPropertySlotByIndex):
(WebCore::JSTestEventTarget::getOwnPropertyNames):
* bindings/scripts/test/JS/JSTestException.cpp:
(WebCore::JSTestExceptionConstructor::initializeProperties):
* bindings/scripts/test/JS/JSTestGenerateIsReachable.cpp:
(WebCore::JSTestGenerateIsReachableConstructor::initializeProperties):
(WebCore::JSTestGenerateIsReachablePrototype::finishCreation):
* bindings/scripts/test/JS/JSTestGlobalObject.cpp:
(WebCore::JSTestGlobalObjectConstructor::initializeProperties):
(WebCore::setJSTestGlobalObjectRegularAttributeSetter):
(WebCore::setJSTestGlobalObjectPublicAndPrivateAttributeSetter):
(WebCore::setJSTestGlobalObjectPublicAndPrivateConditionalAttributeSetter):
(WebCore::setJSTestGlobalObjectEnabledAtRuntimeAttributeSetter):
(WebCore::setJSTestGlobalObjectTestCEReactionsConstructorSetter):
(WebCore::setJSTestGlobalObjectTestCEReactionsStringifierConstructorSetter):
(WebCore::setJSTestGlobalObjectTestCallTracerConstructorSetter):
(WebCore::setJSTestGlobalObjectTestCallbackInterfaceConstructorSetter):
(WebCore::setJSTestGlobalObjectTestClassWithJSBuiltinConstructorConstructorSetter):
(WebCore::setJSTestGlobalObjectTestDOMJITConstructorSetter):
(WebCore::setJSTestGlobalObjectTestDomainSecurityConstructorSetter):
(WebCore::setJSTestGlobalObjectTestEnabledBySettingConstructorSetter):
(WebCore::setJSTestGlobalObjectTestEnabledForContextConstructorSetter):
(WebCore::setJSTestGlobalObjectTestEventConstructorConstructorSetter):
(WebCore::setJSTestGlobalObjectTestEventTargetConstructorSetter):
(WebCore::setJSTestGlobalObjectTestExceptionConstructorSetter):
(WebCore::setJSTestGlobalObjectTestGenerateIsReachableConstructorSetter):
(WebCore::setJSTestGlobalObjectTestGlobalObjectConstructorSetter):
(WebCore::setJSTestGlobalObjectTestIndexedSetterNoIdentifierConstructorSetter):
(WebCore::setJSTestGlobalObjectTestIndexedSetterThrowingExceptionConstructorSetter):
(WebCore::setJSTestGlobalObjectTestIndexedSetterWithIdentifierConstructorSetter):
(WebCore::setJSTestGlobalObjectTestInterfaceConstructorSetter):
(WebCore::setJSTestGlobalObjectTestInterfaceLeadingUnderscoreConstructorSetter):
(WebCore::setJSTestGlobalObjectTestIterableConstructorSetter):
(WebCore::setJSTestGlobalObjectTestJSBuiltinConstructorConstructorSetter):
(WebCore::setJSTestGlobalObjectTestMapLikeConstructorSetter):
(WebCore::setJSTestGlobalObjectTestMediaQueryListListenerConstructorSetter):
(WebCore::setJSTestGlobalObjectTestNamedAndIndexedSetterNoIdentifierConstructorSetter):
(WebCore::setJSTestGlobalObjectTestNamedAndIndexedSetterThrowingExceptionConstructorSetter):
(WebCore::setJSTestGlobalObjectTestNamedAndIndexedSetterWithIdentifierConstructorSetter):
(WebCore::setJSTestGlobalObjectTestNamedConstructorConstructorSetter):
(WebCore::setJSTestGlobalObjectAudioConstructorSetter):
(WebCore::setJSTestGlobalObjectTestNamedDeleterNoIdentifierConstructorSetter):
(WebCore::setJSTestGlobalObjectTestNamedDeleterThrowingExceptionConstructorSetter):
(WebCore::setJSTestGlobalObjectTestNamedDeleterWithIdentifierConstructorSetter):
(WebCore::setJSTestGlobalObjectTestNamedDeleterWithIndexedGetterConstructorSetter):
(WebCore::setJSTestGlobalObjectTestNamedGetterCallWithConstructorSetter):
(WebCore::setJSTestGlobalObjectTestNamedGetterNoIdentifierConstructorSetter):
(WebCore::setJSTestGlobalObjectTestNamedGetterWithIdentifierConstructorSetter):
(WebCore::setJSTestGlobalObjectTestNamedSetterNoIdentifierConstructorSetter):
(WebCore::setJSTestGlobalObjectTestNamedSetterThrowingExceptionConstructorSetter):
(WebCore::setJSTestGlobalObjectTestNamedSetterWithIdentifierConstructorSetter):
(WebCore::setJSTestGlobalObjectTestNamedSetterWithIndexedGetterConstructorSetter):
(WebCore::setJSTestGlobalObjectTestNamedSetterWithIndexedGetterAndSetterConstructorSetter):
(WebCore::setJSTestGlobalObjectTestNamedSetterWithOverrideBuiltinsConstructorSetter):
(WebCore::setJSTestGlobalObjectTestNamedSetterWithUnforgablePropertiesConstructorSetter):
(WebCore::setJSTestGlobalObjectTestNamedSetterWithUnforgablePropertiesAndOverrideBuiltinsConstructorSetter):
(WebCore::setJSTestGlobalObjectTestOverloadedConstructorsConstructorSetter):
(WebCore::setJSTestGlobalObjectTestOverloadedConstructorsWithSequenceConstructorSetter):
(WebCore::setJSTestGlobalObjectTestOverrideBuiltinsConstructorSetter):
(WebCore::setJSTestGlobalObjectTestPluginInterfaceConstructorSetter):
(WebCore::setJSTestGlobalObjectTestReadOnlyMapLikeConstructorSetter):
(WebCore::setJSTestGlobalObjectTestReportExtraMemoryCostConstructorSetter):
(WebCore::setJSTestGlobalObjectTestSerializationConstructorSetter):
(WebCore::setJSTestGlobalObjectTestSerializationIndirectInheritanceConstructorSetter):
(WebCore::setJSTestGlobalObjectTestSerializationInheritConstructorSetter):
(WebCore::setJSTestGlobalObjectTestSerializationInheritFinalConstructorSetter):
(WebCore::setJSTestGlobalObjectTestSerializedScriptValueInterfaceConstructorSetter):
(WebCore::setJSTestGlobalObjectTestStringifierConstructorSetter):
(WebCore::setJSTestGlobalObjectTestStringifierAnonymousOperationConstructorSetter):
(WebCore::setJSTestGlobalObjectTestStringifierNamedOperationConstructorSetter):
(WebCore::setJSTestGlobalObjectTestStringifierOperationImplementedAsConstructorSetter):
(WebCore::setJSTestGlobalObjectTestStringifierOperationNamedToStringConstructorSetter):
(WebCore::setJSTestGlobalObjectTestStringifierReadOnlyAttributeConstructorSetter):
(WebCore::setJSTestGlobalObjectTestStringifierReadWriteAttributeConstructorSetter):
(WebCore::setJSTestGlobalObjectTestTypedefsConstructorSetter):
* bindings/scripts/test/JS/JSTestIndexedSetterNoIdentifier.cpp:
(WebCore::JSTestIndexedSetterNoIdentifierConstructor::initializeProperties):
(WebCore::JSTestIndexedSetterNoIdentifier::getOwnPropertyNames):
* bindings/scripts/test/JS/JSTestIndexedSetterThrowingException.cpp:
(WebCore::JSTestIndexedSetterThrowingExceptionConstructor::initializeProperties):
(WebCore::JSTestIndexedSetterThrowingException::getOwnPropertyNames):
* bindings/scripts/test/JS/JSTestIndexedSetterWithIdentifier.cpp:
(WebCore::JSTestIndexedSetterWithIdentifierConstructor::initializeProperties):
(WebCore::JSTestIndexedSetterWithIdentifier::getOwnPropertyNames):
* bindings/scripts/test/JS/JSTestInterface.cpp:
(WebCore::JSTestInterfaceConstructor::initializeProperties):
(WebCore::setJSTestInterfaceConstructorImplementsStaticAttrSetter):
(WebCore::setJSTestInterfaceImplementsStr2Setter):
(WebCore::setJSTestInterfaceImplementsStr3Setter):
(WebCore::setJSTestInterfaceImplementsNodeSetter):
(WebCore::setJSTestInterfaceConstructorSupplementalStaticAttrSetter):
(WebCore::setJSTestInterfaceSupplementalStr2Setter):
(WebCore::setJSTestInterfaceSupplementalStr3Setter):
(WebCore::setJSTestInterfaceSupplementalNodeSetter):
(WebCore::setJSTestInterfaceReflectAttributeSetter):
* bindings/scripts/test/JS/JSTestInterfaceLeadingUnderscore.cpp:
(WebCore::JSTestInterfaceLeadingUnderscoreConstructor::initializeProperties):
* bindings/scripts/test/JS/JSTestIterable.cpp:
(WebCore::JSTestIterableConstructor::initializeProperties):
* bindings/scripts/test/JS/JSTestJSBuiltinConstructor.cpp:
(WebCore::JSTestJSBuiltinConstructorConstructor::initializeProperties):
(WebCore::setJSTestJSBuiltinConstructorTestAttributeRWCustomSetter):
* bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp:
(WebCore::JSTestMediaQueryListListenerConstructor::initializeProperties):
* bindings/scripts/test/JS/JSTestNamedAndIndexedSetterNoIdentifier.cpp:
(WebCore::JSTestNamedAndIndexedSetterNoIdentifierConstructor::initializeProperties):
(WebCore::JSTestNamedAndIndexedSetterNoIdentifier::getOwnPropertySlotByIndex):
(WebCore::JSTestNamedAndIndexedSetterNoIdentifier::getOwnPropertyNames):
(WebCore::JSTestNamedAndIndexedSetterNoIdentifier::putByIndex):
* bindings/scripts/test/JS/JSTestNamedAndIndexedSetterThrowingException.cpp:
(WebCore::JSTestNamedAndIndexedSetterThrowingExceptionConstructor::initializeProperties):
(WebCore::JSTestNamedAndIndexedSetterThrowingException::getOwnPropertySlotByIndex):
(WebCore::JSTestNamedAndIndexedSetterThrowingException::getOwnPropertyNames):
(WebCore::JSTestNamedAndIndexedSetterThrowingException::putByIndex):
* bindings/scripts/test/JS/JSTestNamedAndIndexedSetterWithIdentifier.cpp:
(WebCore::JSTestNamedAndIndexedSetterWithIdentifierConstructor::initializeProperties):
(WebCore::JSTestNamedAndIndexedSetterWithIdentifier::getOwnPropertySlotByIndex):
(WebCore::JSTestNamedAndIndexedSetterWithIdentifier::getOwnPropertyNames):
(WebCore::JSTestNamedAndIndexedSetterWithIdentifier::putByIndex):
* bindings/scripts/test/JS/JSTestNamedConstructor.cpp:
(WebCore::JSTestNamedConstructorConstructor::initializeProperties):
(WebCore::JSTestNamedConstructorNamedConstructor::initializeProperties):
* bindings/scripts/test/JS/JSTestNamedDeleterNoIdentifier.cpp:
(WebCore::JSTestNamedDeleterNoIdentifierConstructor::initializeProperties):
(WebCore::JSTestNamedDeleterNoIdentifier::getOwnPropertySlotByIndex):
(WebCore::JSTestNamedDeleterNoIdentifier::getOwnPropertyNames):
(WebCore::JSTestNamedDeleterNoIdentifier::deletePropertyByIndex):
* bindings/scripts/test/JS/JSTestNamedDeleterThrowingException.cpp:
(WebCore::JSTestNamedDeleterThrowingExceptionConstructor::initializeProperties):
(WebCore::JSTestNamedDeleterThrowingException::getOwnPropertySlotByIndex):
(WebCore::JSTestNamedDeleterThrowingException::getOwnPropertyNames):
(WebCore::JSTestNamedDeleterThrowingException::deletePropertyByIndex):
* bindings/scripts/test/JS/JSTestNamedDeleterWithIdentifier.cpp:
(WebCore::JSTestNamedDeleterWithIdentifierConstructor::initializeProperties):
(WebCore::JSTestNamedDeleterWithIdentifier::getOwnPropertySlotByIndex):
(WebCore::JSTestNamedDeleterWithIdentifier::getOwnPropertyNames):
(WebCore::JSTestNamedDeleterWithIdentifier::deletePropertyByIndex):
* bindings/scripts/test/JS/JSTestNamedDeleterWithIndexedGetter.cpp:
(WebCore::JSTestNamedDeleterWithIndexedGetterConstructor::initializeProperties):
(WebCore::JSTestNamedDeleterWithIndexedGetter::getOwnPropertySlotByIndex):
(WebCore::JSTestNamedDeleterWithIndexedGetter::getOwnPropertyNames):
* bindings/scripts/test/JS/JSTestNamedGetterCallWith.cpp:
(WebCore::JSTestNamedGetterCallWithConstructor::initializeProperties):
(WebCore::JSTestNamedGetterCallWith::getOwnPropertySlotByIndex):
(WebCore::JSTestNamedGetterCallWith::getOwnPropertyNames):
* bindings/scripts/test/JS/JSTestNamedGetterNoIdentifier.cpp:
(WebCore::JSTestNamedGetterNoIdentifierConstructor::initializeProperties):
(WebCore::JSTestNamedGetterNoIdentifier::getOwnPropertySlotByIndex):
(WebCore::JSTestNamedGetterNoIdentifier::getOwnPropertyNames):
* bindings/scripts/test/JS/JSTestNamedGetterWithIdentifier.cpp:
(WebCore::JSTestNamedGetterWithIdentifierConstructor::initializeProperties):
(WebCore::JSTestNamedGetterWithIdentifier::getOwnPropertySlotByIndex):
(WebCore::JSTestNamedGetterWithIdentifier::getOwnPropertyNames):
* bindings/scripts/test/JS/JSTestNamedSetterNoIdentifier.cpp:
(WebCore::JSTestNamedSetterNoIdentifierConstructor::initializeProperties):
(WebCore::JSTestNamedSetterNoIdentifier::getOwnPropertySlotByIndex):
(WebCore::JSTestNamedSetterNoIdentifier::getOwnPropertyNames):
(WebCore::JSTestNamedSetterNoIdentifier::putByIndex):
* bindings/scripts/test/JS/JSTestNamedSetterThrowingException.cpp:
(WebCore::JSTestNamedSetterThrowingExceptionConstructor::initializeProperties):
(WebCore::JSTestNamedSetterThrowingException::getOwnPropertySlotByIndex):
(WebCore::JSTestNamedSetterThrowingException::getOwnPropertyNames):
(WebCore::JSTestNamedSetterThrowingException::putByIndex):
* bindings/scripts/test/JS/JSTestNamedSetterWithIdentifier.cpp:
(WebCore::JSTestNamedSetterWithIdentifierConstructor::initializeProperties):
(WebCore::JSTestNamedSetterWithIdentifier::getOwnPropertySlotByIndex):
(WebCore::JSTestNamedSetterWithIdentifier::getOwnPropertyNames):
(WebCore::JSTestNamedSetterWithIdentifier::putByIndex):
* bindings/scripts/test/JS/JSTestNamedSetterWithIndexedGetter.cpp:
(WebCore::JSTestNamedSetterWithIndexedGetterConstructor::initializeProperties):
(WebCore::JSTestNamedSetterWithIndexedGetter::getOwnPropertySlotByIndex):
(WebCore::JSTestNamedSetterWithIndexedGetter::getOwnPropertyNames):
(WebCore::JSTestNamedSetterWithIndexedGetter::putByIndex):
* bindings/scripts/test/JS/JSTestNamedSetterWithIndexedGetterAndSetter.cpp:
(WebCore::JSTestNamedSetterWithIndexedGetterAndSetterConstructor::initializeProperties):
(WebCore::JSTestNamedSetterWithIndexedGetterAndSetter::getOwnPropertySlotByIndex):
(WebCore::JSTestNamedSetterWithIndexedGetterAndSetter::getOwnPropertyNames):
(WebCore::JSTestNamedSetterWithIndexedGetterAndSetter::putByIndex):
* bindings/scripts/test/JS/JSTestNamedSetterWithOverrideBuiltins.cpp:
(WebCore::JSTestNamedSetterWithOverrideBuiltinsConstructor::initializeProperties):
(WebCore::JSTestNamedSetterWithOverrideBuiltins::getOwnPropertySlotByIndex):
(WebCore::JSTestNamedSetterWithOverrideBuiltins::getOwnPropertyNames):
(WebCore::JSTestNamedSetterWithOverrideBuiltins::putByIndex):
* bindings/scripts/test/JS/JSTestNamedSetterWithUnforgableProperties.cpp:
(WebCore::JSTestNamedSetterWithUnforgablePropertiesConstructor::initializeProperties):
(WebCore::JSTestNamedSetterWithUnforgableProperties::getOwnPropertySlotByIndex):
(WebCore::JSTestNamedSetterWithUnforgableProperties::getOwnPropertyNames):
(WebCore::JSTestNamedSetterWithUnforgableProperties::putByIndex):
* bindings/scripts/test/JS/JSTestNamedSetterWithUnforgablePropertiesAndOverrideBuiltins.cpp:
(WebCore::JSTestNamedSetterWithUnforgablePropertiesAndOverrideBuiltinsConstructor::initializeProperties):
(WebCore::JSTestNamedSetterWithUnforgablePropertiesAndOverrideBuiltins::getOwnPropertySlotByIndex):
(WebCore::JSTestNamedSetterWithUnforgablePropertiesAndOverrideBuiltins::getOwnPropertyNames):
(WebCore::JSTestNamedSetterWithUnforgablePropertiesAndOverrideBuiltins::putByIndex):
* bindings/scripts/test/JS/JSTestNode.cpp:
(WebCore::JSTestNodeConstructor::initializeProperties):
(WebCore::JSTestNodePrototype::finishCreation):
(WebCore::setJSTestNodeNameSetter):
(WebCore::JSTestNode::serialize):
* bindings/scripts/test/JS/JSTestObj.cpp:
(WebCore::convertDictionary<TestObj::Dictionary>):
(WebCore::convertDictionaryToJS):
(WebCore::convertDictionary<TestObj::DictionaryThatShouldNotTolerateNull>):
(WebCore::convertDictionary<TestObj::DictionaryThatShouldTolerateNull>):
(WebCore::convertDictionary<AlternateDictionaryName>):
(WebCore::convertDictionary<TestObj::ParentDictionary>):
(WebCore::convertDictionary<TestObj::ChildDictionary>):
(WebCore::convertDictionary<TestObj::ConditionalDictionaryA>):
(WebCore::convertDictionary<TestObj::ConditionalDictionaryB>):
(WebCore::convertDictionary<TestObj::ConditionalDictionaryC>):
(WebCore::JSTestObjConstructor::initializeProperties):
(WebCore::JSTestObjPrototype::finishCreation):
(WebCore::JSTestObj::getOwnPropertyNames):
(WebCore::setJSTestObjConstructorStaticStringAttrSetter):
(WebCore::setJSTestObjEnumAttrSetter):
(WebCore::setJSTestObjByteAttrSetter):
(WebCore::setJSTestObjOctetAttrSetter):
(WebCore::setJSTestObjShortAttrSetter):
(WebCore::setJSTestObjClampedShortAttrSetter):
(WebCore::setJSTestObjEnforceRangeShortAttrSetter):
(WebCore::setJSTestObjUnsignedShortAttrSetter):
(WebCore::setJSTestObjLongAttrSetter):
(WebCore::setJSTestObjLongLongAttrSetter):
(WebCore::setJSTestObjUnsignedLongLongAttrSetter):
(WebCore::setJSTestObjStringAttrSetter):
(WebCore::setJSTestObjUsvstringAttrSetter):
(WebCore::setJSTestObjTestObjAttrSetter):
(WebCore::setJSTestObjTestNullableObjAttrSetter):
(WebCore::setJSTestObjLenientTestObjAttrSetter):
(WebCore::setJSTestObjStringAttrTreatingNullAsEmptyStringSetter):
(WebCore::setJSTestObjUsvstringAttrTreatingNullAsEmptyStringSetter):
(WebCore::setJSTestObjByteStringAttrTreatingNullAsEmptyStringSetter):
(WebCore::setJSTestObjStringLongRecordAttrSetter):
(WebCore::setJSTestObjUsvstringLongRecordAttrSetter):
(WebCore::setJSTestObjStringObjRecordAttrSetter):
(WebCore::setJSTestObjStringNullableObjRecordAttrSetter):
(WebCore::setJSTestObjDictionaryAttrSetter):
(WebCore::setJSTestObjNullableDictionaryAttrSetter):
(WebCore::setJSTestObjAnnotatedTypeInUnionAttrSetter):
(WebCore::setJSTestObjAnnotatedTypeInSequenceAttrSetter):
(WebCore::setJSTestObjImplementationEnumAttrSetter):
(WebCore::setJSTestObjXMLObjAttrSetter):
(WebCore::setJSTestObjCreateSetter):
(WebCore::setJSTestObjReflectedStringAttrSetter):
(WebCore::setJSTestObjReflectedUSVStringAttrSetter):
(WebCore::setJSTestObjReflectedIntegralAttrSetter):
(WebCore::setJSTestObjReflectedUnsignedIntegralAttrSetter):
(WebCore::setJSTestObjReflectedBooleanAttrSetter):
(WebCore::setJSTestObjReflectedURLAttrSetter):
(WebCore::setJSTestObjReflectedUSVURLAttrSetter):
(WebCore::setJSTestObjReflectedCustomIntegralAttrSetter):
(WebCore::setJSTestObjReflectedCustomBooleanAttrSetter):
(WebCore::setJSTestObjReflectedCustomURLAttrSetter):
(WebCore::setJSTestObjEnabledAtRuntimeAttributeSetter):
(WebCore::setJSTestObjConstructorEnabledAtRuntimeAttributeStaticSetter):
(WebCore::setJSTestObjTypedArrayAttrSetter):
(WebCore::setJSTestObjCustomAttrSetter):
(WebCore::setJSTestObjOnfooSetter):
(WebCore::setJSTestObjOnwebkitfooSetter):
(WebCore::setJSTestObjWithExecStateAttributeSetter):
(WebCore::setJSTestObjWithCallWithAndSetterCallWithAttributeSetter):
(WebCore::setJSTestObjWithScriptExecutionContextAttributeSetter):
(WebCore::setJSTestObjWithScriptExecutionContextAndExecStateAttributeSetter):
(WebCore::setJSTestObjWithScriptExecutionContextAndExecStateWithSpacesAttributeSetter):
(WebCore::setJSTestObjConditionalAttr1Setter):
(WebCore::setJSTestObjConditionalAttr2Setter):
(WebCore::setJSTestObjConditionalAttr3Setter):
(WebCore::setJSTestObjConditionalAttr4ConstructorSetter):
(WebCore::setJSTestObjConditionalAttr5ConstructorSetter):
(WebCore::setJSTestObjConditionalAttr6ConstructorSetter):
(WebCore::setJSTestObjAnyAttributeSetter):
(WebCore::setJSTestObjObjectAttributeSetter):
(WebCore::setJSTestObjMutablePointSetter):
(WebCore::setJSTestObjStrawberrySetter):
(WebCore::setJSTestObjIdSetter):
(WebCore::setJSTestObjReplaceableAttributeSetter):
(WebCore::setJSTestObjNullableLongSettableAttributeSetter):
(WebCore::setJSTestObjNullableStringSettableAttributeSetter):
(WebCore::setJSTestObjNullableUSVStringSettableAttributeSetter):
(WebCore::setJSTestObjNullableByteStringSettableAttributeSetter):
(WebCore::setJSTestObjAttributeWithReservedEnumTypeSetter):
(WebCore::setJSTestObjPutForwardsAttributeSetter):
(WebCore::setJSTestObjPutForwardsNullableAttributeSetter):
(WebCore::setJSTestObjStringifierAttributeSetter):
(WebCore::setJSTestObjConditionallyReadWriteAttributeSetter):
(WebCore::setJSTestObjConditionalAndConditionallyReadWriteAttributeSetter):
(WebCore::setJSTestObjConditionallyExposedToWindowAttributeSetter):
(WebCore::setJSTestObjConditionallyExposedToWorkerAttributeSetter):
(WebCore::setJSTestObjConditionallyExposedToWindowAndWorkerAttributeSetter):
(WebCore::JSTestObj::serialize):
* bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp:
(WebCore::JSTestOverloadedConstructorsConstructor::initializeProperties):
* bindings/scripts/test/JS/JSTestOverloadedConstructorsWithSequence.cpp:
(WebCore::JSTestOverloadedConstructorsWithSequenceConstructor::initializeProperties):
* bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp:
(WebCore::JSTestOverrideBuiltinsConstructor::initializeProperties):
(WebCore::JSTestOverrideBuiltins::getOwnPropertySlotByIndex):
(WebCore::JSTestOverrideBuiltins::getOwnPropertyNames):
* bindings/scripts/test/JS/JSTestPluginInterface.cpp:
(WebCore::JSTestPluginInterfaceConstructor::initializeProperties):
(WebCore::JSTestPluginInterface::getOwnPropertySlotByIndex):
(WebCore::JSTestPluginInterface::putByIndex):
* bindings/scripts/test/JS/JSTestPromiseRejectionEvent.cpp:
(WebCore::convertDictionary<TestPromiseRejectionEvent::Init>):
(WebCore::JSTestPromiseRejectionEventConstructor::initializeProperties):
* bindings/scripts/test/JS/JSTestSerialization.cpp:
(WebCore::JSTestSerializationConstructor::initializeProperties):
(WebCore::setJSTestSerializationFirstStringAttributeSetter):
(WebCore::setJSTestSerializationSecondLongAttributeSetter):
(WebCore::setJSTestSerializationThirdUnserializableAttributeSetter):
(WebCore::setJSTestSerializationFourthUnrestrictedDoubleAttributeSetter):
(WebCore::setJSTestSerializationFifthLongAttributeSetter):
(WebCore::setJSTestSerializationSixthTypedefAttributeSetter):
(WebCore::setJSTestSerializationSeventhDirectlySerializableAttributeSetter):
(WebCore::setJSTestSerializationEighthIndirectlyAttributeSetter):
(WebCore::setJSTestSerializationNinthOptionalDirectlySerializableAttributeSetter):
(WebCore::setJSTestSerializationTenthFrozenArrayAttributeSetter):
(WebCore::setJSTestSerializationEleventhSequenceAttributeSetter):
(WebCore::setJSTestSerializationTwelfthInterfaceSequenceAttributeSetter):
(WebCore::JSTestSerialization::serialize):
* bindings/scripts/test/JS/JSTestSerializationIndirectInheritance.cpp:
(WebCore::JSTestSerializationIndirectInheritanceConstructor::initializeProperties):
* bindings/scripts/test/JS/JSTestSerializationInherit.cpp:
(WebCore::JSTestSerializationInheritConstructor::initializeProperties):
(WebCore::setJSTestSerializationInheritInheritLongAttributeSetter):
(WebCore::JSTestSerializationInherit::serialize):
* bindings/scripts/test/JS/JSTestSerializationInheritFinal.cpp:
(WebCore::JSTestSerializationInheritFinalConstructor::initializeProperties):
(WebCore::setJSTestSerializationInheritFinalFinalLongAttributeFooSetter):
(WebCore::setJSTestSerializationInheritFinalFinalLongAttributeBarSetter):
(WebCore::JSTestSerializationInheritFinal::serialize):
* bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp:
(WebCore::JSTestSerializedScriptValueInterfaceConstructor::initializeProperties):
(WebCore::setJSTestSerializedScriptValueInterfaceValueSetter):
(WebCore::setJSTestSerializedScriptValueInterfaceCachedValueSetter):
* bindings/scripts/test/JS/JSTestStandaloneDictionary.cpp:
(WebCore::convertDictionary<DictionaryImplName>):
(WebCore::convertDictionaryToJS):
* bindings/scripts/test/JS/JSTestStringifier.cpp:
(WebCore::JSTestStringifierConstructor::initializeProperties):
* bindings/scripts/test/JS/JSTestStringifierAnonymousOperation.cpp:
(WebCore::JSTestStringifierAnonymousOperationConstructor::initializeProperties):
* bindings/scripts/test/JS/JSTestStringifierNamedOperation.cpp:
(WebCore::JSTestStringifierNamedOperationConstructor::initializeProperties):
* bindings/scripts/test/JS/JSTestStringifierOperationImplementedAs.cpp:
(WebCore::JSTestStringifierOperationImplementedAsConstructor::initializeProperties):
* bindings/scripts/test/JS/JSTestStringifierOperationNamedToString.cpp:
(WebCore::JSTestStringifierOperationNamedToStringConstructor::initializeProperties):
* bindings/scripts/test/JS/JSTestStringifierReadOnlyAttribute.cpp:
(WebCore::JSTestStringifierReadOnlyAttributeConstructor::initializeProperties):
* bindings/scripts/test/JS/JSTestStringifierReadWriteAttribute.cpp:
(WebCore::JSTestStringifierReadWriteAttributeConstructor::initializeProperties):
(WebCore::setJSTestStringifierReadWriteAttributeIdentifierSetter):
* bindings/scripts/test/JS/JSTestTypedefs.cpp:
(WebCore::JSTestTypedefsConstructor::initializeProperties):
(WebCore::setJSTestTypedefsUnsignedLongLongAttrSetter):
(WebCore::setJSTestTypedefsSerializedScriptValueSetter):
(WebCore::setJSTestTypedefsAttributeWithClampSetter):
(WebCore::setJSTestTypedefsAttributeWithClampInTypedefSetter):
(WebCore::setJSTestTypedefsBufferSourceAttrSetter):
(WebCore::setJSTestTypedefsDomTimeStampAttrSetter):
* bridge/NP_jsobject.cpp:
* bridge/c/c_instance.cpp:
(JSC::Bindings::CInstance::stringValue const):
(JSC::Bindings::CInstance::getPropertyNames):
* bridge/c/c_utility.cpp:
(JSC::Bindings::identifierFromNPIdentifier):
* bridge/objc/WebScriptObject.mm:
(-[WebScriptObject callWebScriptMethod:withArguments:]):
(-[WebScriptObject setValue:forKey:]):
(-[WebScriptObject valueForKey:]):
(-[WebScriptObject removeWebScriptKey:]):
(-[WebScriptObject hasWebScriptKey:]):
* bridge/objc/objc_runtime.mm:
(JSC::Bindings::ObjcFallbackObjectImp::defaultValue):
* bridge/objc/objc_utility.mm:
(JSC::Bindings::convertNSStringToString):
* bridge/runtime_array.cpp:
(JSC::RuntimeArray::getOwnPropertyNames):
* contentextensions/ContentExtensionParser.cpp:
(WebCore::ContentExtensions::loadTrigger):
(WebCore::ContentExtensions::loadAction):
* crypto/SubtleCrypto.cpp:
(WebCore::normalizeCryptoAlgorithmParameters):
* domjit/DOMJITHelpers.h:
(WebCore::DOMJIT::toWrapperSlow):
* html/HTMLMediaElement.cpp:
(WebCore::controllerJSValue):
(WebCore::HTMLMediaElement::updateCaptionContainer):
(WebCore::HTMLMediaElement::ensureMediaControlsInjectedScript):
(WebCore::HTMLMediaElement::setControllerJSProperty):
(WebCore::HTMLMediaElement::didAddUserAgentShadowRoot):
(WebCore::HTMLMediaElement::updateMediaControlsAfterPresentationModeChange):
(WebCore::HTMLMediaElement::getCurrentMediaControlsStatus):
* html/HTMLPlugInImageElement.cpp:
(WebCore::HTMLPlugInImageElement::didAddUserAgentShadowRoot):
* inspector/InspectorFrontendHost.cpp:
(WebCore::InspectorFrontendHost::addSelfToGlobalObjectInWorld):
(WebCore::InspectorFrontendHost::showContextMenu):
* inspector/WebInjectedScriptHost.cpp:
(WebCore::WebInjectedScriptHost::subtype):
(WebCore::constructInternalProperty):
(WebCore::objectForPaymentOptions):
(WebCore::objectForPaymentCurrencyAmount):
(WebCore::objectForPaymentItem):
(WebCore::objectForPaymentShippingOption):
(WebCore::objectForPaymentDetailsModifier):
(WebCore::objectForPaymentDetails):
(WebCore::jsStringForPaymentRequestState):
(WebCore::WebInjectedScriptHost::getInternalProperties):
* inspector/agents/InspectorCanvasAgent.cpp:
(WebCore::InspectorCanvasAgent::consoleStartRecordingCanvas):
* inspector/agents/InspectorDOMAgent.cpp:
(WebCore::InspectorDOMAgent::buildObjectForEventListener):
(WebCore::InspectorDOMAgent::scriptValueAsNode):
* inspector/agents/page/PageAuditAgent.cpp:
(WebCore::PageAuditAgent::populateAuditObject):
* page/PageConsoleClient.cpp:
(WebCore::PageConsoleClient::screenshot):
* platform/graphics/CustomPaintImage.cpp:
(WebCore::CustomPaintImage::doCustomPaint):
* testing/js/WebCoreTestSupport.cpp:
(WebCoreTestSupport::injectInternalsObject):
(WebCoreTestSupport::setupNewlyCreatedServiceWorker):
* worklets/PaintWorkletGlobalScope.cpp:
(WebCore::PaintWorkletGlobalScope::registerPaint):
Source/WebKit:
* WebProcess/InjectedBundle/API/glib/DOM/WebKitDOMNode.cpp:
(webkit_dom_node_for_js_value):
* WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp:
(WebKit::InjectedBundleNodeHandle::getOrCreate):
* WebProcess/Plugins/Netscape/JSNPObject.cpp:
(WebKit::JSNPObject::getOwnPropertyNames):
* WebProcess/Plugins/Netscape/NPJSObject.cpp:
(WebKit::identifierFromIdentifierRep):
(WebKit::NPJSObject::enumerate):
* WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp:
(WebKit::NPRuntimeObjectMap::convertNPVariantToJSValue):
(WebKit::NPRuntimeObjectMap::convertJSValueToNPVariant):
* WebProcess/WebPage/WebFrame.cpp:
(WebKit::WebFrame::counterValue):
Source/WebKitLegacy/mac:
* DOM/DOM.mm:
(+[DOMNode _nodeFromJSWrapper:]):
* DOM/DOMUtility.mm:
(createDOMWrapper):
* Plugins/Hosted/NetscapePluginHostProxy.mm:
(identifierFromIdentifierRep):
* Plugins/Hosted/NetscapePluginInstanceProxy.mm:
(WebKit::NetscapePluginInstanceProxy::enumerate):
(WebKit::getObjectID):
(WebKit::NetscapePluginInstanceProxy::addValueToArray):
(WebKit::NetscapePluginInstanceProxy::demarshalValueFromArray):
(WebKit::NetscapePluginInstanceProxy::retainLocalObject):
(WebKit::NetscapePluginInstanceProxy::releaseLocalObject):
* Plugins/Hosted/ProxyInstance.mm:
(WebKit::ProxyInstance::stringValue const):
(WebKit::ProxyInstance::getPropertyNames):
* WebView/WebFrame.mm:
(-[WebFrame _stringByEvaluatingJavaScriptFromString:withGlobalObject:inScriptWorld:]):
Source/WebKitLegacy/win:
* WebFrame.cpp:
(WebFrame::stringByEvaluatingJavaScriptInScriptWorld):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@249175 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/JavaScriptCore/API/APICast.h b/Source/JavaScriptCore/API/APICast.h
index ae9bc07..b2f3888 100644
--- a/Source/JavaScriptCore/API/APICast.h
+++ b/Source/JavaScriptCore/API/APICast.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006 Apple Inc. All rights reserved.
+ * Copyright (C) 2006-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
@@ -114,7 +114,7 @@
{
JSC::JSObject* object = uncheckedToJS(o);
if (object)
- RELEASE_ASSERT(object->methodTable(*object->vm()));
+ RELEASE_ASSERT(object->methodTable(object->vm()));
return object;
}
diff --git a/Source/JavaScriptCore/API/JSAPIGlobalObject.mm b/Source/JavaScriptCore/API/JSAPIGlobalObject.mm
index 116109b..f07a2da 100644
--- a/Source/JavaScriptCore/API/JSAPIGlobalObject.mm
+++ b/Source/JavaScriptCore/API/JSAPIGlobalObject.mm
@@ -116,7 +116,7 @@
auto result = computeValidImportSpecifier(base, name);
if (result)
- return Identifier::fromString(&vm, result.value());
+ return Identifier::fromString(vm, result.value());
throwVMError(exec, scope, createError(exec, result.error()));
return { };
@@ -134,7 +134,7 @@
};
auto import = [&] (URL& url) {
- auto result = importModule(exec, Identifier::fromString(&vm, url), jsUndefined(), jsUndefined());
+ auto result = importModule(exec, Identifier::fromString(vm, url), jsUndefined(), jsUndefined());
if (UNLIKELY(scope.exception()))
return reject(scope.exception());
return result;
@@ -202,7 +202,7 @@
NSURL *sourceURL = [jsScript sourceURL];
String oldModuleKey { [sourceURL absoluteString] };
- if (UNLIKELY(Identifier::fromString(&vm, oldModuleKey) != moduleKey))
+ if (UNLIKELY(Identifier::fromString(vm, oldModuleKey) != moduleKey))
return rejectPromise(makeString("The same JSScript was provided for two different identifiers, previously: ", oldModuleKey, " and now: ", moduleKey.string()));
args.append(source);
@@ -234,7 +234,7 @@
JSObject* metaProperties = constructEmptyObject(exec, globalObject->nullPrototypeObjectStructure());
RETURN_IF_EXCEPTION(scope, nullptr);
- metaProperties->putDirect(vm, Identifier::fromString(&vm, "filename"), key);
+ metaProperties->putDirect(vm, Identifier::fromString(vm, "filename"), key);
RETURN_IF_EXCEPTION(scope, nullptr);
return metaProperties;
@@ -274,7 +274,7 @@
ExecState* exec = globalExec();
auto scope = DECLARE_THROW_SCOPE(vm);
- Identifier key = Identifier::fromString(exec, String { [[script sourceURL] absoluteString] });
+ Identifier key = Identifier::fromString(vm, String { [[script sourceURL] absoluteString] });
JSInternalPromise* promise = importModule(exec, key, jsUndefined(), jsUndefined());
RETURN_IF_EXCEPTION(scope, { });
auto result = JSPromiseDeferred::tryCreate(exec, this);
diff --git a/Source/JavaScriptCore/API/JSCallbackConstructor.cpp b/Source/JavaScriptCore/API/JSCallbackConstructor.cpp
index 57e80a8..070d75d 100644
--- a/Source/JavaScriptCore/API/JSCallbackConstructor.cpp
+++ b/Source/JavaScriptCore/API/JSCallbackConstructor.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2006-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
@@ -48,7 +48,7 @@
void JSCallbackConstructor::finishCreation(JSGlobalObject* globalObject, JSClassRef jsClass)
{
Base::finishCreation(globalObject->vm());
- ASSERT(inherits(*vm(), info()));
+ ASSERT(inherits(vm(), info()));
if (m_class)
JSClassRetain(jsClass);
}
diff --git a/Source/JavaScriptCore/API/JSCallbackObjectFunctions.h b/Source/JavaScriptCore/API/JSCallbackObjectFunctions.h
index 9ca3b4b..c723633 100644
--- a/Source/JavaScriptCore/API/JSCallbackObjectFunctions.h
+++ b/Source/JavaScriptCore/API/JSCallbackObjectFunctions.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006, 2008, 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2006-2019 Apple Inc. All rights reserved.
* Copyright (C) 2007 Eric Seidel <eric@webkit.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,7 @@
template <class Parent>
inline JSCallbackObject<Parent>* JSCallbackObject<Parent>::asCallbackObject(JSValue value)
{
- ASSERT(asObject(value)->inherits(*value.getObject()->vm(), info()));
+ ASSERT(asObject(value)->inherits(value.getObject()->vm(), info()));
return jsCast<JSCallbackObject*>(asObject(value));
}
@@ -51,7 +51,7 @@
inline JSCallbackObject<Parent>* JSCallbackObject<Parent>::asCallbackObject(EncodedJSValue encodedValue)
{
JSValue value = JSValue::decode(encodedValue);
- ASSERT(asObject(value)->inherits(*value.getObject()->vm(), info()));
+ ASSERT(asObject(value)->inherits(value.getObject()->vm(), info()));
return jsCast<JSCallbackObject*>(asObject(value));
}
@@ -74,17 +74,17 @@
template <class Parent>
JSCallbackObject<Parent>::~JSCallbackObject()
{
- VM* vm = this->HeapCell::vm();
- vm->currentlyDestructingCallbackObject = this;
+ VM& vm = this->HeapCell::vm();
+ vm.currentlyDestructingCallbackObject = this;
ASSERT(m_classInfo);
- vm->currentlyDestructingCallbackObjectClassInfo = m_classInfo;
+ vm.currentlyDestructingCallbackObjectClassInfo = m_classInfo;
JSObjectRef thisRef = toRef(static_cast<JSObject*>(this));
for (JSClassRef jsClass = classRef(); jsClass; jsClass = jsClass->parentClass) {
if (JSObjectFinalizeCallback finalize = jsClass->finalize)
finalize(thisRef);
}
- vm->currentlyDestructingCallbackObject = nullptr;
- vm->currentlyDestructingCallbackObjectClassInfo = nullptr;
+ vm.currentlyDestructingCallbackObject = nullptr;
+ vm.currentlyDestructingCallbackObjectClassInfo = nullptr;
}
template <class Parent>
@@ -215,7 +215,8 @@
template <class Parent>
bool JSCallbackObject<Parent>::getOwnPropertySlotByIndex(JSObject* object, ExecState* exec, unsigned propertyName, PropertySlot& slot)
{
- return object->methodTable(exec->vm())->getOwnPropertySlot(object, exec, Identifier::from(exec, propertyName), slot);
+ VM& vm = exec->vm();
+ return object->methodTable(vm)->getOwnPropertySlot(object, exec, Identifier::from(vm, propertyName), slot);
}
template <class Parent>
@@ -320,7 +321,7 @@
JSObjectRef thisRef = toRef(thisObject);
RefPtr<OpaqueJSString> propertyNameRef;
JSValueRef valueRef = toRef(exec, value);
- Identifier propertyName = Identifier::from(exec, propertyIndex);
+ Identifier propertyName = Identifier::from(vm, propertyIndex);
for (JSClassRef jsClass = thisObject->classRef(); jsClass; jsClass = jsClass->parentClass) {
if (JSObjectSetPropertyCallback setProperty = jsClass->setProperty) {
@@ -421,8 +422,9 @@
template <class Parent>
bool JSCallbackObject<Parent>::deletePropertyByIndex(JSCell* cell, ExecState* exec, unsigned propertyName)
{
+ VM& vm = exec->vm();
JSCallbackObject* thisObject = jsCast<JSCallbackObject*>(cell);
- return thisObject->methodTable(exec->vm())->deleteProperty(thisObject, exec, Identifier::from(exec, propertyName));
+ return thisObject->methodTable(vm)->deleteProperty(thisObject, exec, Identifier::from(vm, propertyName));
}
template <class Parent>
@@ -547,6 +549,7 @@
template <class Parent>
void JSCallbackObject<Parent>::getOwnNonIndexPropertyNames(JSObject* object, ExecState* exec, PropertyNameArray& propertyNames, EnumerationMode mode)
{
+ VM& vm = exec->vm();
JSCallbackObject* thisObject = jsCast<JSCallbackObject*>(object);
JSContextRef execRef = toRef(exec);
JSObjectRef thisRef = toRef(thisObject);
@@ -565,7 +568,7 @@
StaticValueEntry* entry = it->value.get();
if (entry->getProperty && (!(entry->attributes & kJSPropertyAttributeDontEnum) || mode.includeDontEnumProperties())) {
ASSERT(!name->isSymbol());
- propertyNames.add(Identifier::fromString(exec, String(name)));
+ propertyNames.add(Identifier::fromString(vm, String(name)));
}
}
}
@@ -578,7 +581,7 @@
StaticFunctionEntry* entry = it->value.get();
if (!(entry->attributes & kJSPropertyAttributeDontEnum) || mode.includeDontEnumProperties()) {
ASSERT(!name->isSymbol());
- propertyNames.add(Identifier::fromString(exec, String(name)));
+ propertyNames.add(Identifier::fromString(vm, String(name)));
}
}
}
diff --git a/Source/JavaScriptCore/API/JSContext.mm b/Source/JavaScriptCore/API/JSContext.mm
index 05de4f3..ffd9c33 100644
--- a/Source/JavaScriptCore/API/JSContext.mm
+++ b/Source/JavaScriptCore/API/JSContext.mm
@@ -158,7 +158,7 @@
}
auto scope = DECLARE_CATCH_SCOPE(vm);
- JSC::JSArray* result = exec->lexicalGlobalObject()->moduleLoader()->dependencyKeysIfEvaluated(exec, JSC::jsString(&vm, [[script sourceURL] absoluteString]));
+ JSC::JSArray* result = exec->lexicalGlobalObject()->moduleLoader()->dependencyKeysIfEvaluated(exec, JSC::jsString(vm, [[script sourceURL] absoluteString]));
if (scope.exception()) {
JSValueRef exceptionValue = toRef(exec, scope.exception()->value());
scope.clearException();
diff --git a/Source/JavaScriptCore/API/JSObjectRef.cpp b/Source/JavaScriptCore/API/JSObjectRef.cpp
index 554d5f1..9d08032 100644
--- a/Source/JavaScriptCore/API/JSObjectRef.cpp
+++ b/Source/JavaScriptCore/API/JSObjectRef.cpp
@@ -147,12 +147,12 @@
auto scope = DECLARE_CATCH_SCOPE(vm);
startingLineNumber = std::max(1, startingLineNumber);
- Identifier nameID = name ? name->identifier(&vm) : Identifier::fromString(exec, "anonymous");
+ Identifier nameID = name ? name->identifier(&vm) : Identifier::fromString(vm, "anonymous");
MarkedArgumentBuffer args;
for (unsigned i = 0; i < parameterCount; i++)
- args.append(jsString(exec, parameterNames[i]->string()));
- args.append(jsString(exec, body->string()));
+ args.append(jsString(vm, parameterNames[i]->string()));
+ args.append(jsString(vm, body->string()));
if (UNLIKELY(args.hasOverflowed())) {
auto throwScope = DECLARE_THROW_SCOPE(vm);
throwOutOfMemoryError(exec, throwScope);
@@ -546,7 +546,7 @@
// during destruction.
static const ClassInfo* classInfoPrivate(JSObject* jsObject)
{
- VM& vm = *jsObject->vm();
+ VM& vm = jsObject->vm();
if (vm.currentlyDestructingCallbackObject != jsObject)
return jsObject->classInfo(vm);
@@ -557,7 +557,7 @@
void* JSObjectGetPrivate(JSObjectRef object)
{
JSObject* jsObject = uncheckedToJS(object);
- VM& vm = *jsObject->vm();
+ VM& vm = jsObject->vm();
const ClassInfo* classInfo = classInfoPrivate(jsObject);
@@ -582,7 +582,7 @@
bool JSObjectSetPrivate(JSObjectRef object, void* data)
{
JSObject* jsObject = uncheckedToJS(object);
- VM& vm = *jsObject->vm();
+ VM& vm = jsObject->vm();
const ClassInfo* classInfo = classInfoPrivate(jsObject);
@@ -810,12 +810,12 @@
ExecState* exec = toJS(ctx);
JSLockHolder locker(exec);
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
JSObject* jsObject = toJS(object);
- JSPropertyNameArrayRef propertyNames = new OpaqueJSPropertyNameArray(vm);
+ JSPropertyNameArrayRef propertyNames = new OpaqueJSPropertyNameArray(&vm);
PropertyNameArray array(vm, PropertyNameMode::Strings, PrivateSymbolMode::Exclude);
- jsObject->methodTable(*vm)->getPropertyNames(jsObject, exec, array, EnumerationMode());
+ jsObject->methodTable(vm)->getPropertyNames(jsObject, exec, array, EnumerationMode());
size_t size = array.size();
propertyNames->array.reserveInitialCapacity(size);
@@ -852,9 +852,9 @@
void JSPropertyNameAccumulatorAddName(JSPropertyNameAccumulatorRef array, JSStringRef propertyName)
{
PropertyNameArray* propertyNames = toJS(array);
- VM* vm = propertyNames->vm();
+ VM& vm = propertyNames->vm();
JSLockHolder locker(vm);
- propertyNames->add(propertyName->identifier(vm));
+ propertyNames->add(propertyName->identifier(&vm));
}
JSObjectRef JSObjectGetProxyTarget(JSObjectRef objectRef)
@@ -862,7 +862,7 @@
JSObject* object = toJS(objectRef);
if (!object)
return nullptr;
- VM& vm = *object->vm();
+ VM& vm = object->vm();
JSLockHolder locker(vm);
JSObject* result = nullptr;
if (JSProxy* proxy = jsDynamicCast<JSProxy*>(vm, object))
diff --git a/Source/JavaScriptCore/API/JSScriptRef.cpp b/Source/JavaScriptCore/API/JSScriptRef.cpp
index 253caa8..be0049b 100644
--- a/Source/JavaScriptCore/API/JSScriptRef.cpp
+++ b/Source/JavaScriptCore/API/JSScriptRef.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-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
@@ -75,7 +75,7 @@
static bool parseScript(VM& vm, const SourceCode& source, ParserError& error)
{
return !!JSC::parse<JSC::ProgramNode>(
- &vm, source, Identifier(), JSParserBuiltinMode::NotBuiltin,
+ vm, source, Identifier(), JSParserBuiltinMode::NotBuiltin,
JSParserStrictMode::NotStrict, JSParserScriptMode::Classic, SourceParseMode::ProgramMode, SuperBinding::NotNeeded,
error);
}
diff --git a/Source/JavaScriptCore/API/JSValueRef.cpp b/Source/JavaScriptCore/API/JSValueRef.cpp
index 2b39fbe..3a19f38 100644
--- a/Source/JavaScriptCore/API/JSValueRef.cpp
+++ b/Source/JavaScriptCore/API/JSValueRef.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006, 2007, 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2006-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
@@ -346,9 +346,10 @@
return 0;
}
ExecState* exec = toJS(ctx);
- JSLockHolder locker(exec);
+ VM& vm = exec->vm();
+ JSLockHolder locker(vm);
- return toRef(exec, jsString(exec, string ? string->string() : String()));
+ return toRef(exec, jsString(vm, string ? string->string() : String()));
}
JSValueRef JSValueMakeFromJSONString(JSContextRef ctx, JSStringRef string)
diff --git a/Source/JavaScriptCore/API/OpaqueJSString.cpp b/Source/JavaScriptCore/API/OpaqueJSString.cpp
index 77a2e1c..3cb4fd7 100644
--- a/Source/JavaScriptCore/API/OpaqueJSString.cpp
+++ b/Source/JavaScriptCore/API/OpaqueJSString.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2008-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
@@ -78,9 +78,9 @@
return Identifier(Identifier::EmptyIdentifier);
if (m_string.is8Bit())
- return Identifier::fromString(vm, m_string.characters8(), m_string.length());
+ return Identifier::fromString(*vm, m_string.characters8(), m_string.length());
- return Identifier::fromString(vm, m_string.characters16(), m_string.length());
+ return Identifier::fromString(*vm, m_string.characters16(), m_string.length());
}
const UChar* OpaqueJSString::characters()
diff --git a/Source/JavaScriptCore/API/glib/JSCContext.cpp b/Source/JavaScriptCore/API/glib/JSCContext.cpp
index 78d7655..dc34136 100644
--- a/Source/JavaScriptCore/API/glib/JSCContext.cpp
+++ b/Source/JavaScriptCore/API/glib/JSCContext.cpp
@@ -950,11 +950,11 @@
JSC::ParserError error;
switch (mode) {
case JSC_CHECK_SYNTAX_MODE_SCRIPT:
- success = !!JSC::parse<JSC::ProgramNode>(&vm, source, JSC::Identifier(), JSC::JSParserBuiltinMode::NotBuiltin,
+ success = !!JSC::parse<JSC::ProgramNode>(vm, source, JSC::Identifier(), JSC::JSParserBuiltinMode::NotBuiltin,
JSC::JSParserStrictMode::NotStrict, JSC::JSParserScriptMode::Classic, JSC::SourceParseMode::ProgramMode, JSC::SuperBinding::NotNeeded, error);
break;
case JSC_CHECK_SYNTAX_MODE_MODULE:
- success = !!JSC::parse<JSC::ModuleProgramNode>(&vm, source, JSC::Identifier(), JSC::JSParserBuiltinMode::NotBuiltin,
+ success = !!JSC::parse<JSC::ModuleProgramNode>(vm, source, JSC::Identifier(), JSC::JSParserBuiltinMode::NotBuiltin,
JSC::JSParserStrictMode::Strict, JSC::JSParserScriptMode::Module, JSC::SourceParseMode::ModuleAnalyzeMode, JSC::SuperBinding::NotNeeded, error);
break;
}
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index ba7b95e..534db01 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,1129 @@
+2019-08-27 Mark Lam <mark.lam@apple.com>
+
+ Refactor to use VM& instead of VM* at as many places as possible.
+ https://bugs.webkit.org/show_bug.cgi?id=201172
+
+ Reviewed by Yusuke Suzuki.
+
+ Using VM& documents more clearly that the VM pointer is expected to never be null
+ in most cases. There are a few places where it can be null (e.g JSLock, and
+ DFG::Plan). Those will be left using a VM*.
+
+ Also converted some uses of ExecState* to using VM& instead since the ExecState*
+ is only there to fetch the VM pointer. Doing this also reduces the number of
+ times we have to compute VM* from ExecState*.
+
+ This patch is not exhaustive in converting to use VM&, but applies the change to
+ many commonly used pieces of code for a start.
+
+ Also fixed a missing exception check in JSString::toIdentifier() and
+ JSValue::toPropertyKey() exposed by this patch.
+
+ * API/APICast.h:
+ (toJS):
+ * API/JSAPIGlobalObject.mm:
+ (JSC::JSAPIGlobalObject::moduleLoaderResolve):
+ (JSC::JSAPIGlobalObject::moduleLoaderImportModule):
+ (JSC::JSAPIGlobalObject::moduleLoaderFetch):
+ (JSC::JSAPIGlobalObject::moduleLoaderCreateImportMetaProperties):
+ (JSC::JSAPIGlobalObject::loadAndEvaluateJSScriptModule):
+ * API/JSCallbackConstructor.cpp:
+ (JSC::JSCallbackConstructor::finishCreation):
+ * API/JSCallbackObjectFunctions.h:
+ (JSC::JSCallbackObject<Parent>::asCallbackObject):
+ (JSC::JSCallbackObject<Parent>::~JSCallbackObject):
+ (JSC::JSCallbackObject<Parent>::getOwnPropertySlotByIndex):
+ (JSC::JSCallbackObject<Parent>::putByIndex):
+ (JSC::JSCallbackObject<Parent>::deletePropertyByIndex):
+ (JSC::JSCallbackObject<Parent>::getOwnNonIndexPropertyNames):
+ * API/JSContext.mm:
+ (-[JSContext dependencyIdentifiersForModuleJSScript:]):
+ * API/JSObjectRef.cpp:
+ (JSObjectMakeFunction):
+ (classInfoPrivate):
+ (JSObjectGetPrivate):
+ (JSObjectSetPrivate):
+ (JSObjectCopyPropertyNames):
+ (JSPropertyNameAccumulatorAddName):
+ (JSObjectGetProxyTarget):
+ * API/JSScriptRef.cpp:
+ (parseScript):
+ * API/JSValueRef.cpp:
+ (JSValueMakeString):
+ * API/OpaqueJSString.cpp:
+ (OpaqueJSString::identifier const):
+ * API/glib/JSCContext.cpp:
+ (jsc_context_check_syntax):
+ * KeywordLookupGenerator.py:
+ (Trie.printSubTreeAsC):
+ * Scripts/wkbuiltins/builtins_generate_wrapper_header.py:
+ (BuiltinsWrapperHeaderGenerator.generate_constructor):
+ * Scripts/wkbuiltins/builtins_templates.py:
+ * bindings/ScriptFunctionCall.cpp:
+ (Deprecated::ScriptCallArgumentHandler::appendArgument):
+ (Deprecated::ScriptFunctionCall::call):
+ * bindings/ScriptValue.cpp:
+ (Inspector::jsToInspectorValue):
+ * builtins/BuiltinExecutables.cpp:
+ (JSC::BuiltinExecutables::createExecutable):
+ * builtins/BuiltinNames.cpp:
+ (JSC::BuiltinNames::BuiltinNames):
+ * builtins/BuiltinNames.h:
+ (JSC::BuiltinNames::getPublicName const):
+ * bytecode/BytecodeDumper.cpp:
+ (JSC::BytecodeDumper<Block>::vm const):
+ * bytecode/BytecodeDumper.h:
+ * bytecode/BytecodeGeneratorification.cpp:
+ (JSC::BytecodeGeneratorification::BytecodeGeneratorification):
+ (JSC::BytecodeGeneratorification::storageForGeneratorLocal):
+ (JSC::BytecodeGeneratorification::run):
+ * bytecode/BytecodeIntrinsicRegistry.cpp:
+ (JSC::BytecodeIntrinsicRegistry::sentinelMapBucketValue):
+ (JSC::BytecodeIntrinsicRegistry::sentinelSetBucketValue):
+ * bytecode/CallVariant.h:
+ (JSC::CallVariant::internalFunction const):
+ (JSC::CallVariant::function const):
+ (JSC::CallVariant::isClosureCall const):
+ (JSC::CallVariant::executable const):
+ (JSC::CallVariant::functionExecutable const):
+ (JSC::CallVariant::nativeExecutable const):
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::dumpSource):
+ (JSC::CodeBlock::CodeBlock):
+ (JSC::CodeBlock::setConstantIdentifierSetRegisters):
+ (JSC::CodeBlock::setNumParameters):
+ (JSC::CodeBlock::finalizeBaselineJITInlineCaches):
+ (JSC::CodeBlock::unlinkIncomingCalls):
+ (JSC::CodeBlock::replacement):
+ (JSC::CodeBlock::computeCapabilityLevel):
+ (JSC::CodeBlock::noticeIncomingCall):
+ (JSC::CodeBlock::nameForRegister):
+ (JSC::CodeBlock::insertBasicBlockBoundariesForControlFlowProfiler):
+ * bytecode/CodeBlock.h:
+ (JSC::CodeBlock::vm const):
+ (JSC::CodeBlock::numberOfArgumentValueProfiles):
+ (JSC::CodeBlock::valueProfileForArgument):
+ * bytecode/DeferredSourceDump.cpp:
+ (JSC::DeferredSourceDump::DeferredSourceDump):
+ * bytecode/EvalCodeBlock.h:
+ * bytecode/FunctionCodeBlock.h:
+ * bytecode/GetByIdStatus.cpp:
+ (JSC::GetByIdStatus::computeFromLLInt):
+ * bytecode/GlobalCodeBlock.h:
+ (JSC::GlobalCodeBlock::GlobalCodeBlock):
+ * bytecode/ModuleProgramCodeBlock.h:
+ * bytecode/ObjectAllocationProfileInlines.h:
+ (JSC::ObjectAllocationProfileBase<Derived>::possibleDefaultPropertyCount):
+ * bytecode/PolyProtoAccessChain.cpp:
+ (JSC::PolyProtoAccessChain::create):
+ * bytecode/ProgramCodeBlock.h:
+ * bytecode/PropertyCondition.cpp:
+ (JSC::PropertyCondition::isWatchableWhenValid const):
+ * bytecode/PutByIdStatus.cpp:
+ (JSC::PutByIdStatus::computeFromLLInt):
+ * bytecode/StructureStubInfo.cpp:
+ (JSC::StructureStubInfo::initGetByIdSelf):
+ (JSC::StructureStubInfo::initPutByIdReplace):
+ (JSC::StructureStubInfo::initInByIdSelf):
+ (JSC::StructureStubInfo::addAccessCase):
+ (JSC::StructureStubInfo::visitWeakReferences):
+ * bytecode/UnlinkedCodeBlock.cpp:
+ (JSC::UnlinkedCodeBlock::UnlinkedCodeBlock):
+ * bytecode/UnlinkedCodeBlock.h:
+ (JSC::UnlinkedCodeBlock::addSetConstant):
+ (JSC::UnlinkedCodeBlock::addConstant):
+ (JSC::UnlinkedCodeBlock::addFunctionDecl):
+ (JSC::UnlinkedCodeBlock::addFunctionExpr):
+ * bytecode/UnlinkedEvalCodeBlock.h:
+ * bytecode/UnlinkedFunctionCodeBlock.h:
+ * bytecode/UnlinkedFunctionExecutable.cpp:
+ (JSC::generateUnlinkedFunctionCodeBlock):
+ (JSC::UnlinkedFunctionExecutable::UnlinkedFunctionExecutable):
+ * bytecode/UnlinkedFunctionExecutable.h:
+ * bytecode/UnlinkedGlobalCodeBlock.h:
+ (JSC::UnlinkedGlobalCodeBlock::UnlinkedGlobalCodeBlock):
+ * bytecode/UnlinkedModuleProgramCodeBlock.h:
+ * bytecode/UnlinkedProgramCodeBlock.h:
+ * bytecompiler/BytecodeGenerator.cpp:
+ (JSC::BytecodeGenerator::BytecodeGenerator):
+ (JSC::BytecodeGenerator::pushLexicalScopeInternal):
+ (JSC::BytecodeGenerator::emitDirectPutById):
+ (JSC::BytecodeGenerator::getVariablesUnderTDZ):
+ (JSC::BytecodeGenerator::addBigIntConstant):
+ (JSC::BytecodeGenerator::addTemplateObjectConstant):
+ (JSC::BytecodeGenerator::emitNewDefaultConstructor):
+ (JSC::BytecodeGenerator::emitSetFunctionNameIfNeeded):
+ * bytecompiler/BytecodeGenerator.h:
+ (JSC::BytecodeGenerator::vm const):
+ (JSC::BytecodeGenerator::propertyNames const):
+ (JSC::BytecodeGenerator::emitNodeInTailPosition):
+ (JSC::BytecodeGenerator::emitDefineClassElements):
+ (JSC::BytecodeGenerator::emitNodeInConditionContext):
+ * bytecompiler/NodesCodegen.cpp:
+ (JSC::RegExpNode::emitBytecode):
+ (JSC::ArrayNode::emitBytecode):
+ (JSC::FunctionCallResolveNode::emitBytecode):
+ (JSC::BytecodeIntrinsicNode::emit_intrinsic_getByIdDirectPrivate):
+ (JSC::BytecodeIntrinsicNode::emit_intrinsic_putByIdDirectPrivate):
+ (JSC::BytecodeIntrinsicNode::emit_intrinsic_toObject):
+ (JSC::InstanceOfNode::emitBytecode):
+ * debugger/Debugger.cpp:
+ * debugger/DebuggerParseData.cpp:
+ (JSC::gatherDebuggerParseData):
+ * debugger/DebuggerScope.cpp:
+ (JSC::DebuggerScope::next):
+ (JSC::DebuggerScope::name const):
+ (JSC::DebuggerScope::location const):
+ * dfg/DFGDesiredIdentifiers.cpp:
+ (JSC::DFG::DesiredIdentifiers::reallyAdd):
+ * dfg/DFGDesiredWatchpoints.cpp:
+ (JSC::DFG::ArrayBufferViewWatchpointAdaptor::add):
+ (JSC::DFG::AdaptiveStructureWatchpointAdaptor::add):
+ * dfg/DFGFrozenValue.h:
+ (JSC::DFG::FrozenValue::FrozenValue):
+ * dfg/DFGGraph.cpp:
+ (JSC::DFG::Graph::canOptimizeStringObjectAccess):
+ * dfg/DFGJITCompiler.cpp:
+ (JSC::DFG::JITCompiler::linkOSRExits):
+ (JSC::DFG::JITCompiler::compileExceptionHandlers):
+ (JSC::DFG::JITCompiler::link):
+ (JSC::DFG::emitStackOverflowCheck):
+ (JSC::DFG::JITCompiler::compileFunction):
+ (JSC::DFG::JITCompiler::exceptionCheck):
+ (JSC::DFG::JITCompiler::makeCatchOSREntryBuffer):
+ * dfg/DFGJITCompiler.h:
+ (JSC::DFG::JITCompiler::exceptionCheckWithCallFrameRollback):
+ (JSC::DFG::JITCompiler::fastExceptionCheck):
+ (JSC::DFG::JITCompiler::vm):
+ * dfg/DFGLazyJSValue.cpp:
+ (JSC::DFG::LazyJSValue::getValue const):
+ (JSC::DFG::LazyJSValue::emit const):
+ * dfg/DFGOSREntry.cpp:
+ (JSC::DFG::prepareOSREntry):
+ * dfg/DFGOSRExit.cpp:
+ (JSC::DFG::OSRExit::compileOSRExit):
+ (JSC::DFG::OSRExit::debugOperationPrintSpeculationFailure):
+ * dfg/DFGOSRExitCompilerCommon.h:
+ (JSC::DFG::adjustFrameAndStackInOSRExitCompilerThunk):
+ * dfg/DFGOperations.cpp:
+ (JSC::DFG::newTypedArrayWithSize):
+ (JSC::DFG::binaryOp):
+ (JSC::DFG::bitwiseBinaryOp):
+ * dfg/DFGPlan.cpp:
+ (JSC::DFG::Plan::Plan):
+ * dfg/DFGSpeculativeJIT.cpp:
+ (JSC::DFG::SpeculativeJIT::emitAllocateRawObject):
+ (JSC::DFG::SpeculativeJIT::compileStringSlice):
+ (JSC::DFG::SpeculativeJIT::compileCurrentBlock):
+ (JSC::DFG::SpeculativeJIT::compileCheckTraps):
+ (JSC::DFG::SpeculativeJIT::compileGetByValOnString):
+ (JSC::DFG::SpeculativeJIT::compileFromCharCode):
+ (JSC::DFG::SpeculativeJIT::compileStringZeroLength):
+ (JSC::DFG::SpeculativeJIT::compileLogicalNotStringOrOther):
+ (JSC::DFG::SpeculativeJIT::emitStringBranch):
+ (JSC::DFG::SpeculativeJIT::emitStringOrOtherBranch):
+ (JSC::DFG::SpeculativeJIT::cageTypedArrayStorage):
+ (JSC::DFG::SpeculativeJIT::compileGetGlobalObject):
+ (JSC::DFG::SpeculativeJIT::compileNewFunctionCommon):
+ (JSC::DFG::SpeculativeJIT::compileCreateActivation):
+ (JSC::DFG::SpeculativeJIT::compileCreateDirectArguments):
+ (JSC::DFG::SpeculativeJIT::compileSpread):
+ (JSC::DFG::SpeculativeJIT::compileNewArray):
+ (JSC::DFG::SpeculativeJIT::compileNewArrayWithSpread):
+ (JSC::DFG::SpeculativeJIT::compileArraySlice):
+ (JSC::DFG::SpeculativeJIT::compileArrayPush):
+ (JSC::DFG::SpeculativeJIT::compileTypeOf):
+ (JSC::DFG::SpeculativeJIT::compileAllocatePropertyStorage):
+ (JSC::DFG::SpeculativeJIT::compileReallocatePropertyStorage):
+ (JSC::DFG::SpeculativeJIT::compileNukeStructureAndSetButterfly):
+ (JSC::DFG::SpeculativeJIT::compileCallDOMGetter):
+ (JSC::DFG::SpeculativeJIT::compileCheckSubClass):
+ (JSC::DFG::SpeculativeJIT::compileNewStringObject):
+ (JSC::DFG::SpeculativeJIT::compileNewTypedArrayWithSize):
+ (JSC::DFG::SpeculativeJIT::compileNewRegexp):
+ (JSC::DFG::SpeculativeJIT::compileStoreBarrier):
+ (JSC::DFG::SpeculativeJIT::compileStringReplace):
+ (JSC::DFG::SpeculativeJIT::compileMaterializeNewObject):
+ (JSC::DFG::SpeculativeJIT::emitAllocateButterfly):
+ (JSC::DFG::SpeculativeJIT::compileGetMapBucketNext):
+ (JSC::DFG::SpeculativeJIT::compileObjectKeys):
+ (JSC::DFG::SpeculativeJIT::compileCreateThis):
+ (JSC::DFG::SpeculativeJIT::compileNewObject):
+ (JSC::DFG::SpeculativeJIT::compileLogShadowChickenPrologue):
+ (JSC::DFG::SpeculativeJIT::compileLogShadowChickenTail):
+ (JSC::DFG::SpeculativeJIT::compileGetPrototypeOf):
+ (JSC::DFG::SpeculativeJIT::compileAllocateNewArrayWithSize):
+ (JSC::DFG::SpeculativeJIT::compileProfileType):
+ (JSC::DFG::SpeculativeJIT::compileMakeRope):
+ * dfg/DFGSpeculativeJIT.h:
+ (JSC::DFG::SpeculativeJIT::vm):
+ (JSC::DFG::SpeculativeJIT::prepareForExternalCall):
+ (JSC::DFG::SpeculativeJIT::emitAllocateJSObjectWithKnownSize):
+ (JSC::DFG::SpeculativeJIT::emitAllocateJSObject):
+ (JSC::DFG::SpeculativeJIT::emitAllocateVariableSizedJSObject):
+ (JSC::DFG::SpeculativeJIT::emitAllocateDestructibleObject):
+ * dfg/DFGSpeculativeJIT32_64.cpp:
+ (JSC::DFG::SpeculativeJIT::emitCall):
+ (JSC::DFG::SpeculativeJIT::compileLogicalNot):
+ (JSC::DFG::SpeculativeJIT::emitBranch):
+ (JSC::DFG::SpeculativeJIT::compile):
+ * dfg/DFGSpeculativeJIT64.cpp:
+ (JSC::DFG::SpeculativeJIT::nonSpeculativeNonPeepholeCompareNullOrUndefined):
+ (JSC::DFG::SpeculativeJIT::nonSpeculativePeepholeBranchNullOrUndefined):
+ (JSC::DFG::SpeculativeJIT::emitCall):
+ (JSC::DFG::SpeculativeJIT::compileObjectOrOtherLogicalNot):
+ (JSC::DFG::SpeculativeJIT::compileLogicalNot):
+ (JSC::DFG::SpeculativeJIT::emitObjectOrOtherBranch):
+ (JSC::DFG::SpeculativeJIT::emitBranch):
+ (JSC::DFG::SpeculativeJIT::compile):
+ * dfg/DFGThunks.cpp:
+ (JSC::DFG::osrExitThunkGenerator):
+ (JSC::DFG::osrExitGenerationThunkGenerator):
+ (JSC::DFG::osrEntryThunkGenerator):
+ * dfg/DFGThunks.h:
+ * dfg/DFGToFTLForOSREntryDeferredCompilationCallback.cpp:
+ (JSC::DFG::ToFTLForOSREntryDeferredCompilationCallback::compilationDidComplete):
+ * dfg/DFGWorklist.cpp:
+ (JSC::DFG::Worklist::visitWeakReferences):
+ * dynbench.cpp:
+ (main):
+ * ftl/FTLLowerDFGToB3.cpp:
+ (JSC::FTL::DFG::LowerDFGToB3::compileMakeRope):
+ (JSC::FTL::DFG::LowerDFGToB3::compileStringSlice):
+ (JSC::FTL::DFG::LowerDFGToB3::boolify):
+ * ftl/FTLThunks.cpp:
+ (JSC::FTL::genericGenerationThunkGenerator):
+ (JSC::FTL::osrExitGenerationThunkGenerator):
+ (JSC::FTL::lazySlowPathGenerationThunkGenerator):
+ * ftl/FTLThunks.h:
+ * heap/CellContainer.h:
+ * heap/CellContainerInlines.h:
+ (JSC::CellContainer::vm const):
+ (JSC::CellContainer::heap const):
+ * heap/CompleteSubspace.cpp:
+ (JSC::CompleteSubspace::tryAllocateSlow):
+ (JSC::CompleteSubspace::reallocateLargeAllocationNonVirtual):
+ * heap/GCActivityCallback.h:
+ * heap/GCAssertions.h:
+ * heap/HandleSet.cpp:
+ (JSC::HandleSet::HandleSet):
+ * heap/HandleSet.h:
+ (JSC::HandleSet::vm):
+ * heap/Heap.cpp:
+ (JSC::Heap::Heap):
+ (JSC::Heap::lastChanceToFinalize):
+ (JSC::Heap::releaseDelayedReleasedObjects):
+ (JSC::Heap::protect):
+ (JSC::Heap::unprotect):
+ (JSC::Heap::finalizeMarkedUnconditionalFinalizers):
+ (JSC::Heap::finalizeUnconditionalFinalizers):
+ (JSC::Heap::completeAllJITPlans):
+ (JSC::Heap::iterateExecutingAndCompilingCodeBlocks):
+ (JSC::Heap::gatherJSStackRoots):
+ (JSC::Heap::gatherScratchBufferRoots):
+ (JSC::Heap::removeDeadCompilerWorklistEntries):
+ (JSC::Heap::isAnalyzingHeap const):
+ (JSC::Heap::gatherExtraHeapData):
+ (JSC::Heap::protectedObjectTypeCounts):
+ (JSC::Heap::objectTypeCounts):
+ (JSC::Heap::deleteAllCodeBlocks):
+ (JSC::Heap::deleteAllUnlinkedCodeBlocks):
+ (JSC::Heap::deleteUnmarkedCompiledCode):
+ (JSC::Heap::checkConn):
+ (JSC::Heap::runEndPhase):
+ (JSC::Heap::stopThePeriphery):
+ (JSC::Heap::finalize):
+ (JSC::Heap::requestCollection):
+ (JSC::Heap::sweepInFinalize):
+ (JSC::Heap::sweepArrayBuffers):
+ (JSC::Heap::deleteSourceProviderCaches):
+ (JSC::Heap::didFinishCollection):
+ (JSC::Heap::addCoreConstraints):
+ * heap/Heap.h:
+ * heap/HeapCell.h:
+ * heap/HeapCellInlines.h:
+ (JSC::HeapCell::heap const):
+ (JSC::HeapCell::vm const):
+ * heap/HeapInlines.h:
+ (JSC::Heap::vm const):
+ * heap/IsoSubspacePerVM.cpp:
+ (JSC::IsoSubspacePerVM::AutoremovingIsoSubspace::~AutoremovingIsoSubspace):
+ * heap/LargeAllocation.cpp:
+ (JSC::LargeAllocation::sweep):
+ (JSC::LargeAllocation::assertValidCell const):
+ * heap/LargeAllocation.h:
+ (JSC::LargeAllocation::vm const):
+ * heap/LocalAllocator.cpp:
+ (JSC::LocalAllocator::allocateSlowCase):
+ * heap/MarkedBlock.cpp:
+ (JSC::MarkedBlock::Handle::Handle):
+ (JSC::MarkedBlock::aboutToMarkSlow):
+ (JSC::MarkedBlock::assertMarksNotStale):
+ (JSC::MarkedBlock::areMarksStale):
+ (JSC::MarkedBlock::isMarked):
+ (JSC::MarkedBlock::assertValidCell const):
+ * heap/MarkedBlock.h:
+ (JSC::MarkedBlock::Handle::vm const):
+ (JSC::MarkedBlock::vm const):
+ * heap/MarkedBlockInlines.h:
+ (JSC::MarkedBlock::heap const):
+ (JSC::MarkedBlock::Handle::specializedSweep):
+ * heap/SlotVisitor.cpp:
+ (JSC::validate):
+ * heap/SlotVisitorInlines.h:
+ (JSC::SlotVisitor::vm):
+ (JSC::SlotVisitor::vm const):
+ * heap/StopIfNecessaryTimer.cpp:
+ (JSC::StopIfNecessaryTimer::StopIfNecessaryTimer):
+ * heap/StopIfNecessaryTimer.h:
+ * heap/Strong.h:
+ (JSC::Strong::operator=):
+ * heap/WeakSet.h:
+ (JSC::WeakSet::WeakSet):
+ (JSC::WeakSet::vm const):
+ * inspector/JSInjectedScriptHost.cpp:
+ (Inspector::JSInjectedScriptHost::savedResultAlias const):
+ (Inspector::JSInjectedScriptHost::internalConstructorName):
+ (Inspector::JSInjectedScriptHost::subtype):
+ (Inspector::JSInjectedScriptHost::functionDetails):
+ (Inspector::constructInternalProperty):
+ (Inspector::JSInjectedScriptHost::getInternalProperties):
+ (Inspector::JSInjectedScriptHost::weakMapEntries):
+ (Inspector::JSInjectedScriptHost::weakSetEntries):
+ (Inspector::JSInjectedScriptHost::iteratorEntries):
+ (Inspector::JSInjectedScriptHost::queryInstances):
+ (Inspector::JSInjectedScriptHost::queryHolders):
+ * inspector/JSJavaScriptCallFrame.cpp:
+ (Inspector::valueForScopeLocation):
+ (Inspector::JSJavaScriptCallFrame::scopeDescriptions):
+ (Inspector::JSJavaScriptCallFrame::functionName const):
+ (Inspector::JSJavaScriptCallFrame::type const):
+ * inspector/ScriptCallStackFactory.cpp:
+ (Inspector::extractSourceInformationFromException):
+ * inspector/agents/InspectorAuditAgent.cpp:
+ (Inspector::InspectorAuditAgent::populateAuditObject):
+ * inspector/agents/InspectorHeapAgent.cpp:
+ (Inspector::InspectorHeapAgent::gc):
+ * interpreter/FrameTracers.h:
+ (JSC::NativeCallFrameTracer::NativeCallFrameTracer):
+ * interpreter/Interpreter.cpp:
+ (JSC::Interpreter::executeProgram):
+ (JSC::Interpreter::prepareForRepeatCall):
+ (JSC::Interpreter::execute):
+ (JSC::Interpreter::executeModuleProgram):
+ * interpreter/StackVisitor.cpp:
+ (JSC::StackVisitor::Frame::calleeSaveRegistersForUnwinding):
+ (JSC::StackVisitor::Frame::computeLineAndColumn const):
+ * jit/AssemblyHelpers.cpp:
+ (JSC::AssemblyHelpers::emitDumbVirtualCall):
+ (JSC::AssemblyHelpers::emitConvertValueToBoolean):
+ (JSC::AssemblyHelpers::branchIfValue):
+ * jit/AssemblyHelpers.h:
+ (JSC::AssemblyHelpers::vm):
+ * jit/JIT.cpp:
+ (JSC::JIT::JIT):
+ (JSC::JIT::emitEnterOptimizationCheck):
+ (JSC::JIT::privateCompileMainPass):
+ (JSC::JIT::privateCompileExceptionHandlers):
+ * jit/JIT.h:
+ * jit/JITCall.cpp:
+ (JSC::JIT::compileCallEvalSlowCase):
+ * jit/JITCall32_64.cpp:
+ (JSC::JIT::compileCallEvalSlowCase):
+ * jit/JITExceptions.cpp:
+ (JSC::genericUnwind):
+ * jit/JITExceptions.h:
+ * jit/JITInlineCacheGenerator.cpp:
+ (JSC::JITGetByIdGenerator::JITGetByIdGenerator):
+ * jit/JITOpcodes.cpp:
+ (JSC::JIT::emit_op_is_undefined):
+ (JSC::JIT::emit_op_jfalse):
+ (JSC::JIT::emit_op_jeq_null):
+ (JSC::JIT::emit_op_jneq_null):
+ (JSC::JIT::emit_op_jtrue):
+ (JSC::JIT::emit_op_throw):
+ (JSC::JIT::emit_op_catch):
+ (JSC::JIT::emit_op_eq_null):
+ (JSC::JIT::emit_op_neq_null):
+ (JSC::JIT::emitSlow_op_loop_hint):
+ (JSC::JIT::emit_op_log_shadow_chicken_prologue):
+ (JSC::JIT::emit_op_log_shadow_chicken_tail):
+ * jit/JITOpcodes32_64.cpp:
+ (JSC::JIT::emit_op_jfalse):
+ (JSC::JIT::emit_op_jtrue):
+ (JSC::JIT::emit_op_throw):
+ (JSC::JIT::emit_op_catch):
+ (JSC::JIT::emit_op_log_shadow_chicken_prologue):
+ (JSC::JIT::emit_op_log_shadow_chicken_tail):
+ * jit/JITOperations.cpp:
+ (JSC::operationNewFunctionCommon):
+ (JSC::tryGetByValOptimize):
+ * jit/JITPropertyAccess.cpp:
+ (JSC::JIT::emitWriteBarrier):
+ * jit/JITThunks.cpp:
+ (JSC::JITThunks::ctiNativeCall):
+ (JSC::JITThunks::ctiNativeConstruct):
+ (JSC::JITThunks::ctiNativeTailCall):
+ (JSC::JITThunks::ctiNativeTailCallWithoutSavedTags):
+ (JSC::JITThunks::ctiInternalFunctionCall):
+ (JSC::JITThunks::ctiInternalFunctionConstruct):
+ (JSC::JITThunks::ctiStub):
+ (JSC::JITThunks::hostFunctionStub):
+ * jit/JITThunks.h:
+ * jit/JITWorklist.cpp:
+ (JSC::JITWorklist::Plan::vm):
+ (JSC::JITWorklist::completeAllForVM):
+ (JSC::JITWorklist::poll):
+ (JSC::JITWorklist::compileLater):
+ (JSC::JITWorklist::compileNow):
+ * jit/Repatch.cpp:
+ (JSC::readPutICCallTarget):
+ (JSC::ftlThunkAwareRepatchCall):
+ (JSC::linkSlowFor):
+ (JSC::linkFor):
+ (JSC::linkDirectFor):
+ (JSC::revertCall):
+ (JSC::unlinkFor):
+ (JSC::linkVirtualFor):
+ (JSC::linkPolymorphicCall):
+ * jit/SpecializedThunkJIT.h:
+ (JSC::SpecializedThunkJIT::SpecializedThunkJIT):
+ * jit/ThunkGenerator.h:
+ * jit/ThunkGenerators.cpp:
+ (JSC::throwExceptionFromCallSlowPathGenerator):
+ (JSC::slowPathFor):
+ (JSC::linkCallThunkGenerator):
+ (JSC::linkPolymorphicCallThunkGenerator):
+ (JSC::virtualThunkFor):
+ (JSC::nativeForGenerator):
+ (JSC::nativeCallGenerator):
+ (JSC::nativeTailCallGenerator):
+ (JSC::nativeTailCallWithoutSavedTagsGenerator):
+ (JSC::nativeConstructGenerator):
+ (JSC::internalFunctionCallGenerator):
+ (JSC::internalFunctionConstructGenerator):
+ (JSC::arityFixupGenerator):
+ (JSC::unreachableGenerator):
+ (JSC::stringGetByValGenerator):
+ (JSC::charToString):
+ (JSC::charCodeAtThunkGenerator):
+ (JSC::charAtThunkGenerator):
+ (JSC::fromCharCodeThunkGenerator):
+ (JSC::clz32ThunkGenerator):
+ (JSC::sqrtThunkGenerator):
+ (JSC::floorThunkGenerator):
+ (JSC::ceilThunkGenerator):
+ (JSC::truncThunkGenerator):
+ (JSC::roundThunkGenerator):
+ (JSC::expThunkGenerator):
+ (JSC::logThunkGenerator):
+ (JSC::absThunkGenerator):
+ (JSC::imulThunkGenerator):
+ (JSC::randomThunkGenerator):
+ (JSC::boundThisNoArgsFunctionCallGenerator):
+ * jit/ThunkGenerators.h:
+ * jsc.cpp:
+ (GlobalObject::finishCreation):
+ (GlobalObject::addFunction):
+ (GlobalObject::moduleLoaderImportModule):
+ (GlobalObject::moduleLoaderResolve):
+ (GlobalObject::moduleLoaderCreateImportMetaProperties):
+ (functionDescribe):
+ (functionDescribeArray):
+ (JSCMemoryFootprint::addProperty):
+ (functionRun):
+ (functionRunString):
+ (functionReadFile):
+ (functionCallerSourceOrigin):
+ (functionReadline):
+ (functionDollarCreateRealm):
+ (functionDollarEvalScript):
+ (functionDollarAgentGetReport):
+ (functionWaitForReport):
+ (functionJSCOptions):
+ (functionCheckModuleSyntax):
+ (functionGenerateHeapSnapshotForGCDebugging):
+ (functionWebAssemblyMemoryMode):
+ (dumpException):
+ (checkUncaughtException):
+ * llint/LLIntSlowPaths.cpp:
+ (JSC::LLInt::LLINT_SLOW_PATH_DECL):
+ (JSC::LLInt::handleHostCall):
+ * parser/ASTBuilder.h:
+ (JSC::ASTBuilder::ASTBuilder):
+ (JSC::ASTBuilder::createResolve):
+ (JSC::ASTBuilder::createGetterOrSetterProperty):
+ (JSC::ASTBuilder::createProperty):
+ (JSC::ASTBuilder::createFuncDeclStatement):
+ (JSC::ASTBuilder::makeFunctionCallNode):
+ * parser/Lexer.cpp:
+ (JSC::Lexer<T>::Lexer):
+ (JSC::Lexer<LChar>::parseIdentifier):
+ (JSC::Lexer<UChar>::parseIdentifier):
+ * parser/Lexer.h:
+ (JSC::Lexer<T>::lexExpectIdentifier):
+ * parser/ModuleAnalyzer.cpp:
+ (JSC::ModuleAnalyzer::ModuleAnalyzer):
+ * parser/ModuleAnalyzer.h:
+ (JSC::ModuleAnalyzer::vm):
+ * parser/Parser.cpp:
+ (JSC::Parser<LexerType>::Parser):
+ (JSC::Parser<LexerType>::parseInner):
+ (JSC::Parser<LexerType>::isArrowFunctionParameters):
+ (JSC::Parser<LexerType>::parseSourceElements):
+ (JSC::Parser<LexerType>::parseModuleSourceElements):
+ (JSC::Parser<LexerType>::parseGeneratorFunctionSourceElements):
+ (JSC::Parser<LexerType>::parseAsyncFunctionSourceElements):
+ (JSC::Parser<LexerType>::parseAsyncGeneratorFunctionSourceElements):
+ (JSC::Parser<LexerType>::parseSingleFunction):
+ (JSC::Parser<LexerType>::parseStatementListItem):
+ (JSC::Parser<LexerType>::parseObjectRestAssignmentElement):
+ (JSC::Parser<LexerType>::parseAssignmentElement):
+ (JSC::Parser<LexerType>::parseDestructuringPattern):
+ (JSC::Parser<LexerType>::parseForStatement):
+ (JSC::Parser<LexerType>::parseBreakStatement):
+ (JSC::Parser<LexerType>::parseContinueStatement):
+ (JSC::Parser<LexerType>::parseStatement):
+ (JSC::Parser<LexerType>::maybeParseAsyncFunctionDeclarationStatement):
+ (JSC::Parser<LexerType>::createGeneratorParameters):
+ (JSC::Parser<LexerType>::parseFunctionInfo):
+ (JSC::Parser<LexerType>::parseFunctionDeclaration):
+ (JSC::Parser<LexerType>::parseAsyncFunctionDeclaration):
+ (JSC::Parser<LexerType>::parseClassDeclaration):
+ (JSC::Parser<LexerType>::parseClass):
+ (JSC::Parser<LexerType>::parseImportClauseItem):
+ (JSC::Parser<LexerType>::parseImportDeclaration):
+ (JSC::Parser<LexerType>::parseExportSpecifier):
+ (JSC::Parser<LexerType>::parseExportDeclaration):
+ (JSC::Parser<LexerType>::parseAssignmentExpression):
+ (JSC::Parser<LexerType>::parseProperty):
+ (JSC::Parser<LexerType>::parseGetterSetter):
+ (JSC::Parser<LexerType>::parseObjectLiteral):
+ (JSC::Parser<LexerType>::parseStrictObjectLiteral):
+ (JSC::Parser<LexerType>::parseClassExpression):
+ (JSC::Parser<LexerType>::parseFunctionExpression):
+ (JSC::Parser<LexerType>::parseAsyncFunctionExpression):
+ (JSC::Parser<LexerType>::parsePrimaryExpression):
+ (JSC::Parser<LexerType>::parseMemberExpression):
+ (JSC::Parser<LexerType>::parseArrowFunctionExpression):
+ (JSC::Parser<LexerType>::parseUnaryExpression):
+ * parser/Parser.h:
+ (JSC::isArguments):
+ (JSC::isEval):
+ (JSC::isEvalOrArgumentsIdentifier):
+ (JSC::Scope::Scope):
+ (JSC::Scope::declareParameter):
+ (JSC::Scope::setInnerArrowFunctionUsesEvalAndUseArgumentsIfNeeded):
+ (JSC::Scope::collectFreeVariables):
+ (JSC::Parser::canRecurse):
+ (JSC::parse):
+ (JSC::parseFunctionForFunctionConstructor):
+ * parser/ParserArena.h:
+ (JSC::IdentifierArena::makeIdentifier):
+ (JSC::IdentifierArena::makeEmptyIdentifier):
+ (JSC::IdentifierArena::makeIdentifierLCharFromUChar):
+ (JSC::IdentifierArena::makeNumericIdentifier):
+ * parser/SyntaxChecker.h:
+ (JSC::SyntaxChecker::SyntaxChecker):
+ (JSC::SyntaxChecker::createProperty):
+ (JSC::SyntaxChecker::createGetterOrSetterProperty):
+ * profiler/ProfilerBytecode.cpp:
+ (JSC::Profiler::Bytecode::toJS const):
+ * profiler/ProfilerBytecodeSequence.cpp:
+ (JSC::Profiler::BytecodeSequence::addSequenceProperties const):
+ * profiler/ProfilerBytecodes.cpp:
+ (JSC::Profiler::Bytecodes::toJS const):
+ * profiler/ProfilerCompilation.cpp:
+ (JSC::Profiler::Compilation::toJS const):
+ * profiler/ProfilerCompiledBytecode.cpp:
+ (JSC::Profiler::CompiledBytecode::toJS const):
+ * profiler/ProfilerEvent.cpp:
+ (JSC::Profiler::Event::toJS const):
+ * profiler/ProfilerOSRExit.cpp:
+ (JSC::Profiler::OSRExit::toJS const):
+ * profiler/ProfilerOSRExitSite.cpp:
+ (JSC::Profiler::OSRExitSite::toJS const):
+ * profiler/ProfilerUID.cpp:
+ (JSC::Profiler::UID::toJS const):
+ * runtime/AbstractModuleRecord.cpp:
+ (JSC::AbstractModuleRecord::finishCreation):
+ (JSC::AbstractModuleRecord::hostResolveImportedModule):
+ (JSC::AbstractModuleRecord::resolveExportImpl):
+ (JSC::getExportedNames):
+ (JSC::AbstractModuleRecord::getModuleNamespace):
+ * runtime/ArrayBufferNeuteringWatchpointSet.cpp:
+ (JSC::ArrayBufferNeuteringWatchpointSet::fireAll):
+ * runtime/ArrayIteratorPrototype.cpp:
+ (JSC::ArrayIteratorPrototype::finishCreation):
+ * runtime/ArrayPrototype.cpp:
+ (JSC::fastJoin):
+ (JSC::arrayProtoFuncToLocaleString):
+ (JSC::slowJoin):
+ (JSC::arrayProtoFuncJoin):
+ (JSC::arrayProtoFuncPush):
+ * runtime/AsyncFunctionPrototype.cpp:
+ (JSC::AsyncFunctionPrototype::finishCreation):
+ * runtime/AsyncGeneratorFunctionPrototype.cpp:
+ (JSC::AsyncGeneratorFunctionPrototype::finishCreation):
+ * runtime/AsyncGeneratorPrototype.cpp:
+ (JSC::AsyncGeneratorPrototype::finishCreation):
+ * runtime/AtomicsObject.cpp:
+ (JSC::AtomicsObject::finishCreation):
+ (JSC::atomicsFuncWait):
+ (JSC::operationAtomicsAdd):
+ (JSC::operationAtomicsAnd):
+ (JSC::operationAtomicsCompareExchange):
+ (JSC::operationAtomicsExchange):
+ (JSC::operationAtomicsIsLockFree):
+ (JSC::operationAtomicsLoad):
+ (JSC::operationAtomicsOr):
+ (JSC::operationAtomicsStore):
+ (JSC::operationAtomicsSub):
+ (JSC::operationAtomicsXor):
+ * runtime/BigIntPrototype.cpp:
+ (JSC::BigIntPrototype::finishCreation):
+ (JSC::bigIntProtoFuncToString):
+ * runtime/CachedTypes.cpp:
+ (JSC::CachedUniquedStringImplBase::decode const):
+ (JSC::CachedIdentifier::decode const):
+ (JSC::CachedJSValue::decode const):
+ * runtime/CodeCache.cpp:
+ (JSC::CodeCacheMap::pruneSlowCase):
+ (JSC::CodeCache::getUnlinkedGlobalFunctionExecutable):
+ * runtime/CodeCache.h:
+ (JSC::generateUnlinkedCodeBlockImpl):
+ * runtime/CommonIdentifiers.cpp:
+ (JSC::CommonIdentifiers::CommonIdentifiers):
+ * runtime/CommonIdentifiers.h:
+ * runtime/CommonSlowPaths.cpp:
+ (JSC::SLOW_PATH_DECL):
+ * runtime/Completion.cpp:
+ (JSC::checkSyntaxInternal):
+ (JSC::checkModuleSyntax):
+ (JSC::loadAndEvaluateModule):
+ (JSC::loadModule):
+ * runtime/DateConstructor.cpp:
+ (JSC::callDate):
+ * runtime/DatePrototype.cpp:
+ (JSC::formatLocaleDate):
+ (JSC::formateDateInstance):
+ (JSC::DatePrototype::finishCreation):
+ (JSC::dateProtoFuncToISOString):
+ * runtime/Error.cpp:
+ (JSC::addErrorInfo):
+ * runtime/ErrorInstance.cpp:
+ (JSC::appendSourceToError):
+ (JSC::ErrorInstance::finishCreation):
+ (JSC::ErrorInstance::materializeErrorInfoIfNeeded):
+ * runtime/ErrorPrototype.cpp:
+ (JSC::ErrorPrototype::finishCreation):
+ (JSC::errorProtoFuncToString):
+ * runtime/ExceptionHelpers.cpp:
+ (JSC::TerminatedExecutionError::defaultValue):
+ * runtime/FunctionPrototype.cpp:
+ (JSC::functionProtoFuncToString):
+ * runtime/FunctionRareData.cpp:
+ (JSC::FunctionRareData::clear):
+ * runtime/GeneratorFunctionPrototype.cpp:
+ (JSC::GeneratorFunctionPrototype::finishCreation):
+ * runtime/GeneratorPrototype.cpp:
+ (JSC::GeneratorPrototype::finishCreation):
+ * runtime/GenericArgumentsInlines.h:
+ (JSC::GenericArguments<Type>::getOwnPropertyNames):
+ * runtime/GetterSetter.h:
+ * runtime/Identifier.cpp:
+ (JSC::Identifier::add):
+ (JSC::Identifier::add8):
+ (JSC::Identifier::from):
+ (JSC::Identifier::checkCurrentAtomStringTable):
+ * runtime/Identifier.h:
+ (JSC::Identifier::fromString):
+ (JSC::Identifier::createLCharFromUChar):
+ (JSC::Identifier::Identifier):
+ (JSC::Identifier::add):
+ * runtime/IdentifierInlines.h:
+ (JSC::Identifier::Identifier):
+ (JSC::Identifier::add):
+ (JSC::Identifier::fromUid):
+ (JSC::Identifier::fromString):
+ (JSC::identifierToJSValue):
+ (JSC::identifierToSafePublicJSValue):
+ * runtime/InternalFunction.cpp:
+ (JSC::InternalFunction::finishCreation):
+ * runtime/IntlCollator.cpp:
+ (JSC::IntlCollator::resolvedOptions):
+ * runtime/IntlCollatorPrototype.cpp:
+ (JSC::IntlCollatorPrototype::finishCreation):
+ * runtime/IntlDateTimeFormat.cpp:
+ (JSC::IntlDTFInternal::toDateTimeOptionsAnyDate):
+ (JSC::IntlDateTimeFormat::resolvedOptions):
+ (JSC::IntlDateTimeFormat::format):
+ (JSC::IntlDateTimeFormat::formatToParts):
+ * runtime/IntlDateTimeFormatPrototype.cpp:
+ (JSC::IntlDateTimeFormatPrototype::finishCreation):
+ * runtime/IntlNumberFormat.cpp:
+ (JSC::IntlNumberFormat::initializeNumberFormat):
+ (JSC::IntlNumberFormat::formatNumber):
+ (JSC::IntlNumberFormat::resolvedOptions):
+ (JSC::IntlNumberFormat::formatToParts):
+ * runtime/IntlNumberFormatPrototype.cpp:
+ (JSC::IntlNumberFormatPrototype::finishCreation):
+ * runtime/IntlObject.cpp:
+ (JSC::lookupSupportedLocales):
+ (JSC::supportedLocales):
+ (JSC::intlObjectFuncGetCanonicalLocales):
+ * runtime/IntlPluralRules.cpp:
+ (JSC::IntlPluralRules::initializePluralRules):
+ (JSC::IntlPluralRules::resolvedOptions):
+ (JSC::IntlPluralRules::select):
+ * runtime/IntlPluralRulesPrototype.cpp:
+ (JSC::IntlPluralRulesPrototype::finishCreation):
+ * runtime/JSArray.h:
+ (JSC::asArray):
+ (JSC::isJSArray):
+ * runtime/JSArrayBufferPrototype.cpp:
+ (JSC::JSArrayBufferPrototype::finishCreation):
+ * runtime/JSArrayBufferView.cpp:
+ (JSC::JSArrayBufferView::slowDownAndWasteMemory):
+ * runtime/JSCJSValue.cpp:
+ (JSC::JSValue::putToPrimitiveByIndex):
+ (JSC::JSValue::dumpForBacktrace const):
+ (JSC::JSValue::toStringSlowCase const):
+ * runtime/JSCJSValueInlines.h:
+ (JSC::JSValue::toPropertyKey const):
+ (JSC::JSValue::get const):
+ * runtime/JSCast.h:
+ (JSC::jsCast):
+ * runtime/JSCell.cpp:
+ (JSC::JSCell::dump const):
+ (JSC::JSCell::dumpToStream):
+ (JSC::JSCell::putByIndex):
+ * runtime/JSCellInlines.h:
+ (JSC::JSCell::structure const):
+ (JSC::ExecState::vm const):
+ (JSC::tryAllocateCellHelper):
+ * runtime/JSDataViewPrototype.cpp:
+ (JSC::JSDataViewPrototype::finishCreation):
+ * runtime/JSFixedArray.cpp:
+ (JSC::JSFixedArray::dumpToStream):
+ * runtime/JSFunction.cpp:
+ (JSC::JSFunction::finishCreation):
+ (JSC::RetrieveCallerFunctionFunctor::operator() const):
+ (JSC::JSFunction::reifyName):
+ (JSC::JSFunction::reifyLazyBoundNameIfNeeded):
+ (JSC::JSFunction::assertTypeInfoFlagInvariants):
+ * runtime/JSGenericTypedArrayViewInlines.h:
+ (JSC::JSGenericTypedArrayView<Adaptor>::deletePropertyByIndex):
+ (JSC::JSGenericTypedArrayView<Adaptor>::getOwnPropertyNames):
+ * runtime/JSGlobalObject.cpp:
+ (JSC::JSGlobalObject::init):
+ (JSC::JSGlobalObject::exposeDollarVM):
+ * runtime/JSGlobalObjectFunctions.cpp:
+ (JSC::encode):
+ (JSC::decode):
+ (JSC::globalFuncEscape):
+ (JSC::globalFuncUnescape):
+ (JSC::globalFuncBuiltinDescribe):
+ * runtime/JSLexicalEnvironment.cpp:
+ (JSC::JSLexicalEnvironment::getOwnNonIndexPropertyNames):
+ * runtime/JSModuleEnvironment.cpp:
+ (JSC::JSModuleEnvironment::getOwnPropertySlot):
+ (JSC::JSModuleEnvironment::put):
+ (JSC::JSModuleEnvironment::deleteProperty):
+ * runtime/JSModuleLoader.cpp:
+ (JSC::JSModuleLoader::finishCreation):
+ (JSC::JSModuleLoader::requestImportModule):
+ (JSC::moduleLoaderParseModule):
+ (JSC::moduleLoaderRequestedModules):
+ * runtime/JSModuleNamespaceObject.cpp:
+ (JSC::JSModuleNamespaceObject::finishCreation):
+ (JSC::JSModuleNamespaceObject::getOwnPropertySlotByIndex):
+ * runtime/JSModuleRecord.cpp:
+ (JSC::JSModuleRecord::instantiateDeclarations):
+ * runtime/JSONObject.cpp:
+ (JSC::JSONObject::finishCreation):
+ (JSC::PropertyNameForFunctionCall::value const):
+ (JSC::Stringifier::Stringifier):
+ (JSC::Stringifier::stringify):
+ (JSC::Stringifier::Holder::appendNextProperty):
+ (JSC::Walker::walk):
+ * runtime/JSObject.cpp:
+ (JSC::getClassPropertyNames):
+ (JSC::JSObject::getOwnPropertySlotByIndex):
+ (JSC::JSObject::putByIndex):
+ (JSC::JSObject::deletePropertyByIndex):
+ (JSC::JSObject::toString const):
+ (JSC::JSObject::reifyAllStaticProperties):
+ (JSC::JSObject::putDirectIndexSlowOrBeyondVectorLength):
+ * runtime/JSObject.h:
+ (JSC::JSObject::putByIndexInline):
+ (JSC::JSObject::butterflyPreCapacity):
+ (JSC::JSObject::butterflyTotalSize):
+ (JSC::makeIdentifier):
+ * runtime/JSPromisePrototype.cpp:
+ (JSC::JSPromisePrototype::finishCreation):
+ * runtime/JSPropertyNameEnumerator.cpp:
+ (JSC::JSPropertyNameEnumerator::finishCreation):
+ * runtime/JSPropertyNameEnumerator.h:
+ (JSC::propertyNameEnumerator):
+ * runtime/JSRunLoopTimer.cpp:
+ (JSC::JSRunLoopTimer::JSRunLoopTimer):
+ * runtime/JSRunLoopTimer.h:
+ * runtime/JSString.cpp:
+ (JSC::JSString::dumpToStream):
+ (JSC::JSRopeString::resolveRopeWithFunction const):
+ (JSC::jsStringWithCacheSlowCase):
+ * runtime/JSString.h:
+ (JSC::jsEmptyString):
+ (JSC::jsSingleCharacterString):
+ (JSC::jsNontrivialString):
+ (JSC::JSString::toIdentifier const):
+ (JSC::JSString::toAtomString const):
+ (JSC::JSString::toExistingAtomString const):
+ (JSC::JSString::value const):
+ (JSC::JSString::tryGetValue const):
+ (JSC::JSString::getIndex):
+ (JSC::jsString):
+ (JSC::jsSubstring):
+ (JSC::jsOwnedString):
+ (JSC::jsStringWithCache):
+ (JSC::JSRopeString::unsafeView const):
+ (JSC::JSRopeString::viewWithUnderlyingString const):
+ (JSC::JSString::unsafeView const):
+ * runtime/JSStringInlines.h:
+ (JSC::jsMakeNontrivialString):
+ (JSC::repeatCharacter):
+ * runtime/JSStringJoiner.cpp:
+ (JSC::JSStringJoiner::join):
+ * runtime/JSSymbolTableObject.cpp:
+ (JSC::JSSymbolTableObject::getOwnNonIndexPropertyNames):
+ * runtime/JSTemplateObjectDescriptor.cpp:
+ (JSC::JSTemplateObjectDescriptor::createTemplateObject):
+ * runtime/JSTypedArrayViewPrototype.cpp:
+ (JSC::typedArrayViewProtoGetterFuncToStringTag):
+ * runtime/LazyClassStructure.cpp:
+ (JSC::LazyClassStructure::Initializer::setConstructor):
+ * runtime/LazyProperty.h:
+ (JSC::LazyProperty::Initializer::Initializer):
+ * runtime/LiteralParser.cpp:
+ (JSC::LiteralParser<CharType>::tryJSONPParse):
+ (JSC::LiteralParser<CharType>::makeIdentifier):
+ (JSC::LiteralParser<CharType>::parse):
+ * runtime/Lookup.h:
+ (JSC::reifyStaticProperties):
+ * runtime/MapIteratorPrototype.cpp:
+ (JSC::MapIteratorPrototype::finishCreation):
+ * runtime/MapPrototype.cpp:
+ (JSC::MapPrototype::finishCreation):
+ * runtime/MathObject.cpp:
+ (JSC::MathObject::finishCreation):
+ * runtime/NumberConstructor.cpp:
+ (JSC::NumberConstructor::finishCreation):
+ * runtime/NumberPrototype.cpp:
+ (JSC::numberProtoFuncToExponential):
+ (JSC::numberProtoFuncToFixed):
+ (JSC::numberProtoFuncToPrecision):
+ (JSC::int32ToStringInternal):
+ (JSC::numberToStringInternal):
+ (JSC::int52ToString):
+ * runtime/ObjectConstructor.cpp:
+ (JSC::objectConstructorGetOwnPropertyDescriptors):
+ (JSC::objectConstructorAssign):
+ (JSC::objectConstructorValues):
+ (JSC::defineProperties):
+ (JSC::setIntegrityLevel):
+ (JSC::testIntegrityLevel):
+ (JSC::ownPropertyKeys):
+ * runtime/ObjectPrototype.cpp:
+ (JSC::objectProtoFuncToString):
+ * runtime/Operations.h:
+ (JSC::jsString):
+ (JSC::jsStringFromRegisterArray):
+ (JSC::jsStringFromArguments):
+ * runtime/ProgramExecutable.cpp:
+ (JSC::ProgramExecutable::initializeGlobalProperties):
+ * runtime/PromiseDeferredTimer.cpp:
+ (JSC::PromiseDeferredTimer::PromiseDeferredTimer):
+ (JSC::PromiseDeferredTimer::hasPendingPromise):
+ (JSC::PromiseDeferredTimer::hasDependancyInPendingPromise):
+ (JSC::PromiseDeferredTimer::cancelPendingPromise):
+ * runtime/PropertyNameArray.h:
+ (JSC::PropertyNameArray::PropertyNameArray):
+ (JSC::PropertyNameArray::vm):
+ * runtime/PropertySlot.h:
+ (JSC::PropertySlot::getValue const):
+ * runtime/ProxyObject.cpp:
+ (JSC::performProxyGet):
+ (JSC::ProxyObject::performInternalMethodGetOwnProperty):
+ (JSC::ProxyObject::performHasProperty):
+ (JSC::ProxyObject::getOwnPropertySlotByIndex):
+ (JSC::ProxyObject::performPut):
+ (JSC::ProxyObject::putByIndexCommon):
+ (JSC::ProxyObject::performDelete):
+ (JSC::ProxyObject::deletePropertyByIndex):
+ (JSC::ProxyObject::performDefineOwnProperty):
+ (JSC::ProxyObject::performGetOwnPropertyNames):
+ * runtime/RegExpGlobalData.cpp:
+ (JSC::RegExpGlobalData::getBackref):
+ (JSC::RegExpGlobalData::getLastParen):
+ * runtime/RegExpMatchesArray.cpp:
+ (JSC::createEmptyRegExpMatchesArray):
+ * runtime/RegExpMatchesArray.h:
+ (JSC::createRegExpMatchesArray):
+ * runtime/RegExpPrototype.cpp:
+ (JSC::regExpProtoGetterFlags):
+ (JSC::regExpProtoGetterSourceInternal):
+ (JSC::regExpProtoGetterSource):
+ * runtime/RegExpStringIteratorPrototype.cpp:
+ (JSC::RegExpStringIteratorPrototype::finishCreation):
+ * runtime/SamplingProfiler.cpp:
+ (JSC::SamplingProfiler::processUnverifiedStackTraces):
+ * runtime/ScriptExecutable.cpp:
+ (JSC::ScriptExecutable::installCode):
+ (JSC::ScriptExecutable::newCodeBlockFor):
+ (JSC::ScriptExecutable::newReplacementCodeBlockFor):
+ (JSC::setupJIT):
+ * runtime/SetIteratorPrototype.cpp:
+ (JSC::SetIteratorPrototype::finishCreation):
+ * runtime/SetPrototype.cpp:
+ (JSC::SetPrototype::finishCreation):
+ * runtime/StackFrame.cpp:
+ (JSC::StackFrame::computeLineAndColumn const):
+ * runtime/StringConstructor.cpp:
+ (JSC::stringFromCharCode):
+ (JSC::stringFromCodePoint):
+ (JSC::stringConstructor):
+ (JSC::callStringConstructor):
+ * runtime/StringIteratorPrototype.cpp:
+ (JSC::StringIteratorPrototype::finishCreation):
+ * runtime/StringObject.cpp:
+ (JSC::StringObject::getOwnPropertySlotByIndex):
+ (JSC::StringObject::getOwnPropertyNames):
+ * runtime/StringObject.h:
+ (JSC::StringObject::create):
+ (JSC::jsStringWithReuse):
+ (JSC::jsSubstring):
+ * runtime/StringPrototype.cpp:
+ (JSC::StringPrototype::finishCreation):
+ (JSC::StringPrototype::create):
+ (JSC::jsSpliceSubstrings):
+ (JSC::jsSpliceSubstringsWithSeparators):
+ (JSC::replaceUsingRegExpSearch):
+ (JSC::operationStringProtoFuncReplaceRegExpEmptyStr):
+ (JSC::operationStringProtoFuncReplaceRegExpString):
+ (JSC::replaceUsingStringSearch):
+ (JSC::operationStringProtoFuncReplaceGeneric):
+ (JSC::stringProtoFuncCharAt):
+ (JSC::stringProtoFuncSplitFast):
+ (JSC::stringProtoFuncSubstr):
+ (JSC::stringProtoFuncToLowerCase):
+ (JSC::stringProtoFuncToUpperCase):
+ (JSC::toLocaleCase):
+ (JSC::trimString):
+ (JSC::normalize):
+ * runtime/StringPrototypeInlines.h:
+ (JSC::stringSlice):
+ * runtime/StringRecursionChecker.cpp:
+ (JSC::StringRecursionChecker::emptyString):
+ * runtime/Structure.cpp:
+ (JSC::Structure::didTransitionFromThisStructure const):
+ * runtime/StructureInlines.h:
+ (JSC::Structure::didReplaceProperty):
+ (JSC::Structure::shouldConvertToPolyProto):
+ * runtime/SymbolConstructor.cpp:
+ (JSC::symbolConstructorKeyFor):
+ * runtime/SymbolPrototype.cpp:
+ (JSC::SymbolPrototype::finishCreation):
+ (JSC::symbolProtoGetterDescription):
+ (JSC::symbolProtoFuncToString):
+ * runtime/SymbolTable.cpp:
+ (JSC::SymbolTable::setRareDataCodeBlock):
+ * runtime/TestRunnerUtils.cpp:
+ (JSC::getExecutableForFunction):
+ * runtime/VM.cpp:
+ (JSC::VM::VM):
+ (JSC::VM::getHostFunction):
+ (JSC::VM::getCTIInternalFunctionTrampolineFor):
+ (JSC::VM::shrinkFootprintWhenIdle):
+ (JSC::logSanitizeStack):
+ (JSC::sanitizeStackForVM):
+ (JSC::VM::emptyPropertyNameEnumeratorSlow):
+ * runtime/VM.h:
+ (JSC::VM::getCTIStub):
+ (JSC::WeakSet::heap const):
+ * runtime/VMTraps.cpp:
+ * runtime/WeakMapPrototype.cpp:
+ (JSC::WeakMapPrototype::finishCreation):
+ * runtime/WeakObjectRefPrototype.cpp:
+ (JSC::WeakObjectRefPrototype::finishCreation):
+ * runtime/WeakSetPrototype.cpp:
+ (JSC::WeakSetPrototype::finishCreation):
+ * tools/HeapVerifier.cpp:
+ (JSC::HeapVerifier::printVerificationHeader):
+ (JSC::HeapVerifier::verifyCellList):
+ (JSC::HeapVerifier::validateJSCell):
+ (JSC::HeapVerifier::reportCell):
+ * tools/JSDollarVM.cpp:
+ (JSC::JSDollarVMCallFrame::finishCreation):
+ (JSC::JSDollarVMCallFrame::addProperty):
+ (JSC::CustomGetter::getOwnPropertySlot):
+ (JSC::CustomGetter::customGetter):
+ (JSC::CustomGetter::customGetterAcessor):
+ (JSC::DOMJITGetter::DOMJITAttribute::slowCall):
+ (JSC::DOMJITGetter::finishCreation):
+ (JSC::DOMJITGetterComplex::DOMJITAttribute::slowCall):
+ (JSC::DOMJITGetterComplex::finishCreation):
+ (JSC::DOMJITFunctionObject::functionWithoutTypeCheck):
+ (JSC::DOMJITFunctionObject::finishCreation):
+ (JSC::DOMJITCheckSubClassObject::functionWithoutTypeCheck):
+ (JSC::DOMJITCheckSubClassObject::finishCreation):
+ (JSC::DOMJITGetterBaseJSObject::DOMJITAttribute::slowCall):
+ (JSC::DOMJITGetterBaseJSObject::finishCreation):
+ (JSC::customSetAccessor):
+ (JSC::customSetValue):
+ (JSC::JSTestCustomGetterSetter::finishCreation):
+ (JSC::WasmStreamingParser::finishCreation):
+ (JSC::getExecutableForFunction):
+ (JSC::functionCodeBlockFor):
+ (JSC::functionIndexingMode):
+ (JSC::functionValue):
+ (JSC::functionCreateBuiltin):
+ (JSC::functionGetPrivateProperty):
+ (JSC::JSDollarVM::finishCreation):
+ (JSC::JSDollarVM::addFunction):
+ (JSC::JSDollarVM::addConstructibleFunction):
+ * tools/VMInspector.cpp:
+ (JSC::VMInspector::dumpRegisters):
+ (JSC::VMInspector::dumpCellMemoryToStream):
+ * wasm/WasmInstance.cpp:
+ (JSC::Wasm::Instance::setGlobal):
+ (JSC::Wasm::Instance::setFunctionWrapper):
+ (JSC::Wasm::setWasmTableElement):
+ (JSC::Wasm::doWasmRefFunc):
+ * wasm/WasmTable.cpp:
+ (JSC::Wasm::Table::set):
+ (JSC::Wasm::FuncRefTable::setFunction):
+ * wasm/js/JSWebAssembly.cpp:
+ (JSC::resolve):
+ * wasm/js/JSWebAssemblyInstance.cpp:
+ (JSC::JSWebAssemblyInstance::create):
+ * wasm/js/WasmToJS.cpp:
+ (JSC::Wasm::handleBadI64Use):
+ (JSC::Wasm::wasmToJS):
+ (JSC::Wasm::wasmToJSException):
+ * wasm/js/WebAssemblyFunction.cpp:
+ (JSC::WebAssemblyFunction::jsCallEntrypointSlow):
+ * wasm/js/WebAssemblyMemoryConstructor.cpp:
+ (JSC::constructJSWebAssemblyMemory):
+ * wasm/js/WebAssemblyModuleConstructor.cpp:
+ (JSC::webAssemblyModuleImports):
+ (JSC::webAssemblyModuleExports):
+ * wasm/js/WebAssemblyModuleRecord.cpp:
+ (JSC::WebAssemblyModuleRecord::finishCreation):
+ (JSC::WebAssemblyModuleRecord::link):
+ * wasm/js/WebAssemblyTableConstructor.cpp:
+ (JSC::constructJSWebAssemblyTable):
+
2019-08-27 Devin Rousso <drousso@apple.com>
Web Inspector: don't attach properties to `injectedScript` for the CommandLineAPI
diff --git a/Source/JavaScriptCore/KeywordLookupGenerator.py b/Source/JavaScriptCore/KeywordLookupGenerator.py
index f640d5a..889a2ee 100644
--- a/Source/JavaScriptCore/KeywordLookupGenerator.py
+++ b/Source/JavaScriptCore/KeywordLookupGenerator.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2011 Apple Inc. All rights reserved.
+# Copyright (C) 2011-2019 Apple Inc. All rights reserved.
# Copyright (C) 2012 Sony Network Entertainment. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -144,7 +144,7 @@
print(str + "if (!isIdentPartIncludingEscape(code + %d, m_codeEnd)) {" % (len(self.fullPrefix)))
print(str + " internalShift<%d>();" % len(self.fullPrefix))
print(str + " if (shouldCreateIdentifier)")
- print(str + (" data->ident = &m_vm->propertyNames->%sKeyword;" % self.fullPrefix))
+ print(str + (" data->ident = &m_vm.propertyNames->%sKeyword;" % self.fullPrefix))
print(str + " return " + self.value + ";")
print(str + "}")
rootIndex = len(self.fullPrefix)
diff --git a/Source/JavaScriptCore/Scripts/wkbuiltins/builtins_generate_wrapper_header.py b/Source/JavaScriptCore/Scripts/wkbuiltins/builtins_generate_wrapper_header.py
index 04abe56..9b62a66 100644
--- a/Source/JavaScriptCore/Scripts/wkbuiltins/builtins_generate_wrapper_header.py
+++ b/Source/JavaScriptCore/Scripts/wkbuiltins/builtins_generate_wrapper_header.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright (c) 2016 Apple Inc. All rights reserved.
+# Copyright (c) 2016-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
@@ -92,7 +92,7 @@
lines = [" explicit JSBuiltinFunctions(JSC::VM& vm)",
" : m_vm(vm)"]
for object in self.model().objects:
- member_init = " , %s(&m_vm)" % self.member_name(object)
+ member_init = " , %s(m_vm)" % self.member_name(object)
lines.append(BuiltinsGenerator.wrap_with_guard(object.annotations.get('conditional'), member_init))
lines.append(" {")
for object in self.model().objects:
diff --git a/Source/JavaScriptCore/Scripts/wkbuiltins/builtins_templates.py b/Source/JavaScriptCore/Scripts/wkbuiltins/builtins_templates.py
index 3665cb5..05e0e81 100644
--- a/Source/JavaScriptCore/Scripts/wkbuiltins/builtins_templates.py
+++ b/Source/JavaScriptCore/Scripts/wkbuiltins/builtins_templates.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright (c) 2014-2016 Apple Inc. All rights reserved.
+# Copyright (c) 2014-2019 Apple Inc. All rights reserved.
# Copyright (C) 2015 Canon Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -129,8 +129,8 @@
SeparateHeaderWrapperBoilerplate = (
"""class ${objectName}BuiltinsWrapper : private JSC::WeakHandleOwner {
public:
- explicit ${objectName}BuiltinsWrapper(JSC::VM* vm)
- : m_vm(*vm)
+ explicit ${objectName}BuiltinsWrapper(JSC::VM& vm)
+ : m_vm(vm)
${macroPrefix}_FOREACH_${objectMacro}_BUILTIN_FUNCTION_NAME(INITIALIZE_BUILTIN_NAMES)
#define INITIALIZE_BUILTIN_SOURCE_MEMBERS(name, functionName, overriddenName, length) , m_##name##Source(JSC::makeSource(StringImpl::createFromLiteral(s_##name, length), { }))
${macroPrefix}_FOREACH_${objectMacro}_BUILTIN_CODE(INITIALIZE_BUILTIN_SOURCE_MEMBERS)
@@ -167,7 +167,7 @@
if (!m_##name##Executable) {\\
JSC::Identifier executableName = functionName##PublicName();\\
if (overriddenName)\\
- executableName = JSC::Identifier::fromString(&m_vm, overriddenName);\\
+ executableName = JSC::Identifier::fromString(m_vm, overriddenName);\\
m_##name##Executable = JSC::Weak<JSC::UnlinkedFunctionExecutable>(JSC::createBuiltinExecutable(m_vm, m_##name##Source, executableName, s_##name##ConstructAbility), this, &m_##name##Executable);\\
}\\
return m_##name##Executable.get();\\
diff --git a/Source/JavaScriptCore/bindings/ScriptFunctionCall.cpp b/Source/JavaScriptCore/bindings/ScriptFunctionCall.cpp
index 99e5f5c..269efe5 100644
--- a/Source/JavaScriptCore/bindings/ScriptFunctionCall.cpp
+++ b/Source/JavaScriptCore/bindings/ScriptFunctionCall.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-2019 Apple Inc. All rights reserved.
* Copyright (C) 2009 Google Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -42,14 +42,16 @@
void ScriptCallArgumentHandler::appendArgument(const String& argument)
{
- JSLockHolder lock(m_exec);
- m_arguments.append(jsString(m_exec, argument));
+ VM& vm = m_exec->vm();
+ JSLockHolder lock(vm);
+ m_arguments.append(jsString(vm, argument));
}
void ScriptCallArgumentHandler::appendArgument(const char* argument)
{
- JSLockHolder lock(m_exec);
- m_arguments.append(jsString(m_exec, String(argument)));
+ VM& vm = m_exec->vm();
+ JSLockHolder lock(vm);
+ m_arguments.append(jsString(vm, String(argument)));
}
void ScriptCallArgumentHandler::appendArgument(JSValue argument)
@@ -108,7 +110,7 @@
JSLockHolder lock(vm);
auto scope = DECLARE_THROW_SCOPE(vm);
- JSValue function = thisObject->get(m_exec, Identifier::fromString(m_exec, m_name));
+ JSValue function = thisObject->get(m_exec, Identifier::fromString(vm, m_name));
if (UNLIKELY(scope.exception())) {
hadException = true;
return { };
diff --git a/Source/JavaScriptCore/bindings/ScriptValue.cpp b/Source/JavaScriptCore/bindings/ScriptValue.cpp
index 7078aa7..4a7f4f3 100644
--- a/Source/JavaScriptCore/bindings/ScriptValue.cpp
+++ b/Source/JavaScriptCore/bindings/ScriptValue.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006, 2007, 2008, 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2006-2019 Apple Inc. All rights reserved.
* Copyright (c) 2011 Google Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -79,7 +79,7 @@
VM& vm = scriptState.vm();
auto inspectorObject = JSON::Object::create();
auto& object = *value.getObject();
- PropertyNameArray propertyNames(&vm, PropertyNameMode::Strings, PrivateSymbolMode::Exclude);
+ PropertyNameArray propertyNames(vm, PropertyNameMode::Strings, PrivateSymbolMode::Exclude);
object.methodTable(vm)->getOwnPropertyNames(&object, &scriptState, propertyNames, EnumerationMode());
for (auto& name : propertyNames) {
auto inspectorValue = jsToInspectorValue(scriptState, object.get(&scriptState, name), maxDepth);
diff --git a/Source/JavaScriptCore/builtins/BuiltinExecutables.cpp b/Source/JavaScriptCore/builtins/BuiltinExecutables.cpp
index fef4122..cb87c06 100644
--- a/Source/JavaScriptCore/builtins/BuiltinExecutables.cpp
+++ b/Source/JavaScriptCore/builtins/BuiltinExecutables.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-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
@@ -213,7 +213,7 @@
ParserError error;
JSParserBuiltinMode builtinMode = isBuiltinDefaultClassConstructor ? JSParserBuiltinMode::NotBuiltin : JSParserBuiltinMode::Builtin;
std::unique_ptr<ProgramNode> program = parse<ProgramNode>(
- &vm, source, Identifier(), builtinMode,
+ vm, source, Identifier(), builtinMode,
JSParserStrictMode::NotStrict, JSParserScriptMode::Classic, SourceParseMode::ProgramMode, SuperBinding::NotNeeded, error,
&positionBeforeLastNewlineFromParser, constructorKind);
@@ -254,7 +254,7 @@
}
}
- UnlinkedFunctionExecutable* functionExecutable = UnlinkedFunctionExecutable::create(&vm, source, &metadata, kind, constructAbility, JSParserScriptMode::Classic, WTF::nullopt, DerivedContextType::None, isBuiltinDefaultClassConstructor);
+ UnlinkedFunctionExecutable* functionExecutable = UnlinkedFunctionExecutable::create(vm, source, &metadata, kind, constructAbility, JSParserScriptMode::Classic, WTF::nullopt, DerivedContextType::None, isBuiltinDefaultClassConstructor);
return functionExecutable;
}
@@ -278,7 +278,7 @@
if (!m_unlinkedExecutables[index]) {\
Identifier executableName = m_vm.propertyNames->builtinNames().functionName##PublicName();\
if (overrideName)\
- executableName = Identifier::fromString(&m_vm, overrideName);\
+ executableName = Identifier::fromString(m_vm, overrideName);\
m_unlinkedExecutables[index] = createBuiltinExecutable(name##Source(), executableName, s_##name##ConstructAbility);\
}\
return m_unlinkedExecutables[index];\
diff --git a/Source/JavaScriptCore/builtins/BuiltinNames.cpp b/Source/JavaScriptCore/builtins/BuiltinNames.cpp
index 6d505ac..d8ffee9 100644
--- a/Source/JavaScriptCore/builtins/BuiltinNames.cpp
+++ b/Source/JavaScriptCore/builtins/BuiltinNames.cpp
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2017 Yusuke Suzuki <utatane.tea@gmail.com>.
+ * 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
@@ -72,7 +73,7 @@
// We treat the dollarVM name as a special case below for $vm (because CommonIdentifiers does not
// yet support the $ character).
-BuiltinNames::BuiltinNames(VM* vm, CommonIdentifiers* commonIdentifiers)
+BuiltinNames::BuiltinNames(VM& vm, CommonIdentifiers* commonIdentifiers)
: m_emptyIdentifier(commonIdentifiers->emptyIdentifier)
JSC_FOREACH_BUILTIN_FUNCTION_NAME(INITIALIZE_BUILTIN_NAMES_IN_JSC)
JSC_COMMON_PRIVATE_IDENTIFIERS_EACH_PROPERTY_NAME(INITIALIZE_BUILTIN_NAMES_IN_JSC)
diff --git a/Source/JavaScriptCore/builtins/BuiltinNames.h b/Source/JavaScriptCore/builtins/BuiltinNames.h
index 32b800b..327f001 100644
--- a/Source/JavaScriptCore/builtins/BuiltinNames.h
+++ b/Source/JavaScriptCore/builtins/BuiltinNames.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014, 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-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
@@ -198,7 +198,7 @@
WTF_MAKE_NONCOPYABLE(BuiltinNames); WTF_MAKE_FAST_ALLOCATED;
public:
- BuiltinNames(VM*, CommonIdentifiers*);
+ BuiltinNames(VM&, CommonIdentifiers*);
SymbolImpl* lookUpPrivateName(const Identifier&) const;
Identifier getPublicName(VM&, SymbolImpl*) const;
@@ -237,10 +237,10 @@
inline Identifier BuiltinNames::getPublicName(VM& vm, SymbolImpl* symbol) const
{
if (symbol->isPrivate())
- return Identifier::fromString(&vm, symbol);
+ return Identifier::fromString(vm, symbol);
// We have special handling for well-known symbols.
ASSERT(symbol->startsWith("Symbol."));
- return Identifier::fromString(&vm, makeString(String(symbol->substring(strlen("Symbol."))), "Symbol"));
+ return Identifier::fromString(vm, makeString(String(symbol->substring(strlen("Symbol."))), "Symbol"));
}
inline void BuiltinNames::checkPublicToPrivateMapConsistency(UniquedStringImpl* publicName, UniquedStringImpl* privateName)
diff --git a/Source/JavaScriptCore/bytecode/BytecodeDumper.cpp b/Source/JavaScriptCore/bytecode/BytecodeDumper.cpp
index 371472c..ceca1cb 100644
--- a/Source/JavaScriptCore/bytecode/BytecodeDumper.cpp
+++ b/Source/JavaScriptCore/bytecode/BytecodeDumper.cpp
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2017 Yusuke Suzuki <utatane.tea@gmail.com>
- * Copyright (C) 2017-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2017-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
@@ -44,7 +44,7 @@
namespace JSC {
template<class Block>
-VM* BytecodeDumper<Block>::vm() const
+VM& BytecodeDumper<Block>::vm() const
{
return block()->vm();
}
diff --git a/Source/JavaScriptCore/bytecode/BytecodeDumper.h b/Source/JavaScriptCore/bytecode/BytecodeDumper.h
index 29adadb..e662ae2 100644
--- a/Source/JavaScriptCore/bytecode/BytecodeDumper.h
+++ b/Source/JavaScriptCore/bytecode/BytecodeDumper.h
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2017 Yusuke Suzuki <utatane.tea@gmail.com>
- * Copyright (C) 2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2018-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
@@ -70,7 +70,7 @@
Block* block() const { return m_block; }
- ALWAYS_INLINE VM* vm() const;
+ ALWAYS_INLINE VM& vm() const;
CString registerName(int r) const;
CString constantName(int index) const;
diff --git a/Source/JavaScriptCore/bytecode/BytecodeGeneratorification.cpp b/Source/JavaScriptCore/bytecode/BytecodeGeneratorification.cpp
index 81ab758..9544bcb 100644
--- a/Source/JavaScriptCore/bytecode/BytecodeGeneratorification.cpp
+++ b/Source/JavaScriptCore/bytecode/BytecodeGeneratorification.cpp
@@ -68,7 +68,7 @@
, m_codeBlock(codeBlock)
, m_instructions(instructions)
, m_graph(m_codeBlock, m_instructions)
- , m_generatorFrameSymbolTable(*codeBlock->vm(), generatorFrameSymbolTable)
+ , m_generatorFrameSymbolTable(codeBlock->vm(), generatorFrameSymbolTable)
, m_generatorFrameSymbolTableIndex(generatorFrameSymbolTableIndex)
{
for (BytecodeBasicBlock* block : m_graph) {
@@ -158,7 +158,7 @@
if (Optional<Storage> storage = m_storages[index])
return *storage;
- Identifier identifier = Identifier::from(&vm, index);
+ Identifier identifier = Identifier::from(vm, index);
unsigned identifierIndex = m_codeBlock->numberOfIdentifiers();
m_codeBlock->addIdentifier(identifier);
ScopeOffset scopeOffset = m_generatorFrameSymbolTable->takeNextScopeOffset(NoLockingNecessary);
@@ -211,7 +211,7 @@
{
// We calculate the liveness at each merge point. This gives us the information which registers should be saved and resumed conservatively.
- VM& vm = *m_bytecodeGenerator.vm();
+ VM& vm = m_bytecodeGenerator.vm();
{
GeneratorLivenessAnalysis pass(*this);
pass.run(m_codeBlock, m_instructions);
diff --git a/Source/JavaScriptCore/bytecode/BytecodeIntrinsicRegistry.cpp b/Source/JavaScriptCore/bytecode/BytecodeIntrinsicRegistry.cpp
index 18a1970..87ce5a5 100644
--- a/Source/JavaScriptCore/bytecode/BytecodeIntrinsicRegistry.cpp
+++ b/Source/JavaScriptCore/bytecode/BytecodeIntrinsicRegistry.cpp
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2015 Yusuke Suzuki <utatane.tea@gmail.com>.
- * Copyright (C) 2016-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-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
@@ -104,12 +104,12 @@
JSValue BytecodeIntrinsicRegistry::sentinelMapBucketValue(BytecodeGenerator& generator)
{
- return generator.vm()->sentinelMapBucket();
+ return generator.vm().sentinelMapBucket();
}
JSValue BytecodeIntrinsicRegistry::sentinelSetBucketValue(BytecodeGenerator& generator)
{
- return generator.vm()->sentinelSetBucket();
+ return generator.vm().sentinelSetBucket();
}
} // namespace JSC
diff --git a/Source/JavaScriptCore/bytecode/CallVariant.h b/Source/JavaScriptCore/bytecode/CallVariant.h
index 56748c8..bf3423b 100644
--- a/Source/JavaScriptCore/bytecode/CallVariant.h
+++ b/Source/JavaScriptCore/bytecode/CallVariant.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-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
@@ -87,21 +87,21 @@
InternalFunction* internalFunction() const
{
- return jsDynamicCast<InternalFunction*>(*m_callee->vm(), m_callee);
+ return jsDynamicCast<InternalFunction*>(m_callee->vm(), m_callee);
}
JSFunction* function() const
{
- return jsDynamicCast<JSFunction*>(*m_callee->vm(), m_callee);
+ return jsDynamicCast<JSFunction*>(m_callee->vm(), m_callee);
}
- bool isClosureCall() const { return !!jsDynamicCast<ExecutableBase*>(*m_callee->vm(), m_callee); }
+ bool isClosureCall() const { return !!jsDynamicCast<ExecutableBase*>(m_callee->vm(), m_callee); }
ExecutableBase* executable() const
{
if (JSFunction* function = this->function())
return function->executable();
- return jsDynamicCast<ExecutableBase*>(*m_callee->vm(), m_callee);
+ return jsDynamicCast<ExecutableBase*>(m_callee->vm(), m_callee);
}
JSCell* nonExecutableCallee() const
@@ -120,14 +120,14 @@
FunctionExecutable* functionExecutable() const
{
if (ExecutableBase* executable = this->executable())
- return jsDynamicCast<FunctionExecutable*>(*m_callee->vm(), executable);
+ return jsDynamicCast<FunctionExecutable*>(m_callee->vm(), executable);
return nullptr;
}
NativeExecutable* nativeExecutable() const
{
if (ExecutableBase* executable = this->executable())
- return jsDynamicCast<NativeExecutable*>(*m_callee->vm(), executable);
+ return jsDynamicCast<NativeExecutable*>(m_callee->vm(), executable);
return nullptr;
}
diff --git a/Source/JavaScriptCore/bytecode/CodeBlock.cpp b/Source/JavaScriptCore/bytecode/CodeBlock.cpp
index a6afa1f..ae6a2f9 100644
--- a/Source/JavaScriptCore/bytecode/CodeBlock.cpp
+++ b/Source/JavaScriptCore/bytecode/CodeBlock.cpp
@@ -229,7 +229,7 @@
FunctionExecutable* functionExecutable = reinterpret_cast<FunctionExecutable*>(executable);
StringView source = functionExecutable->source().provider()->getRange(
functionExecutable->parametersStartOffset(),
- functionExecutable->typeProfilingEndOffset(*vm()) + 1); // Type profiling end offset is the character before the '}'.
+ functionExecutable->typeProfilingEndOffset(vm()) + 1); // Type profiling end offset is the character before the '}'.
out.print("function ", inferredName(), source);
return;
@@ -282,8 +282,8 @@
} // anonymous namespace
-CodeBlock::CodeBlock(VM* vm, Structure* structure, CopyParsedBlockTag, CodeBlock& other)
- : JSCell(*vm, structure)
+CodeBlock::CodeBlock(VM& vm, Structure* structure, CopyParsedBlockTag, CodeBlock& other)
+ : JSCell(vm, structure)
, m_globalObject(other.m_globalObject)
, m_shouldAlwaysBeInlined(true)
#if ENABLE(JIT)
@@ -301,8 +301,8 @@
, m_bytecodeCost(other.m_bytecodeCost)
, m_scopeRegister(other.m_scopeRegister)
, m_hash(other.m_hash)
- , m_unlinkedCode(*other.vm(), this, other.m_unlinkedCode.get())
- , m_ownerExecutable(*other.vm(), this, other.m_ownerExecutable.get())
+ , m_unlinkedCode(other.vm(), this, other.m_unlinkedCode.get())
+ , m_ownerExecutable(other.vm(), this, other.m_ownerExecutable.get())
, m_vm(other.m_vm)
, m_instructionsRawPointer(other.m_instructionsRawPointer)
, m_constantRegisters(other.m_constantRegisters)
@@ -321,7 +321,7 @@
ASSERT(source().provider());
setNumParameters(other.numParameters());
- vm->heap.codeBlockSet().add(this);
+ vm.heap.codeBlockSet().add(this);
}
void CodeBlock::finishCreation(VM& vm, CopyParsedBlockTag, CodeBlock& other)
@@ -341,9 +341,9 @@
}
}
-CodeBlock::CodeBlock(VM* vm, Structure* structure, ScriptExecutable* ownerExecutable, UnlinkedCodeBlock* unlinkedCodeBlock, JSScope* scope)
- : JSCell(*vm, structure)
- , m_globalObject(*vm, this, scope->globalObject(*vm))
+CodeBlock::CodeBlock(VM& vm, Structure* structure, ScriptExecutable* ownerExecutable, UnlinkedCodeBlock* unlinkedCodeBlock, JSScope* scope)
+ : JSCell(vm, structure)
+ , m_globalObject(vm, this, scope->globalObject(vm))
, m_shouldAlwaysBeInlined(true)
#if ENABLE(JIT)
, m_capabilityLevelState(DFG::CapabilityLevelNotSet)
@@ -357,9 +357,9 @@
, m_steppingMode(SteppingModeDisabled)
, m_numBreakpoints(0)
, m_scopeRegister(unlinkedCodeBlock->scopeRegister())
- , m_unlinkedCode(*vm, this, unlinkedCodeBlock)
- , m_ownerExecutable(*vm, this, ownerExecutable)
- , m_vm(vm)
+ , m_unlinkedCode(vm, this, unlinkedCodeBlock)
+ , m_ownerExecutable(vm, this, ownerExecutable)
+ , m_vm(&vm)
, m_instructionsRawPointer(unlinkedCodeBlock->instructions().rawPointer())
, m_osrExitCounter(0)
, m_optimizationDelayCounter(0)
@@ -373,7 +373,7 @@
ASSERT(source().provider());
setNumParameters(unlinkedCodeBlock->numParameters());
- vm->heap.codeBlockSet().add(this);
+ vm.heap.codeBlockSet().add(this);
}
// The main purpose of this function is to generate linked bytecode from unlinked bytecode. The process
@@ -880,7 +880,7 @@
RETURN_IF_EXCEPTION(scope, void());
for (auto setEntry : set) {
- JSString* jsString = jsOwnedString(&vm, setEntry.get());
+ JSString* jsString = jsOwnedString(vm, setEntry.get());
jsSet->add(exec, jsString);
RETURN_IF_EXCEPTION(scope, void());
}
@@ -940,7 +940,7 @@
{
m_numParameters = newValue;
- m_argumentValueProfiles = RefCountedArray<ValueProfile>(vm()->canUseJIT() ? newValue : 0);
+ m_argumentValueProfiles = RefCountedArray<ValueProfile>(vm().canUseJIT() ? newValue : 0);
}
CodeBlock* CodeBlock::specialOSREntryBlockOrNull()
@@ -1365,7 +1365,7 @@
{
if (auto* jitData = m_jitData.get()) {
for (CallLinkInfo* callLinkInfo : jitData->m_callLinkInfos)
- callLinkInfo->visitWeak(*vm());
+ callLinkInfo->visitWeak(vm());
for (StructureStubInfo* stubInfo : jitData->m_stubInfos)
stubInfo->visitWeakReferences(this);
@@ -1936,9 +1936,9 @@
}
if (jitData) {
while (jitData->m_incomingCalls.begin() != jitData->m_incomingCalls.end())
- jitData->m_incomingCalls.begin()->unlink(*vm());
+ jitData->m_incomingCalls.begin()->unlink(vm());
while (jitData->m_incomingPolymorphicCalls.begin() != jitData->m_incomingPolymorphicCalls.end())
- jitData->m_incomingPolymorphicCalls.begin()->unlink(*vm());
+ jitData->m_incomingPolymorphicCalls.begin()->unlink(vm());
}
#endif // ENABLE(JIT)
}
@@ -1957,7 +1957,7 @@
#if ENABLE(JIT)
CodeBlock* CodeBlock::replacement()
{
- const ClassInfo* classInfo = this->classInfo(*vm());
+ const ClassInfo* classInfo = this->classInfo(vm());
if (classInfo == FunctionCodeBlock::info())
return jsCast<FunctionExecutable*>(ownerExecutable())->codeBlockFor(isConstructor() ? CodeForConstruct : CodeForCall);
@@ -1977,7 +1977,7 @@
DFG::CapabilityLevel CodeBlock::computeCapabilityLevel()
{
- const ClassInfo* classInfo = this->classInfo(*vm());
+ const ClassInfo* classInfo = this->classInfo(vm());
if (classInfo == FunctionCodeBlock::info()) {
if (isConstructor())
@@ -2231,7 +2231,7 @@
// Recursive calls won't be inlined.
RecursionCheckFunctor functor(callerFrame, this, Options::maximumInliningDepth());
- vm()->topCallFrame->iterate(functor);
+ vm().topCallFrame->iterate(functor);
if (functor.didRecurse()) {
if (Options::verboseCallLink())
@@ -2948,7 +2948,7 @@
for (auto& constantRegister : m_constantRegisters) {
if (constantRegister.get().isEmpty())
continue;
- if (SymbolTable* symbolTable = jsDynamicCast<SymbolTable*>(*vm(), constantRegister.get())) {
+ if (SymbolTable* symbolTable = jsDynamicCast<SymbolTable*>(vm(), constantRegister.get())) {
ConcurrentJSLocker locker(symbolTable->m_lock);
auto end = symbolTable->end(locker);
for (auto ptr = symbolTable->begin(locker); ptr != end; ++ptr) {
@@ -3174,11 +3174,11 @@
// m: op_profile_control_flow
if (basicBlockEndOffset < basicBlockStartOffset) {
RELEASE_ASSERT(i + 1 < offsetsLength); // We should never encounter dummy blocks at the end of a CodeBlock.
- metadata.m_basicBlockLocation = vm()->controlFlowProfiler()->dummyBasicBlock();
+ metadata.m_basicBlockLocation = vm().controlFlowProfiler()->dummyBasicBlock();
continue;
}
- BasicBlockLocation* basicBlockLocation = vm()->controlFlowProfiler()->getBasicBlockLocation(ownerExecutable()->sourceID(), basicBlockStartOffset, basicBlockEndOffset);
+ BasicBlockLocation* basicBlockLocation = vm().controlFlowProfiler()->getBasicBlockLocation(ownerExecutable()->sourceID(), basicBlockStartOffset, basicBlockEndOffset);
// Find all functions that are enclosed within the range: [basicBlockStartOffset, basicBlockEndOffset]
// and insert these functions' start/end offsets as gaps in the current BasicBlockLocation.
diff --git a/Source/JavaScriptCore/bytecode/CodeBlock.h b/Source/JavaScriptCore/bytecode/CodeBlock.h
index 8fdbf15..6f9e1ef 100644
--- a/Source/JavaScriptCore/bytecode/CodeBlock.h
+++ b/Source/JavaScriptCore/bytecode/CodeBlock.h
@@ -120,8 +120,8 @@
DECLARE_INFO;
protected:
- CodeBlock(VM*, Structure*, CopyParsedBlockTag, CodeBlock& other);
- CodeBlock(VM*, Structure*, ScriptExecutable* ownerExecutable, UnlinkedCodeBlock*, JSScope*);
+ CodeBlock(VM&, Structure*, CopyParsedBlockTag, CodeBlock& other);
+ CodeBlock(VM&, Structure*, ScriptExecutable* ownerExecutable, UnlinkedCodeBlock*, JSScope*);
void finishCreation(VM&, CopyParsedBlockTag, CodeBlock& other);
bool finishCreation(VM&, ScriptExecutable* ownerExecutable, UnlinkedCodeBlock*, JSScope*);
@@ -436,7 +436,7 @@
ExecutableToCodeBlockEdge* ownerEdge() const { return m_ownerEdge.get(); }
- VM* vm() const { return m_vm; }
+ VM& vm() const { return *m_vm; }
VirtualRegister thisRegister() const { return m_unlinkedCode->thisRegister(); }
@@ -472,13 +472,13 @@
unsigned numberOfArgumentValueProfiles()
{
ASSERT(m_numParameters >= 0);
- ASSERT(m_argumentValueProfiles.size() == static_cast<unsigned>(m_numParameters) || !vm()->canUseJIT());
+ ASSERT(m_argumentValueProfiles.size() == static_cast<unsigned>(m_numParameters) || !vm().canUseJIT());
return m_argumentValueProfiles.size();
}
ValueProfile& valueProfileForArgument(unsigned argumentIndex)
{
- ASSERT(vm()->canUseJIT()); // This is only called from the various JIT compilers or places that first check numberOfArgumentValueProfiles before calling this.
+ ASSERT(vm().canUseJIT()); // This is only called from the various JIT compilers or places that first check numberOfArgumentValueProfiles before calling this.
ValueProfile& result = m_argumentValueProfiles[argumentIndex];
return result;
}
@@ -972,6 +972,8 @@
WriteBarrier<UnlinkedCodeBlock> m_unlinkedCode;
WriteBarrier<ScriptExecutable> m_ownerExecutable;
WriteBarrier<ExecutableToCodeBlockEdge> m_ownerEdge;
+ // m_vm must be a pointer (instead of a reference) because the JSCLLIntOffsetsExtractor
+ // cannot handle it being a reference.
VM* m_vm;
const void* m_instructionsRawPointer { nullptr };
@@ -1061,7 +1063,7 @@
#define CODEBLOCK_LOG_EVENT(codeBlock, summary, details) \
do { \
if (codeBlock) \
- (codeBlock->vm()->logEvent(codeBlock, summary, [&] () { return toCString details; })); \
+ (codeBlock->vm().logEvent(codeBlock, summary, [&] () { return toCString details; })); \
} while (0)
diff --git a/Source/JavaScriptCore/bytecode/DeferredSourceDump.cpp b/Source/JavaScriptCore/bytecode/DeferredSourceDump.cpp
index 613241c..aba8494 100644
--- a/Source/JavaScriptCore/bytecode/DeferredSourceDump.cpp
+++ b/Source/JavaScriptCore/bytecode/DeferredSourceDump.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-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
@@ -33,14 +33,14 @@
namespace JSC {
DeferredSourceDump::DeferredSourceDump(CodeBlock* codeBlock)
- : m_codeBlock(*codeBlock->vm(), codeBlock)
+ : m_codeBlock(codeBlock->vm(), codeBlock)
, m_rootJITType(JITType::None)
{
}
DeferredSourceDump::DeferredSourceDump(CodeBlock* codeBlock, CodeBlock* rootCodeBlock, JITType rootJITType, unsigned callerBytecodeIndex)
- : m_codeBlock(*codeBlock->vm(), codeBlock)
- , m_rootCodeBlock(*codeBlock->vm(), rootCodeBlock)
+ : m_codeBlock(codeBlock->vm(), codeBlock)
+ , m_rootCodeBlock(codeBlock->vm(), rootCodeBlock)
, m_rootJITType(rootJITType)
, m_callerBytecodeIndex(callerBytecodeIndex)
{
diff --git a/Source/JavaScriptCore/bytecode/EvalCodeBlock.h b/Source/JavaScriptCore/bytecode/EvalCodeBlock.h
index b9f28d0..2df8686 100644
--- a/Source/JavaScriptCore/bytecode/EvalCodeBlock.h
+++ b/Source/JavaScriptCore/bytecode/EvalCodeBlock.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2008-2019 Apple Inc. All rights reserved.
* Copyright (C) 2008 Cameron Zwarich <cwzwarich@uwaterloo.ca>
*
* Redistribution and use in source and binary forms, with or without
@@ -44,19 +44,19 @@
return &vm.codeBlockSpace.space;
}
- static EvalCodeBlock* create(VM* vm, CopyParsedBlockTag, EvalCodeBlock& other)
+ static EvalCodeBlock* create(VM& vm, CopyParsedBlockTag, EvalCodeBlock& other)
{
- EvalCodeBlock* instance = new (NotNull, allocateCell<EvalCodeBlock>(vm->heap))
- EvalCodeBlock(vm, vm->evalCodeBlockStructure.get(), CopyParsedBlock, other);
- instance->finishCreation(*vm, CopyParsedBlock, other);
+ EvalCodeBlock* instance = new (NotNull, allocateCell<EvalCodeBlock>(vm.heap))
+ EvalCodeBlock(vm, vm.evalCodeBlockStructure.get(), CopyParsedBlock, other);
+ instance->finishCreation(vm, CopyParsedBlock, other);
return instance;
}
- static EvalCodeBlock* create(VM* vm, EvalExecutable* ownerExecutable, UnlinkedEvalCodeBlock* unlinkedCodeBlock, JSScope* scope)
+ static EvalCodeBlock* create(VM& vm, EvalExecutable* ownerExecutable, UnlinkedEvalCodeBlock* unlinkedCodeBlock, JSScope* scope)
{
- EvalCodeBlock* instance = new (NotNull, allocateCell<EvalCodeBlock>(vm->heap))
- EvalCodeBlock(vm, vm->evalCodeBlockStructure.get(), ownerExecutable, unlinkedCodeBlock, scope);
- if (!instance->finishCreation(*vm, ownerExecutable, unlinkedCodeBlock, scope))
+ EvalCodeBlock* instance = new (NotNull, allocateCell<EvalCodeBlock>(vm.heap))
+ EvalCodeBlock(vm, vm.evalCodeBlockStructure.get(), ownerExecutable, unlinkedCodeBlock, scope);
+ if (!instance->finishCreation(vm, ownerExecutable, unlinkedCodeBlock, scope))
return nullptr;
return instance;
}
@@ -69,12 +69,12 @@
UnlinkedEvalCodeBlock* unlinkedEvalCodeBlock() const { return jsCast<UnlinkedEvalCodeBlock*>(unlinkedCodeBlock()); }
private:
- EvalCodeBlock(VM* vm, Structure* structure, CopyParsedBlockTag, EvalCodeBlock& other)
+ EvalCodeBlock(VM& vm, Structure* structure, CopyParsedBlockTag, EvalCodeBlock& other)
: GlobalCodeBlock(vm, structure, CopyParsedBlock, other)
{
}
- EvalCodeBlock(VM* vm, Structure* structure, EvalExecutable* ownerExecutable, UnlinkedEvalCodeBlock* unlinkedCodeBlock, JSScope* scope)
+ EvalCodeBlock(VM& vm, Structure* structure, EvalExecutable* ownerExecutable, UnlinkedEvalCodeBlock* unlinkedCodeBlock, JSScope* scope)
: GlobalCodeBlock(vm, structure, ownerExecutable, unlinkedCodeBlock, scope)
{
}
diff --git a/Source/JavaScriptCore/bytecode/FunctionCodeBlock.h b/Source/JavaScriptCore/bytecode/FunctionCodeBlock.h
index 853fae9..85e6bd4 100644
--- a/Source/JavaScriptCore/bytecode/FunctionCodeBlock.h
+++ b/Source/JavaScriptCore/bytecode/FunctionCodeBlock.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2008-2019 Apple Inc. All rights reserved.
* Copyright (C) 2008 Cameron Zwarich <cwzwarich@uwaterloo.ca>
*
* Redistribution and use in source and binary forms, with or without
@@ -45,19 +45,19 @@
return &vm.codeBlockSpace.space;
}
- static FunctionCodeBlock* create(VM* vm, CopyParsedBlockTag, FunctionCodeBlock& other)
+ static FunctionCodeBlock* create(VM& vm, CopyParsedBlockTag, FunctionCodeBlock& other)
{
- FunctionCodeBlock* instance = new (NotNull, allocateCell<FunctionCodeBlock>(vm->heap))
- FunctionCodeBlock(vm, vm->functionCodeBlockStructure.get(), CopyParsedBlock, other);
- instance->finishCreation(*vm, CopyParsedBlock, other);
+ FunctionCodeBlock* instance = new (NotNull, allocateCell<FunctionCodeBlock>(vm.heap))
+ FunctionCodeBlock(vm, vm.functionCodeBlockStructure.get(), CopyParsedBlock, other);
+ instance->finishCreation(vm, CopyParsedBlock, other);
return instance;
}
- static FunctionCodeBlock* create(VM* vm, FunctionExecutable* ownerExecutable, UnlinkedFunctionCodeBlock* unlinkedCodeBlock, JSScope* scope)
+ static FunctionCodeBlock* create(VM& vm, FunctionExecutable* ownerExecutable, UnlinkedFunctionCodeBlock* unlinkedCodeBlock, JSScope* scope)
{
- FunctionCodeBlock* instance = new (NotNull, allocateCell<FunctionCodeBlock>(vm->heap))
- FunctionCodeBlock(vm, vm->functionCodeBlockStructure.get(), ownerExecutable, unlinkedCodeBlock, scope);
- if (!instance->finishCreation(*vm, ownerExecutable, unlinkedCodeBlock, scope))
+ FunctionCodeBlock* instance = new (NotNull, allocateCell<FunctionCodeBlock>(vm.heap))
+ FunctionCodeBlock(vm, vm.functionCodeBlockStructure.get(), ownerExecutable, unlinkedCodeBlock, scope);
+ if (!instance->finishCreation(vm, ownerExecutable, unlinkedCodeBlock, scope))
return nullptr;
return instance;
}
@@ -68,12 +68,12 @@
}
private:
- FunctionCodeBlock(VM* vm, Structure* structure, CopyParsedBlockTag, FunctionCodeBlock& other)
+ FunctionCodeBlock(VM& vm, Structure* structure, CopyParsedBlockTag, FunctionCodeBlock& other)
: CodeBlock(vm, structure, CopyParsedBlock, other)
{
}
- FunctionCodeBlock(VM* vm, Structure* structure, FunctionExecutable* ownerExecutable, UnlinkedFunctionCodeBlock* unlinkedCodeBlock, JSScope* scope)
+ FunctionCodeBlock(VM& vm, Structure* structure, FunctionExecutable* ownerExecutable, UnlinkedFunctionCodeBlock* unlinkedCodeBlock, JSScope* scope)
: CodeBlock(vm, structure, ownerExecutable, unlinkedCodeBlock, scope)
{
}
diff --git a/Source/JavaScriptCore/bytecode/GetByIdStatus.cpp b/Source/JavaScriptCore/bytecode/GetByIdStatus.cpp
index df4d77c..beeb0ed 100644
--- a/Source/JavaScriptCore/bytecode/GetByIdStatus.cpp
+++ b/Source/JavaScriptCore/bytecode/GetByIdStatus.cpp
@@ -54,7 +54,7 @@
GetByIdStatus GetByIdStatus::computeFromLLInt(CodeBlock* profiledBlock, unsigned bytecodeIndex, UniquedStringImpl* uid)
{
- VM& vm = *profiledBlock->vm();
+ VM& vm = profiledBlock->vm();
auto instruction = profiledBlock->instructions().at(bytecodeIndex);
diff --git a/Source/JavaScriptCore/bytecode/GlobalCodeBlock.h b/Source/JavaScriptCore/bytecode/GlobalCodeBlock.h
index e11b790..9d5fab5 100644
--- a/Source/JavaScriptCore/bytecode/GlobalCodeBlock.h
+++ b/Source/JavaScriptCore/bytecode/GlobalCodeBlock.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2008-2019 Apple Inc. All rights reserved.
* Copyright (C) 2008 Cameron Zwarich <cwzwarich@uwaterloo.ca>
*
* Redistribution and use in source and binary forms, with or without
@@ -40,12 +40,12 @@
typedef CodeBlock Base;
protected:
- GlobalCodeBlock(VM* vm, Structure* structure, CopyParsedBlockTag, GlobalCodeBlock& other)
+ GlobalCodeBlock(VM& vm, Structure* structure, CopyParsedBlockTag, GlobalCodeBlock& other)
: CodeBlock(vm, structure, CopyParsedBlock, other)
{
}
- GlobalCodeBlock(VM* vm, Structure* structure, ScriptExecutable* ownerExecutable, UnlinkedCodeBlock* unlinkedCodeBlock, JSScope* scope)
+ GlobalCodeBlock(VM& vm, Structure* structure, ScriptExecutable* ownerExecutable, UnlinkedCodeBlock* unlinkedCodeBlock, JSScope* scope)
: CodeBlock(vm, structure, ownerExecutable, unlinkedCodeBlock, scope)
{
}
diff --git a/Source/JavaScriptCore/bytecode/ModuleProgramCodeBlock.h b/Source/JavaScriptCore/bytecode/ModuleProgramCodeBlock.h
index 23556cd..0e9c4f6 100644
--- a/Source/JavaScriptCore/bytecode/ModuleProgramCodeBlock.h
+++ b/Source/JavaScriptCore/bytecode/ModuleProgramCodeBlock.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2008-2019 Apple Inc. All rights reserved.
* Copyright (C) 2008 Cameron Zwarich <cwzwarich@uwaterloo.ca>
*
* Redistribution and use in source and binary forms, with or without
@@ -45,19 +45,19 @@
return &vm.codeBlockSpace.space;
}
- static ModuleProgramCodeBlock* create(VM* vm, CopyParsedBlockTag, ModuleProgramCodeBlock& other)
+ static ModuleProgramCodeBlock* create(VM& vm, CopyParsedBlockTag, ModuleProgramCodeBlock& other)
{
- ModuleProgramCodeBlock* instance = new (NotNull, allocateCell<ModuleProgramCodeBlock>(vm->heap))
- ModuleProgramCodeBlock(vm, vm->moduleProgramCodeBlockStructure.get(), CopyParsedBlock, other);
- instance->finishCreation(*vm, CopyParsedBlock, other);
+ ModuleProgramCodeBlock* instance = new (NotNull, allocateCell<ModuleProgramCodeBlock>(vm.heap))
+ ModuleProgramCodeBlock(vm, vm.moduleProgramCodeBlockStructure.get(), CopyParsedBlock, other);
+ instance->finishCreation(vm, CopyParsedBlock, other);
return instance;
}
- static ModuleProgramCodeBlock* create(VM* vm, ModuleProgramExecutable* ownerExecutable, UnlinkedModuleProgramCodeBlock* unlinkedCodeBlock, JSScope* scope)
+ static ModuleProgramCodeBlock* create(VM& vm, ModuleProgramExecutable* ownerExecutable, UnlinkedModuleProgramCodeBlock* unlinkedCodeBlock, JSScope* scope)
{
- ModuleProgramCodeBlock* instance = new (NotNull, allocateCell<ModuleProgramCodeBlock>(vm->heap))
- ModuleProgramCodeBlock(vm, vm->moduleProgramCodeBlockStructure.get(), ownerExecutable, unlinkedCodeBlock, scope);
- if (!instance->finishCreation(*vm, ownerExecutable, unlinkedCodeBlock, scope))
+ ModuleProgramCodeBlock* instance = new (NotNull, allocateCell<ModuleProgramCodeBlock>(vm.heap))
+ ModuleProgramCodeBlock(vm, vm.moduleProgramCodeBlockStructure.get(), ownerExecutable, unlinkedCodeBlock, scope);
+ if (!instance->finishCreation(vm, ownerExecutable, unlinkedCodeBlock, scope))
return nullptr;
return instance;
}
@@ -68,12 +68,12 @@
}
private:
- ModuleProgramCodeBlock(VM* vm, Structure* structure, CopyParsedBlockTag, ModuleProgramCodeBlock& other)
+ ModuleProgramCodeBlock(VM& vm, Structure* structure, CopyParsedBlockTag, ModuleProgramCodeBlock& other)
: GlobalCodeBlock(vm, structure, CopyParsedBlock, other)
{
}
- ModuleProgramCodeBlock(VM* vm, Structure* structure, ModuleProgramExecutable* ownerExecutable, UnlinkedModuleProgramCodeBlock* unlinkedCodeBlock, JSScope* scope)
+ ModuleProgramCodeBlock(VM& vm, Structure* structure, ModuleProgramExecutable* ownerExecutable, UnlinkedModuleProgramCodeBlock* unlinkedCodeBlock, JSScope* scope)
: GlobalCodeBlock(vm, structure, ownerExecutable, unlinkedCodeBlock, scope)
{
}
diff --git a/Source/JavaScriptCore/bytecode/ObjectAllocationProfileInlines.h b/Source/JavaScriptCore/bytecode/ObjectAllocationProfileInlines.h
index 1f7e83c..182f624 100644
--- a/Source/JavaScriptCore/bytecode/ObjectAllocationProfileInlines.h
+++ b/Source/JavaScriptCore/bytecode/ObjectAllocationProfileInlines.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2017-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
@@ -146,7 +146,7 @@
return 0;
size_t count = 0;
- PropertyNameArray propertyNameArray(&vm, PropertyNameMode::StringsAndSymbols, PrivateSymbolMode::Include);
+ PropertyNameArray propertyNameArray(vm, PropertyNameMode::StringsAndSymbols, PrivateSymbolMode::Include);
prototype->structure(vm)->getPropertyNamesFromStructure(vm, propertyNameArray, EnumerationMode());
PropertyNameArrayData::PropertyNameVector& propertyNameVector = propertyNameArray.data()->propertyNameVector();
for (size_t i = 0; i < propertyNameVector.size(); ++i) {
diff --git a/Source/JavaScriptCore/bytecode/PolyProtoAccessChain.cpp b/Source/JavaScriptCore/bytecode/PolyProtoAccessChain.cpp
index 65f46b9..ff43b6d 100644
--- a/Source/JavaScriptCore/bytecode/PolyProtoAccessChain.cpp
+++ b/Source/JavaScriptCore/bytecode/PolyProtoAccessChain.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2017-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
@@ -40,7 +40,7 @@
std::unique_ptr<PolyProtoAccessChain> PolyProtoAccessChain::create(JSGlobalObject* globalObject, JSCell* base, JSObject* target, bool& usesPolyProto)
{
JSCell* current = base;
- VM& vm = *base->vm();
+ VM& vm = base->vm();
bool found = false;
diff --git a/Source/JavaScriptCore/bytecode/ProgramCodeBlock.h b/Source/JavaScriptCore/bytecode/ProgramCodeBlock.h
index eb795fd..f76b266 100644
--- a/Source/JavaScriptCore/bytecode/ProgramCodeBlock.h
+++ b/Source/JavaScriptCore/bytecode/ProgramCodeBlock.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2008-2019 Apple Inc. All rights reserved.
* Copyright (C) 2008 Cameron Zwarich <cwzwarich@uwaterloo.ca>
*
* Redistribution and use in source and binary forms, with or without
@@ -45,19 +45,19 @@
return &vm.codeBlockSpace.space;
}
- static ProgramCodeBlock* create(VM* vm, CopyParsedBlockTag, ProgramCodeBlock& other)
+ static ProgramCodeBlock* create(VM& vm, CopyParsedBlockTag, ProgramCodeBlock& other)
{
- ProgramCodeBlock* instance = new (NotNull, allocateCell<ProgramCodeBlock>(vm->heap))
- ProgramCodeBlock(vm, vm->programCodeBlockStructure.get(), CopyParsedBlock, other);
- instance->finishCreation(*vm, CopyParsedBlock, other);
+ ProgramCodeBlock* instance = new (NotNull, allocateCell<ProgramCodeBlock>(vm.heap))
+ ProgramCodeBlock(vm, vm.programCodeBlockStructure.get(), CopyParsedBlock, other);
+ instance->finishCreation(vm, CopyParsedBlock, other);
return instance;
}
- static ProgramCodeBlock* create(VM* vm, ProgramExecutable* ownerExecutable, UnlinkedProgramCodeBlock* unlinkedCodeBlock, JSScope* scope)
+ static ProgramCodeBlock* create(VM& vm, ProgramExecutable* ownerExecutable, UnlinkedProgramCodeBlock* unlinkedCodeBlock, JSScope* scope)
{
- ProgramCodeBlock* instance = new (NotNull, allocateCell<ProgramCodeBlock>(vm->heap))
- ProgramCodeBlock(vm, vm->programCodeBlockStructure.get(), ownerExecutable, unlinkedCodeBlock, scope);
- if (!instance->finishCreation(*vm, ownerExecutable, unlinkedCodeBlock, scope))
+ ProgramCodeBlock* instance = new (NotNull, allocateCell<ProgramCodeBlock>(vm.heap))
+ ProgramCodeBlock(vm, vm.programCodeBlockStructure.get(), ownerExecutable, unlinkedCodeBlock, scope);
+ if (!instance->finishCreation(vm, ownerExecutable, unlinkedCodeBlock, scope))
return nullptr;
return instance;
}
@@ -68,12 +68,12 @@
}
private:
- ProgramCodeBlock(VM* vm, Structure* structure, CopyParsedBlockTag, ProgramCodeBlock& other)
+ ProgramCodeBlock(VM& vm, Structure* structure, CopyParsedBlockTag, ProgramCodeBlock& other)
: GlobalCodeBlock(vm, structure, CopyParsedBlock, other)
{
}
- ProgramCodeBlock(VM* vm, Structure* structure, ProgramExecutable* ownerExecutable, UnlinkedProgramCodeBlock* unlinkedCodeBlock, JSScope* scope)
+ ProgramCodeBlock(VM& vm, Structure* structure, ProgramExecutable* ownerExecutable, UnlinkedProgramCodeBlock* unlinkedCodeBlock, JSScope* scope)
: GlobalCodeBlock(vm, structure, ownerExecutable, unlinkedCodeBlock, scope)
{
}
diff --git a/Source/JavaScriptCore/bytecode/PropertyCondition.cpp b/Source/JavaScriptCore/bytecode/PropertyCondition.cpp
index a3296ad..a22383e 100644
--- a/Source/JavaScriptCore/bytecode/PropertyCondition.cpp
+++ b/Source/JavaScriptCore/bytecode/PropertyCondition.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-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
@@ -320,8 +320,7 @@
set = structure->propertyReplacementWatchpointSet(offset);
break;
case EnsureWatchability:
- set = structure->ensurePropertyReplacementWatchpointSet(
- *structure->vm(), offset);
+ set = structure->ensurePropertyReplacementWatchpointSet(structure->vm(), offset);
break;
}
diff --git a/Source/JavaScriptCore/bytecode/PutByIdStatus.cpp b/Source/JavaScriptCore/bytecode/PutByIdStatus.cpp
index d642bcc..efde373 100644
--- a/Source/JavaScriptCore/bytecode/PutByIdStatus.cpp
+++ b/Source/JavaScriptCore/bytecode/PutByIdStatus.cpp
@@ -49,7 +49,7 @@
PutByIdStatus PutByIdStatus::computeFromLLInt(CodeBlock* profiledBlock, unsigned bytecodeIndex, UniquedStringImpl* uid)
{
- VM& vm = *profiledBlock->vm();
+ VM& vm = profiledBlock->vm();
auto instruction = profiledBlock->instructions().at(bytecodeIndex);
auto bytecode = instruction->as<OpPutById>();
diff --git a/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp b/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp
index 49195d1..eab7a90 100644
--- a/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp
+++ b/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008, 2014-2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2008-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
@@ -64,7 +64,7 @@
cacheType = CacheType::GetByIdSelf;
u.byIdSelf.baseObjectStructure.set(
- *codeBlock->vm(), codeBlock, baseObjectStructure);
+ codeBlock->vm(), codeBlock, baseObjectStructure);
u.byIdSelf.offset = offset;
}
@@ -83,7 +83,7 @@
cacheType = CacheType::PutByIdReplace;
u.byIdSelf.baseObjectStructure.set(
- *codeBlock->vm(), codeBlock, baseObjectStructure);
+ codeBlock->vm(), codeBlock, baseObjectStructure);
u.byIdSelf.offset = offset;
}
@@ -92,7 +92,7 @@
cacheType = CacheType::InByIdSelf;
u.byIdSelf.baseObjectStructure.set(
- *codeBlock->vm(), codeBlock, baseObjectStructure);
+ codeBlock->vm(), codeBlock, baseObjectStructure);
u.byIdSelf.offset = offset;
}
@@ -135,7 +135,7 @@
AccessGenerationResult StructureStubInfo::addAccessCase(
const GCSafeConcurrentJSLocker& locker, CodeBlock* codeBlock, const Identifier& ident, std::unique_ptr<AccessCase> accessCase)
{
- VM& vm = *codeBlock->vm();
+ VM& vm = codeBlock->vm();
ASSERT(vm.heap.isDeferred());
AccessGenerationResult result = ([&] () -> AccessGenerationResult {
if (StructureStubInfoInternal::verbose)
@@ -272,7 +272,7 @@
void StructureStubInfo::visitWeakReferences(CodeBlock* codeBlock)
{
- VM& vm = *codeBlock->vm();
+ VM& vm = codeBlock->vm();
bufferedStructures.genericFilter(
[&] (Structure* structure) -> bool {
diff --git a/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp b/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp
index 2c9a0b3..2d49b55 100644
--- a/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp
+++ b/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp
@@ -54,8 +54,8 @@
const ClassInfo UnlinkedCodeBlock::s_info = { "UnlinkedCodeBlock", nullptr, nullptr, nullptr, CREATE_METHOD_TABLE(UnlinkedCodeBlock) };
-UnlinkedCodeBlock::UnlinkedCodeBlock(VM* vm, Structure* structure, CodeType codeType, const ExecutableInfo& info, OptionSet<CodeGenerationMode> codeGenerationMode)
- : Base(*vm, structure)
+UnlinkedCodeBlock::UnlinkedCodeBlock(VM& vm, Structure* structure, CodeType codeType, const ExecutableInfo& info, OptionSet<CodeGenerationMode> codeGenerationMode)
+ : Base(vm, structure)
, m_usesEval(info.usesEval())
, m_isStrictMode(info.isStrictMode())
, m_isConstructor(info.isConstructor())
diff --git a/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h b/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h
index 512536c..67378e1 100644
--- a/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h
+++ b/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2016 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2012-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
@@ -163,7 +163,7 @@
void addSetConstant(IdentifierSet& set)
{
createRareDataIfNecessary();
- VM& vm = *this->vm();
+ VM& vm = this->vm();
auto locker = lockDuringMarking(vm.heap, cellLock());
unsigned result = m_constantRegisters.size();
m_constantRegisters.append(WriteBarrier<Unknown>());
@@ -173,7 +173,7 @@
unsigned addConstant(JSValue v, SourceCodeRepresentation sourceCodeRepresentation = SourceCodeRepresentation::Other)
{
- VM& vm = *this->vm();
+ VM& vm = this->vm();
auto locker = lockDuringMarking(vm.heap, cellLock());
unsigned result = m_constantRegisters.size();
m_constantRegisters.append(WriteBarrier<Unknown>());
@@ -183,7 +183,7 @@
}
unsigned addConstant(LinkTimeConstant type)
{
- VM& vm = *this->vm();
+ VM& vm = this->vm();
auto locker = lockDuringMarking(vm.heap, cellLock());
unsigned result = m_constantRegisters.size();
ASSERT(result);
@@ -246,7 +246,7 @@
unsigned addFunctionDecl(UnlinkedFunctionExecutable* n)
{
- VM& vm = *this->vm();
+ VM& vm = this->vm();
auto locker = lockDuringMarking(vm.heap, cellLock());
unsigned size = m_functionDecls.size();
m_functionDecls.append(WriteBarrier<UnlinkedFunctionExecutable>());
@@ -257,7 +257,7 @@
size_t numberOfFunctionDecls() { return m_functionDecls.size(); }
unsigned addFunctionExpr(UnlinkedFunctionExecutable* n)
{
- VM& vm = *this->vm();
+ VM& vm = this->vm();
auto locker = lockDuringMarking(vm.heap, cellLock());
unsigned size = m_functionExprs.size();
m_functionExprs.append(WriteBarrier<UnlinkedFunctionExecutable>());
@@ -377,7 +377,7 @@
protected:
- UnlinkedCodeBlock(VM*, Structure*, CodeType, const ExecutableInfo&, OptionSet<CodeGenerationMode>);
+ UnlinkedCodeBlock(VM&, Structure*, CodeType, const ExecutableInfo&, OptionSet<CodeGenerationMode>);
template<typename CodeBlockType>
UnlinkedCodeBlock(Decoder&, Structure*, const CachedCodeBlock<CodeBlockType>&);
diff --git a/Source/JavaScriptCore/bytecode/UnlinkedEvalCodeBlock.h b/Source/JavaScriptCore/bytecode/UnlinkedEvalCodeBlock.h
index 9aa1d96..ec6f5a9 100644
--- a/Source/JavaScriptCore/bytecode/UnlinkedEvalCodeBlock.h
+++ b/Source/JavaScriptCore/bytecode/UnlinkedEvalCodeBlock.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2016 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2012-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
@@ -36,10 +36,10 @@
typedef UnlinkedGlobalCodeBlock Base;
static const unsigned StructureFlags = Base::StructureFlags | StructureIsImmortal;
- static UnlinkedEvalCodeBlock* create(VM* vm, const ExecutableInfo& info, OptionSet<CodeGenerationMode> codeGenerationMode)
+ static UnlinkedEvalCodeBlock* create(VM& vm, const ExecutableInfo& info, OptionSet<CodeGenerationMode> codeGenerationMode)
{
- UnlinkedEvalCodeBlock* instance = new (NotNull, allocateCell<UnlinkedEvalCodeBlock>(vm->heap)) UnlinkedEvalCodeBlock(vm, vm->unlinkedEvalCodeBlockStructure.get(), info, codeGenerationMode);
- instance->finishCreation(*vm);
+ UnlinkedEvalCodeBlock* instance = new (NotNull, allocateCell<UnlinkedEvalCodeBlock>(vm.heap)) UnlinkedEvalCodeBlock(vm, vm.unlinkedEvalCodeBlockStructure.get(), info, codeGenerationMode);
+ instance->finishCreation(vm);
return instance;
}
@@ -63,7 +63,7 @@
private:
friend CachedEvalCodeBlock;
- UnlinkedEvalCodeBlock(VM* vm, Structure* structure, const ExecutableInfo& info, OptionSet<CodeGenerationMode> codeGenerationMode)
+ UnlinkedEvalCodeBlock(VM& vm, Structure* structure, const ExecutableInfo& info, OptionSet<CodeGenerationMode> codeGenerationMode)
: Base(vm, structure, EvalCode, info, codeGenerationMode)
{
}
diff --git a/Source/JavaScriptCore/bytecode/UnlinkedFunctionCodeBlock.h b/Source/JavaScriptCore/bytecode/UnlinkedFunctionCodeBlock.h
index a910e77..bd3bd9e 100644
--- a/Source/JavaScriptCore/bytecode/UnlinkedFunctionCodeBlock.h
+++ b/Source/JavaScriptCore/bytecode/UnlinkedFunctionCodeBlock.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2016 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2012-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
@@ -36,10 +36,10 @@
typedef UnlinkedCodeBlock Base;
static const unsigned StructureFlags = Base::StructureFlags | StructureIsImmortal;
- static UnlinkedFunctionCodeBlock* create(VM* vm, CodeType codeType, const ExecutableInfo& info, OptionSet<CodeGenerationMode> codeGenerationMode)
+ static UnlinkedFunctionCodeBlock* create(VM& vm, CodeType codeType, const ExecutableInfo& info, OptionSet<CodeGenerationMode> codeGenerationMode)
{
- UnlinkedFunctionCodeBlock* instance = new (NotNull, allocateCell<UnlinkedFunctionCodeBlock>(vm->heap)) UnlinkedFunctionCodeBlock(vm, vm->unlinkedFunctionCodeBlockStructure.get(), codeType, info, codeGenerationMode);
- instance->finishCreation(*vm);
+ UnlinkedFunctionCodeBlock* instance = new (NotNull, allocateCell<UnlinkedFunctionCodeBlock>(vm.heap)) UnlinkedFunctionCodeBlock(vm, vm.unlinkedFunctionCodeBlockStructure.get(), codeType, info, codeGenerationMode);
+ instance->finishCreation(vm);
return instance;
}
@@ -48,7 +48,7 @@
private:
friend CachedFunctionCodeBlock;
- UnlinkedFunctionCodeBlock(VM* vm, Structure* structure, CodeType codeType, const ExecutableInfo& info, OptionSet<CodeGenerationMode> codeGenerationMode)
+ UnlinkedFunctionCodeBlock(VM& vm, Structure* structure, CodeType codeType, const ExecutableInfo& info, OptionSet<CodeGenerationMode> codeGenerationMode)
: Base(vm, structure, codeType, info, codeGenerationMode)
{
}
diff --git a/Source/JavaScriptCore/bytecode/UnlinkedFunctionExecutable.cpp b/Source/JavaScriptCore/bytecode/UnlinkedFunctionExecutable.cpp
index 49d9d2f..397ca17 100644
--- a/Source/JavaScriptCore/bytecode/UnlinkedFunctionExecutable.cpp
+++ b/Source/JavaScriptCore/bytecode/UnlinkedFunctionExecutable.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2018 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2012-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
@@ -58,7 +58,7 @@
JSParserScriptMode scriptMode = executable->scriptMode();
ASSERT(isFunctionParseMode(executable->parseMode()));
std::unique_ptr<FunctionNode> function = parse<FunctionNode>(
- &vm, source, executable->name(), builtinMode, strictMode, scriptMode, executable->parseMode(), executable->superBinding(), error, nullptr);
+ vm, source, executable->name(), builtinMode, strictMode, scriptMode, executable->parseMode(), executable->superBinding(), error, nullptr);
if (!function) {
ASSERT(error.isValid());
@@ -70,7 +70,7 @@
bool isClassContext = executable->superBinding() == SuperBinding::Needed;
- UnlinkedFunctionCodeBlock* result = UnlinkedFunctionCodeBlock::create(&vm, FunctionCode, ExecutableInfo(function->usesEval(), function->isStrictMode(), kind == CodeForConstruct, functionKind == UnlinkedBuiltinFunction, executable->constructorKind(), scriptMode, executable->superBinding(), parseMode, executable->derivedContextType(), false, isClassContext, EvalContextType::FunctionEvalContext), codeGenerationMode);
+ UnlinkedFunctionCodeBlock* result = UnlinkedFunctionCodeBlock::create(vm, FunctionCode, ExecutableInfo(function->usesEval(), function->isStrictMode(), kind == CodeForConstruct, functionKind == UnlinkedBuiltinFunction, executable->constructorKind(), scriptMode, executable->superBinding(), parseMode, executable->derivedContextType(), false, isClassContext, EvalContextType::FunctionEvalContext), codeGenerationMode);
VariableEnvironment parentScopeTDZVariables = executable->parentScopeTDZVariables();
error = BytecodeGenerator::generate(vm, function.get(), source, result, codeGenerationMode, &parentScopeTDZVariables);
@@ -81,8 +81,8 @@
return result;
}
-UnlinkedFunctionExecutable::UnlinkedFunctionExecutable(VM* vm, Structure* structure, const SourceCode& parentSource, FunctionMetadataNode* node, UnlinkedFunctionKind kind, ConstructAbility constructAbility, JSParserScriptMode scriptMode, Optional<CompactVariableMap::Handle> parentScopeTDZVariables, DerivedContextType derivedContextType, bool isBuiltinDefaultClassConstructor)
- : Base(*vm, structure)
+UnlinkedFunctionExecutable::UnlinkedFunctionExecutable(VM& vm, Structure* structure, const SourceCode& parentSource, FunctionMetadataNode* node, UnlinkedFunctionKind kind, ConstructAbility constructAbility, JSParserScriptMode scriptMode, Optional<CompactVariableMap::Handle> parentScopeTDZVariables, DerivedContextType derivedContextType, bool isBuiltinDefaultClassConstructor)
+ : Base(vm, structure)
, m_firstLineOffset(node->firstLine() - parentSource.firstLine().oneBasedInt())
, m_isInStrictContext(node->isInStrictContext())
, m_lineCount(node->lastLine() - node->firstLine())
diff --git a/Source/JavaScriptCore/bytecode/UnlinkedFunctionExecutable.h b/Source/JavaScriptCore/bytecode/UnlinkedFunctionExecutable.h
index 1a8191f..92f840f 100644
--- a/Source/JavaScriptCore/bytecode/UnlinkedFunctionExecutable.h
+++ b/Source/JavaScriptCore/bytecode/UnlinkedFunctionExecutable.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2018 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2012-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
@@ -68,11 +68,11 @@
return &vm.unlinkedFunctionExecutableSpace.space;
}
- static UnlinkedFunctionExecutable* create(VM* vm, const SourceCode& source, FunctionMetadataNode* node, UnlinkedFunctionKind unlinkedFunctionKind, ConstructAbility constructAbility, JSParserScriptMode scriptMode, Optional<CompactVariableMap::Handle> parentScopeTDZVariables, DerivedContextType derivedContextType, bool isBuiltinDefaultClassConstructor = false)
+ static UnlinkedFunctionExecutable* create(VM& vm, const SourceCode& source, FunctionMetadataNode* node, UnlinkedFunctionKind unlinkedFunctionKind, ConstructAbility constructAbility, JSParserScriptMode scriptMode, Optional<CompactVariableMap::Handle> parentScopeTDZVariables, DerivedContextType derivedContextType, bool isBuiltinDefaultClassConstructor = false)
{
- UnlinkedFunctionExecutable* instance = new (NotNull, allocateCell<UnlinkedFunctionExecutable>(vm->heap))
- UnlinkedFunctionExecutable(vm, vm->unlinkedFunctionExecutableStructure.get(), source, node, unlinkedFunctionKind, constructAbility, scriptMode, WTFMove(parentScopeTDZVariables), derivedContextType, isBuiltinDefaultClassConstructor);
- instance->finishCreation(*vm);
+ UnlinkedFunctionExecutable* instance = new (NotNull, allocateCell<UnlinkedFunctionExecutable>(vm.heap))
+ UnlinkedFunctionExecutable(vm, vm.unlinkedFunctionExecutableStructure.get(), source, node, unlinkedFunctionKind, constructAbility, scriptMode, WTFMove(parentScopeTDZVariables), derivedContextType, isBuiltinDefaultClassConstructor);
+ instance->finishCreation(vm);
return instance;
}
@@ -200,7 +200,7 @@
};
private:
- UnlinkedFunctionExecutable(VM*, Structure*, const SourceCode&, FunctionMetadataNode*, UnlinkedFunctionKind, ConstructAbility, JSParserScriptMode, Optional<CompactVariableMap::Handle>, JSC::DerivedContextType, bool isBuiltinDefaultClassConstructor);
+ UnlinkedFunctionExecutable(VM&, Structure*, const SourceCode&, FunctionMetadataNode*, UnlinkedFunctionKind, ConstructAbility, JSParserScriptMode, Optional<CompactVariableMap::Handle>, JSC::DerivedContextType, bool isBuiltinDefaultClassConstructor);
UnlinkedFunctionExecutable(Decoder&, const CachedFunctionExecutable&);
void decodeCachedCodeBlocks(VM&);
diff --git a/Source/JavaScriptCore/bytecode/UnlinkedGlobalCodeBlock.h b/Source/JavaScriptCore/bytecode/UnlinkedGlobalCodeBlock.h
index 4866c6a..6566a6b 100644
--- a/Source/JavaScriptCore/bytecode/UnlinkedGlobalCodeBlock.h
+++ b/Source/JavaScriptCore/bytecode/UnlinkedGlobalCodeBlock.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2016 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2012-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
@@ -34,7 +34,7 @@
typedef UnlinkedCodeBlock Base;
protected:
- UnlinkedGlobalCodeBlock(VM* vm, Structure* structure, CodeType codeType, const ExecutableInfo& info, OptionSet<CodeGenerationMode> codeGenerationMode)
+ UnlinkedGlobalCodeBlock(VM& vm, Structure* structure, CodeType codeType, const ExecutableInfo& info, OptionSet<CodeGenerationMode> codeGenerationMode)
: Base(vm, structure, codeType, info, codeGenerationMode)
{
}
diff --git a/Source/JavaScriptCore/bytecode/UnlinkedModuleProgramCodeBlock.h b/Source/JavaScriptCore/bytecode/UnlinkedModuleProgramCodeBlock.h
index a53d192..08e40f0 100644
--- a/Source/JavaScriptCore/bytecode/UnlinkedModuleProgramCodeBlock.h
+++ b/Source/JavaScriptCore/bytecode/UnlinkedModuleProgramCodeBlock.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2017 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2012-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
@@ -37,10 +37,10 @@
typedef UnlinkedGlobalCodeBlock Base;
static const unsigned StructureFlags = Base::StructureFlags | StructureIsImmortal;
- static UnlinkedModuleProgramCodeBlock* create(VM* vm, const ExecutableInfo& info, OptionSet<CodeGenerationMode> codeGenerationMode)
+ static UnlinkedModuleProgramCodeBlock* create(VM& vm, const ExecutableInfo& info, OptionSet<CodeGenerationMode> codeGenerationMode)
{
- UnlinkedModuleProgramCodeBlock* instance = new (NotNull, allocateCell<UnlinkedModuleProgramCodeBlock>(vm->heap)) UnlinkedModuleProgramCodeBlock(vm, vm->unlinkedModuleProgramCodeBlockStructure.get(), info, codeGenerationMode);
- instance->finishCreation(*vm);
+ UnlinkedModuleProgramCodeBlock* instance = new (NotNull, allocateCell<UnlinkedModuleProgramCodeBlock>(vm.heap)) UnlinkedModuleProgramCodeBlock(vm, vm.unlinkedModuleProgramCodeBlockStructure.get(), info, codeGenerationMode);
+ instance->finishCreation(vm);
return instance;
}
@@ -79,7 +79,7 @@
private:
friend CachedModuleCodeBlock;
- UnlinkedModuleProgramCodeBlock(VM* vm, Structure* structure, const ExecutableInfo& info, OptionSet<CodeGenerationMode> codeGenerationMode)
+ UnlinkedModuleProgramCodeBlock(VM& vm, Structure* structure, const ExecutableInfo& info, OptionSet<CodeGenerationMode> codeGenerationMode)
: Base(vm, structure, ModuleCode, info, codeGenerationMode)
{
}
diff --git a/Source/JavaScriptCore/bytecode/UnlinkedProgramCodeBlock.h b/Source/JavaScriptCore/bytecode/UnlinkedProgramCodeBlock.h
index 3184c76..224dcfc 100644
--- a/Source/JavaScriptCore/bytecode/UnlinkedProgramCodeBlock.h
+++ b/Source/JavaScriptCore/bytecode/UnlinkedProgramCodeBlock.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2017 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2012-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
@@ -36,10 +36,10 @@
typedef UnlinkedGlobalCodeBlock Base;
static const unsigned StructureFlags = Base::StructureFlags | StructureIsImmortal;
- static UnlinkedProgramCodeBlock* create(VM* vm, const ExecutableInfo& info, OptionSet<CodeGenerationMode> codeGenerationMode)
+ static UnlinkedProgramCodeBlock* create(VM& vm, const ExecutableInfo& info, OptionSet<CodeGenerationMode> codeGenerationMode)
{
- UnlinkedProgramCodeBlock* instance = new (NotNull, allocateCell<UnlinkedProgramCodeBlock>(vm->heap)) UnlinkedProgramCodeBlock(vm, vm->unlinkedProgramCodeBlockStructure.get(), info, codeGenerationMode);
- instance->finishCreation(*vm);
+ UnlinkedProgramCodeBlock* instance = new (NotNull, allocateCell<UnlinkedProgramCodeBlock>(vm.heap)) UnlinkedProgramCodeBlock(vm, vm.unlinkedProgramCodeBlockStructure.get(), info, codeGenerationMode);
+ instance->finishCreation(vm);
return instance;
}
@@ -54,7 +54,7 @@
private:
friend CachedProgramCodeBlock;
- UnlinkedProgramCodeBlock(VM* vm, Structure* structure, const ExecutableInfo& info, OptionSet<CodeGenerationMode> codeGenerationMode)
+ UnlinkedProgramCodeBlock(VM& vm, Structure* structure, const ExecutableInfo& info, OptionSet<CodeGenerationMode> codeGenerationMode)
: Base(vm, structure, GlobalCode, info, codeGenerationMode)
{
}
diff --git a/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp b/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
index 1a3e742..d332a2f 100644
--- a/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
+++ b/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
@@ -336,7 +336,7 @@
, m_codeBlock(vm, codeBlock)
, m_thisRegister(CallFrame::thisArgumentOffset())
, m_codeType(GlobalCode)
- , m_vm(&vm)
+ , m_vm(vm)
, m_needsToUpdateArrowFunctionContext(programNode->usesArrowFunction() || programNode->usesEval())
{
ASSERT_UNUSED(parentScopeTDZVariables, !parentScopeTDZVariables->size());
@@ -381,7 +381,7 @@
, m_scopeNode(functionNode)
, m_codeBlock(vm, codeBlock)
, m_codeType(FunctionCode)
- , m_vm(&vm)
+ , m_vm(vm)
, m_isBuiltinFunction(codeBlock->isBuiltinFunction())
, m_usesNonStrictEval(codeBlock->usesEval() && !codeBlock->isStrictMode())
// FIXME: We should be able to have tail call elimination with the profiler
@@ -398,7 +398,7 @@
allocateCalleeSaveSpace();
- SymbolTable* functionSymbolTable = SymbolTable::create(*m_vm);
+ SymbolTable* functionSymbolTable = SymbolTable::create(m_vm);
functionSymbolTable->setUsesNonStrictEval(m_usesNonStrictEval);
int symbolTableConstantIndex = 0;
@@ -550,7 +550,7 @@
// notifyWrite(), since that would be cumbersome. Also, watching formal
// parameters when "arguments" is in play is unlikely to be super profitable.
// So, we just disable it.
- entry.disableWatching(*m_vm);
+ entry.disableWatching(m_vm);
functionSymbolTable->set(NoLockingNecessary, name, entry);
}
OpPutToScope::emit(this, m_lexicalEnvironmentRegister, UINT_MAX, virtualRegisterForArgument(1 + i), GetPutInfo(ThrowIfNotFound, LocalClosureVar, InitializationMode::NotInitialization), SymbolTableOrScopeDepth::symbolTable(VirtualRegister { symbolTableConstantIndex }), offset.offset());
@@ -808,7 +808,7 @@
emitOutOfLineCatchHandler(thrownValue.get(), nullptr, tryFormalParametersData);
// return promiseCapability.@reject(thrownValue)
- RefPtr<RegisterID> reject = emitGetById(newTemporary(), promiseCapabilityRegister(), m_vm->propertyNames->builtinNames().rejectPrivateName());
+ RefPtr<RegisterID> reject = emitGetById(newTemporary(), promiseCapabilityRegister(), m_vm.propertyNames->builtinNames().rejectPrivateName());
CallArguments args(*this, nullptr, 1);
emitLoad(args.thisRegister(), jsUndefined());
@@ -817,7 +817,7 @@
JSTextPosition divot(functionNode->firstLine(), functionNode->startOffset(), functionNode->lineStartOffset());
RefPtr<RegisterID> result = emitCall(newTemporary(), reject.get(), NoExpectedFunction, args, divot, divot, divot, DebuggableCall::No);
- emitReturn(emitGetById(newTemporary(), promiseCapabilityRegister(), m_vm->propertyNames->builtinNames().promisePrivateName()));
+ emitReturn(emitGetById(newTemporary(), promiseCapabilityRegister(), m_vm.propertyNames->builtinNames().promisePrivateName()));
emitLabel(didNotThrow.get());
}
@@ -836,7 +836,7 @@
// Set up the lexical environment scope as the generator frame. We store the saved and resumed generator registers into this scope with the symbol keys.
// Since they are symbol keyed, these variables cannot be reached from the usual code.
if (isGeneratorOrAsyncFunctionBodyParseMode(parseMode)) {
- m_generatorFrameSymbolTable.set(*m_vm, functionSymbolTable);
+ m_generatorFrameSymbolTable.set(m_vm, functionSymbolTable);
m_generatorFrameSymbolTableIndex = symbolTableConstantIndex;
if (m_lexicalEnvironmentRegister)
move(generatorFrameRegister(), m_lexicalEnvironmentRegister);
@@ -860,7 +860,7 @@
, m_codeBlock(vm, codeBlock)
, m_thisRegister(CallFrame::thisArgumentOffset())
, m_codeType(EvalCode)
- , m_vm(&vm)
+ , m_vm(vm)
, m_usesNonStrictEval(codeBlock->usesEval() && !codeBlock->isStrictMode())
, m_needsToUpdateArrowFunctionContext(evalNode->usesArrowFunction() || evalNode->usesEval())
, m_derivedContextType(codeBlock->derivedContextType())
@@ -923,7 +923,7 @@
, m_codeBlock(vm, codeBlock)
, m_thisRegister(CallFrame::thisArgumentOffset())
, m_codeType(ModuleCode)
- , m_vm(&vm)
+ , m_vm(vm)
, m_usesNonStrictEval(false)
, m_needsToUpdateArrowFunctionContext(moduleProgramNode->usesArrowFunction() || moduleProgramNode->usesEval())
{
@@ -934,7 +934,7 @@
allocateCalleeSaveSpace();
- SymbolTable* moduleEnvironmentSymbolTable = SymbolTable::create(*m_vm);
+ SymbolTable* moduleEnvironmentSymbolTable = SymbolTable::create(m_vm);
moduleEnvironmentSymbolTable->setUsesNonStrictEval(m_usesNonStrictEval);
moduleEnvironmentSymbolTable->setScopeType(SymbolTable::ScopeType::LexicalScope);
@@ -972,7 +972,7 @@
// Now declare all variables.
- createVariable(m_vm->propertyNames->builtinNames().metaPrivateName(), VarKind::Scope, moduleEnvironmentSymbolTable, VerifyExisting);
+ createVariable(m_vm.propertyNames->builtinNames().metaPrivateName(), VarKind::Scope, moduleEnvironmentSymbolTable, VerifyExisting);
for (auto& entry : moduleProgramNode->varDeclarations()) {
ASSERT(!entry.value.isLet() && !entry.value.isConst());
@@ -994,7 +994,7 @@
if (shouldEmitTypeProfilerHooks())
constantSymbolTable = addConstantValue(moduleEnvironmentSymbolTable);
else
- constantSymbolTable = addConstantValue(moduleEnvironmentSymbolTable->cloneScopePart(*m_vm));
+ constantSymbolTable = addConstantValue(moduleEnvironmentSymbolTable->cloneScopePart(m_vm));
pushTDZVariables(lexicalVariables, TDZCheckOptimization::Optimize, TDZRequirement::UnderTDZ);
bool isWithScope = false;
@@ -2017,7 +2017,7 @@
if (shouldEmitDebugHooks())
environment.markAllVariablesAsCaptured();
- SymbolTable* symbolTable = SymbolTable::create(*m_vm);
+ SymbolTable* symbolTable = SymbolTable::create(m_vm);
switch (scopeType) {
case ScopeType::CatchScope:
symbolTable->setScopeType(SymbolTable::ScopeType::CatchScope);
@@ -2054,7 +2054,7 @@
newScope = addVar();
if (!constantSymbolTable) {
ASSERT(!shouldEmitTypeProfilerHooks());
- constantSymbolTable = addConstantValue(symbolTable->cloneScopePart(*m_vm));
+ constantSymbolTable = addConstantValue(symbolTable->cloneScopePart(m_vm));
symbolTableConstantIndex = constantSymbolTable->index();
}
if (constantSymbolTableResult)
@@ -2645,7 +2645,7 @@
m_staticPropertyAnalyzer.putById(base, propertyIndex);
- PutByIdFlags type = (putType == PropertyNode::KnownDirect || property != m_vm->propertyNames->underscoreProto) ? PutByIdIsDirect : PutByIdNone;
+ PutByIdFlags type = (putType == PropertyNode::KnownDirect || property != m_vm.propertyNames->underscoreProto) ? PutByIdIsDirect : PutByIdNone;
OpPutById::emit(this, base, propertyIndex, value, type);
m_codeBlock->addPropertyAccessInstruction(m_lastInstruction.offset());
return value;
@@ -2926,7 +2926,7 @@
}
}
- m_cachedVariablesUnderTDZ = m_vm->m_compactVariableMap->get(environment);
+ m_cachedVariablesUnderTDZ = m_vm.m_compactVariableMap->get(environment);
m_hasCachedVariablesUnderTDZ = !environment.isEmpty();
if (!m_hasCachedVariablesUnderTDZ)
return WTF::nullopt;
@@ -2956,9 +2956,9 @@
JSValue BytecodeGenerator::addBigIntConstant(const Identifier& identifier, uint8_t radix, bool sign)
{
return m_bigIntMap.ensure(BigIntMapEntry(identifier.impl(), radix, sign), [&] {
- auto scope = DECLARE_CATCH_SCOPE(*vm());
+ auto scope = DECLARE_CATCH_SCOPE(vm());
auto parseIntSign = sign ? JSBigInt::ParseIntSign::Signed : JSBigInt::ParseIntSign::Unsigned;
- JSBigInt* bigIntInMap = JSBigInt::parseInt(nullptr, *vm(), identifier.string(), radix, JSBigInt::ErrorParseMode::ThrowExceptions, parseIntSign);
+ JSBigInt* bigIntInMap = JSBigInt::parseInt(nullptr, vm(), identifier.string(), radix, JSBigInt::ErrorParseMode::ThrowExceptions, parseIntSign);
// FIXME: [ESNext] Enables a way to throw an error on ByteCodeGenerator step
// https://bugs.webkit.org/show_bug.cgi?id=180139
scope.assertNoException();
@@ -2983,7 +2983,7 @@
{
auto result = m_templateObjectDescriptorSet.add(WTFMove(descriptor));
JSTemplateObjectDescriptor* descriptorValue = m_templateDescriptorMap.ensure(endOffset, [&] {
- return JSTemplateObjectDescriptor::create(*vm(), result.iterator->copyRef(), endOffset);
+ return JSTemplateObjectDescriptor::create(vm(), result.iterator->copyRef(), endOffset);
}).iterator->value;
int index = addConstantIndex();
m_codeBlock->addConstant(descriptorValue);
@@ -3109,7 +3109,7 @@
RegisterID* BytecodeGenerator::emitNewDefaultConstructor(RegisterID* dst, ConstructorKind constructorKind, const Identifier& name,
const Identifier& ecmaName, const SourceCode& classSource)
{
- UnlinkedFunctionExecutable* executable = m_vm->builtinExecutables()->createDefaultConstructor(constructorKind, name);
+ UnlinkedFunctionExecutable* executable = m_vm.builtinExecutables()->createDefaultConstructor(constructorKind, name);
executable->setInvalidTypeProfilingOffsets();
executable->setEcmaName(ecmaName);
executable->setClassSource(classSource);
@@ -3144,7 +3144,7 @@
ClassExprNode* classExprNode = static_cast<ClassExprNode*>(valueNode);
if (!classExprNode->ecmaName().isNull())
return;
- if (classExprNode->hasStaticProperty(m_vm->propertyNames->name))
+ if (classExprNode->hasStaticProperty(m_vm.propertyNames->name))
return;
} else
return;
diff --git a/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h b/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h
index 3b1e85d..5558ff7 100644
--- a/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h
+++ b/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h
@@ -379,9 +379,9 @@
~BytecodeGenerator();
- VM* vm() const { return m_vm; }
+ VM& vm() const { return m_vm; }
ParserArena& parserArena() const { return m_scopeNode->parserArena(); }
- const CommonIdentifiers& propertyNames() const { return *m_vm->propertyNames; }
+ const CommonIdentifiers& propertyNames() const { return *m_vm.propertyNames; }
bool isConstructor() const { return m_codeBlock->isConstructor(); }
DerivedContextType derivedContextType() const { return m_derivedContextType; }
@@ -500,7 +500,7 @@
{
// Node::emitCode assumes that dst, if provided, is either a local or a referenced temporary.
ASSERT(!dst || dst == ignoredResult() || !dst->isTemporary() || dst->refCount());
- if (UNLIKELY(!m_vm->isSafeToRecurse())) {
+ if (UNLIKELY(!m_vm.isSafeToRecurse())) {
emitThrowExpressionTooDeepException();
return;
}
@@ -536,7 +536,7 @@
{
// Node::emitCode assumes that dst, if provided, is either a local or a referenced temporary.
ASSERT(!dst || dst == ignoredResult() || !dst->isTemporary() || dst->refCount());
- if (UNLIKELY(!m_vm->isSafeToRecurse()))
+ if (UNLIKELY(!m_vm.isSafeToRecurse()))
return emitThrowExpressionTooDeepException();
if (UNLIKELY(n->needsDebugHook()))
emitDebugHook(n);
@@ -556,7 +556,7 @@
RegisterID* emitDefineClassElements(PropertyListNode* n, RegisterID* constructor, RegisterID* prototype)
{
ASSERT(constructor->refCount() && prototype->refCount());
- if (UNLIKELY(!m_vm->isSafeToRecurse()))
+ if (UNLIKELY(!m_vm.isSafeToRecurse()))
return emitThrowExpressionTooDeepException();
if (UNLIKELY(n->needsDebugHook()))
emitDebugHook(n);
@@ -579,7 +579,7 @@
void emitNodeInConditionContext(ExpressionNode* n, Label& trueTarget, Label& falseTarget, FallThroughMode fallThroughMode)
{
- if (UNLIKELY(!m_vm->isSafeToRecurse())) {
+ if (UNLIKELY(!m_vm.isSafeToRecurse())) {
emitThrowExpressionTooDeepException();
return;
}
@@ -1290,7 +1290,7 @@
StaticPropertyAnalyzer m_staticPropertyAnalyzer;
- VM* m_vm;
+ VM& m_vm;
OpcodeID m_lastOpcodeID = op_end;
InstructionStream::MutableRef m_lastInstruction { m_writer.ref() };
diff --git a/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp b/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
index b66c82b..a755057 100644
--- a/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
+++ b/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
@@ -146,7 +146,7 @@
auto flags = Yarr::parseFlags(m_flags.string());
ASSERT(flags.hasValue());
- RegExp* regExp = RegExp::create(*generator.vm(), m_pattern.string(), flags.value());
+ RegExp* regExp = RegExp::create(generator.vm(), m_pattern.string(), flags.value());
if (regExp->isValid())
return generator.emitNewRegExp(generator.finalDestination(dst), regExp);
@@ -410,12 +410,12 @@
auto newArray = [&] (RegisterID* dst, ElementNode* elements, unsigned length, bool hadVariableExpression) {
if (length && !hadVariableExpression) {
recommendedIndexingType |= CopyOnWrite;
- ASSERT(generator.vm()->heap.isDeferred()); // We run bytecode generator under a DeferGC. If we stopped doing that, we'd need to put a DeferGC here as we filled in these slots.
- auto* array = JSImmutableButterfly::create(*generator.vm(), recommendedIndexingType, length);
+ ASSERT(generator.vm().heap.isDeferred()); // We run bytecode generator under a DeferGC. If we stopped doing that, we'd need to put a DeferGC here as we filled in these slots.
+ auto* array = JSImmutableButterfly::create(generator.vm(), recommendedIndexingType, length);
unsigned index = 0;
for (ElementNode* element = elements; index < length; element = element->next()) {
ASSERT(element->value()->isConstant());
- array->setIndex(*generator.vm(), index++, static_cast<ConstantNode*>(element->value())->jsValue(generator));
+ array->setIndex(generator.vm(), index++, static_cast<ConstantNode*>(element->value())->jsValue(generator));
}
return generator.emitNewArrayBuffer(dst, array, recommendedIndexingType);
}
@@ -939,7 +939,7 @@
RegisterID* FunctionCallResolveNode::emitBytecode(BytecodeGenerator& generator, RegisterID* dst)
{
- if (UNLIKELY(m_ident == generator.vm()->propertyNames->builtinNames().assertPrivateName())) {
+ if (UNLIKELY(m_ident == generator.vm().propertyNames->builtinNames().assertPrivateName())) {
if (ASSERT_DISABLED)
return generator.move(dst, generator.emitLoad(nullptr, jsUndefined()));
}
@@ -1004,7 +1004,7 @@
RefPtr<RegisterID> base = generator.emitNode(node);
node = node->m_next;
ASSERT(node->m_expr->isString());
- SymbolImpl* symbol = generator.vm()->propertyNames->lookUpPrivateName(static_cast<StringNode*>(node->m_expr)->value());
+ SymbolImpl* symbol = generator.vm().propertyNames->lookUpPrivateName(static_cast<StringNode*>(node->m_expr)->value());
ASSERT(symbol);
ASSERT(!node->m_next);
return generator.emitDirectGetById(generator.finalDestination(dst), base.get(), generator.parserArena().identifierArena().makeIdentifier(generator.vm(), symbol));
@@ -1055,7 +1055,7 @@
RefPtr<RegisterID> base = generator.emitNode(node);
node = node->m_next;
ASSERT(node->m_expr->isString());
- SymbolImpl* symbol = generator.vm()->propertyNames->lookUpPrivateName(static_cast<StringNode*>(node->m_expr)->value());
+ SymbolImpl* symbol = generator.vm().propertyNames->lookUpPrivateName(static_cast<StringNode*>(node->m_expr)->value());
ASSERT(symbol);
node = node->m_next;
RefPtr<RegisterID> value = generator.emitNode(node);
@@ -1174,7 +1174,7 @@
ASSERT(!node->m_next);
return generator.move(dst, generator.emitToObject(temp.get(), src.get(), message));
}
- return generator.move(dst, generator.emitToObject(temp.get(), src.get(), generator.vm()->propertyNames->emptyIdentifier));
+ return generator.move(dst, generator.emitToObject(temp.get(), src.get(), generator.vm().propertyNames->emptyIdentifier));
}
RegisterID* BytecodeIntrinsicNode::emit_intrinsic_idWithProfile(BytecodeGenerator& generator, RegisterID* dst)
@@ -1297,7 +1297,7 @@
ASSERT(type() == Type::Constant); \
if (dst == generator.ignoredResult()) \
return nullptr; \
- return generator.emitLoad(dst, generator.vm()->bytecodeIntrinsicRegistry().name##Value(generator)); \
+ return generator.emitLoad(dst, generator.vm().bytecodeIntrinsicRegistry().name##Value(generator)); \
}
JSC_COMMON_BYTECODE_INTRINSIC_CONSTANTS_EACH_NAME(JSC_DECLARE_BYTECODE_INTRINSIC_CONSTANT_GENERATORS)
#undef JSC_DECLARE_BYTECODE_INTRINSIC_CONSTANT_GENERATORS
@@ -2324,7 +2324,7 @@
generator.emitJumpIfFalse(isObject.get(), typeError.get());
generator.emitExpressionInfo(divot(), divotStart(), divotEnd());
- generator.emitGetById(hasInstanceValue.get(), constructor.get(), generator.vm()->propertyNames->hasInstanceSymbol);
+ generator.emitGetById(hasInstanceValue.get(), constructor.get(), generator.vm().propertyNames->hasInstanceSymbol);
generator.emitExpressionInfo(divot(), divotStart(), divotEnd());
generator.emitOverridesHasInstance(isCustom.get(), constructor.get(), hasInstanceValue.get());
@@ -2333,7 +2333,7 @@
generator.emitJumpIfTrue(isCustom.get(), custom.get());
generator.emitExpressionInfo(divot(), divotStart(), divotEnd());
- generator.emitGetById(prototype.get(), constructor.get(), generator.vm()->propertyNames->prototype);
+ generator.emitGetById(prototype.get(), constructor.get(), generator.vm().propertyNames->prototype);
generator.emitExpressionInfo(divot(), divotStart(), divotEnd());
generator.emitInstanceOf(dstReg.get(), value.get(), prototype.get());
diff --git a/Source/JavaScriptCore/debugger/Debugger.cpp b/Source/JavaScriptCore/debugger/Debugger.cpp
index 09a6ded..8133513 100644
--- a/Source/JavaScriptCore/debugger/Debugger.cpp
+++ b/Source/JavaScriptCore/debugger/Debugger.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2008-2019 Apple Inc. All rights reserved.
* Copyright (C) 1999-2001 Harri Porten (porten@kde.org)
* Copyright (C) 2001 Peter Kelly (pmk@post.com)
*
@@ -56,7 +56,7 @@
JSCell* cell = static_cast<JSCell*>(heapCell);
- JSFunction* function = jsDynamicCast<JSFunction*>(*cell->vm(), cell);
+ JSFunction* function = jsDynamicCast<JSFunction*>(cell->vm(), cell);
if (!function)
return IterationStatus::Continue;
diff --git a/Source/JavaScriptCore/debugger/DebuggerParseData.cpp b/Source/JavaScriptCore/debugger/DebuggerParseData.cpp
index 24aa49f..60cd144 100644
--- a/Source/JavaScriptCore/debugger/DebuggerParseData.cpp
+++ b/Source/JavaScriptCore/debugger/DebuggerParseData.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-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
@@ -154,7 +154,7 @@
JSParserScriptMode scriptMode = DebuggerParseInfo<T>::scriptMode;
ParserError error;
- std::unique_ptr<RootNode> rootNode = parse<RootNode>(&vm, source, Identifier(),
+ std::unique_ptr<RootNode> rootNode = parse<RootNode>(vm, source, Identifier(),
JSParserBuiltinMode::NotBuiltin, strictMode, scriptMode, parseMode, SuperBinding::NotNeeded,
error, nullptr, ConstructorKind::None, DerivedContextType::None, EvalContextType::None,
&debuggerParseData);
diff --git a/Source/JavaScriptCore/debugger/DebuggerScope.cpp b/Source/JavaScriptCore/debugger/DebuggerScope.cpp
index 2f34411..09d0f2b 100644
--- a/Source/JavaScriptCore/debugger/DebuggerScope.cpp
+++ b/Source/JavaScriptCore/debugger/DebuggerScope.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2009, 2014, 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2008-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
@@ -163,7 +163,7 @@
{
ASSERT(isValid());
if (!m_next && m_scope->next()) {
- VM& vm = *m_scope->vm();
+ VM& vm = m_scope->vm();
DebuggerScope* nextScope = create(vm, m_scope->next());
m_next.set(vm, this, nextScope);
}
@@ -224,7 +224,7 @@
String DebuggerScope::name() const
{
- SymbolTable* symbolTable = m_scope->symbolTable(*vm());
+ SymbolTable* symbolTable = m_scope->symbolTable(vm());
if (!symbolTable)
return String();
@@ -237,7 +237,7 @@
DebuggerLocation DebuggerScope::location() const
{
- SymbolTable* symbolTable = m_scope->symbolTable(*vm());
+ SymbolTable* symbolTable = m_scope->symbolTable(vm());
if (!symbolTable)
return DebuggerLocation();
diff --git a/Source/JavaScriptCore/dfg/DFGDesiredIdentifiers.cpp b/Source/JavaScriptCore/dfg/DFGDesiredIdentifiers.cpp
index b4cec6b4..77c0eb0 100644
--- a/Source/JavaScriptCore/dfg/DFGDesiredIdentifiers.cpp
+++ b/Source/JavaScriptCore/dfg/DFGDesiredIdentifiers.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013-2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-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
@@ -89,7 +89,7 @@
{
for (auto rep : m_addedIdentifiers) {
ASSERT(rep->hasAtLeastOneRef());
- commonData->dfgIdentifiers.append(Identifier::fromUid(&vm, rep));
+ commonData->dfgIdentifiers.append(Identifier::fromUid(vm, rep));
}
}
diff --git a/Source/JavaScriptCore/dfg/DFGDesiredWatchpoints.cpp b/Source/JavaScriptCore/dfg/DFGDesiredWatchpoints.cpp
index 8d02399..c37182f 100644
--- a/Source/JavaScriptCore/dfg/DFGDesiredWatchpoints.cpp
+++ b/Source/JavaScriptCore/dfg/DFGDesiredWatchpoints.cpp
@@ -38,7 +38,7 @@
void ArrayBufferViewWatchpointAdaptor::add(
CodeBlock* codeBlock, JSArrayBufferView* view, CommonData& common)
{
- VM& vm = *codeBlock->vm();
+ VM& vm = codeBlock->vm();
Watchpoint* watchpoint = common.watchpoints.add(codeBlock);
ArrayBufferNeuteringWatchpointSet* neuteringWatchpoint =
ArrayBufferNeuteringWatchpointSet::create(vm);
@@ -66,7 +66,7 @@
void AdaptiveStructureWatchpointAdaptor::add(
CodeBlock* codeBlock, const ObjectPropertyCondition& key, CommonData& common)
{
- VM& vm = *codeBlock->vm();
+ VM& vm = codeBlock->vm();
switch (key.kind()) {
case PropertyCondition::Equivalence:
common.adaptiveInferredPropertyValueWatchpoints.add(key, codeBlock)->install(vm);
diff --git a/Source/JavaScriptCore/dfg/DFGFrozenValue.h b/Source/JavaScriptCore/dfg/DFGFrozenValue.h
index 21bc415..157733a 100644
--- a/Source/JavaScriptCore/dfg/DFGFrozenValue.h
+++ b/Source/JavaScriptCore/dfg/DFGFrozenValue.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-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
@@ -58,7 +58,7 @@
, m_strength(strength)
{
ASSERT((!!value && value.isCell()) == !!structure);
- ASSERT(!value || !value.isCell() || value.asCell()->classInfo(*value.asCell()->vm()) == structure->classInfo());
+ ASSERT(!value || !value.isCell() || value.asCell()->classInfo(value.asCell()->vm()) == structure->classInfo());
ASSERT(!!structure || (strength == WeakValue));
}
diff --git a/Source/JavaScriptCore/dfg/DFGGraph.cpp b/Source/JavaScriptCore/dfg/DFGGraph.cpp
index e683a82..4b29978 100644
--- a/Source/JavaScriptCore/dfg/DFGGraph.cpp
+++ b/Source/JavaScriptCore/dfg/DFGGraph.cpp
@@ -1725,7 +1725,7 @@
Structure* stringObjectStructure = globalObjectFor(codeOrigin)->stringObjectStructure();
registerStructure(stringObjectStructure);
ASSERT(stringObjectStructure->storedPrototype().isObject());
- ASSERT(stringObjectStructure->storedPrototype().asCell()->classInfo(*stringObjectStructure->storedPrototype().asCell()->vm()) == StringPrototype::info());
+ ASSERT(stringObjectStructure->storedPrototype().asCell()->classInfo(stringObjectStructure->storedPrototype().asCell()->vm()) == StringPrototype::info());
if (!watchConditions(generateConditionsForPropertyMissConcurrently(m_vm, globalObject, stringObjectStructure, m_vm.propertyNames->toPrimitiveSymbol.impl())))
return false;
diff --git a/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp b/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp
index f2b6640..341a4bc 100644
--- a/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp
+++ b/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2011-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
@@ -85,7 +85,7 @@
}
}
- MacroAssemblerCodeRef<JITThunkPtrTag> osrExitThunk = vm()->getCTIStub(osrExitThunkGenerator);
+ MacroAssemblerCodeRef<JITThunkPtrTag> osrExitThunk = vm().getCTIStub(osrExitThunkGenerator);
auto osrExitThunkLabel = CodeLocationLabel<JITThunkPtrTag>(osrExitThunk.code());
for (unsigned i = 0; i < m_jitCode->osrExit.size(); ++i) {
OSRExitCompilationInfo& info = m_exitCompilationInfo[i];
@@ -96,7 +96,7 @@
info.m_replacementDestination = label();
jitAssertHasValidCallFrame();
- store32(TrustedImm32(i), &vm()->osrExitIndex);
+ store32(TrustedImm32(i), &vm().osrExitIndex);
if (Options::useProbeOSRExit()) {
Jump target = jump();
addLinkTask([target, osrExitThunkLabel] (LinkBuffer& linkBuffer) {
@@ -147,10 +147,10 @@
if (!m_exceptionChecksWithCallFrameRollback.empty()) {
m_exceptionChecksWithCallFrameRollback.link(this);
- copyCalleeSavesToEntryFrameCalleeSavesBuffer(vm()->topEntryFrame);
+ copyCalleeSavesToEntryFrameCalleeSavesBuffer(vm().topEntryFrame);
// lookupExceptionHandlerFromCallerFrame is passed two arguments, the VM and the exec (the CallFrame*).
- move(TrustedImmPtr(vm()), GPRInfo::argumentGPR0);
+ move(TrustedImmPtr(&vm()), GPRInfo::argumentGPR0);
move(GPRInfo::callFrameRegister, GPRInfo::argumentGPR1);
addPtr(TrustedImm32(m_graph.stackPointerOffset() * sizeof(Register)), GPRInfo::callFrameRegister, stackPointerRegister);
@@ -161,16 +161,16 @@
#endif
m_calls.append(CallLinkRecord(call(OperationPtrTag), FunctionPtr<OperationPtrTag>(lookupExceptionHandlerFromCallerFrame)));
- jumpToExceptionHandler(*vm());
+ jumpToExceptionHandler(vm());
}
if (!m_exceptionChecks.empty()) {
m_exceptionChecks.link(this);
- copyCalleeSavesToEntryFrameCalleeSavesBuffer(vm()->topEntryFrame);
+ copyCalleeSavesToEntryFrameCalleeSavesBuffer(vm().topEntryFrame);
// lookupExceptionHandler is passed two arguments, the VM and the exec (the CallFrame*).
- move(TrustedImmPtr(vm()), GPRInfo::argumentGPR0);
+ move(TrustedImmPtr(&vm()), GPRInfo::argumentGPR0);
move(GPRInfo::callFrameRegister, GPRInfo::argumentGPR1);
#if CPU(X86)
@@ -180,7 +180,7 @@
#endif
m_calls.append(CallLinkRecord(call(OperationPtrTag), FunctionPtr<OperationPtrTag>(lookupExceptionHandler)));
- jumpToExceptionHandler(*vm());
+ jumpToExceptionHandler(vm());
}
}
@@ -266,7 +266,7 @@
finalizeInlineCaches(m_inByIds, linkBuffer);
finalizeInlineCaches(m_instanceOfs, linkBuffer);
- auto linkCallThunk = FunctionPtr<NoPtrTag>(vm()->getCTIStub(linkCallThunkGenerator).retaggedCode<NoPtrTag>());
+ auto linkCallThunk = FunctionPtr<NoPtrTag>(vm().getCTIStub(linkCallThunkGenerator).retaggedCode<NoPtrTag>());
for (auto& record : m_jsCalls) {
CallLinkInfo& info = *record.info;
linkBuffer.link(record.slowCall, linkCallThunk);
@@ -293,7 +293,7 @@
linkBuffer.locationOfNearCall<JSInternalPtrTag>(record.call));
}
- MacroAssemblerCodeRef<JITThunkPtrTag> osrExitThunk = vm()->getCTIStub(osrExitGenerationThunkGenerator);
+ MacroAssemblerCodeRef<JITThunkPtrTag> osrExitThunk = vm().getCTIStub(osrExitGenerationThunkGenerator);
auto target = CodeLocationLabel<JITThunkPtrTag>(osrExitThunk.code());
for (unsigned i = 0; i < m_jitCode->osrExit.size(); ++i) {
OSRExitCompilationInfo& info = m_exitCompilationInfo[i];
@@ -354,7 +354,7 @@
jit.addPtr(MacroAssembler::TrustedImm32(frameTopOffset), GPRInfo::callFrameRegister, GPRInfo::regT1);
if (UNLIKELY(maxFrameSize > Options::reservedZoneSize()))
stackOverflow.append(jit.branchPtr(MacroAssembler::Above, GPRInfo::regT1, GPRInfo::callFrameRegister));
- stackOverflow.append(jit.branchPtr(MacroAssembler::Above, MacroAssembler::AbsoluteAddress(jit.vm()->addressOfSoftStackLimit()), GPRInfo::regT1));
+ stackOverflow.append(jit.branchPtr(MacroAssembler::Above, MacroAssembler::AbsoluteAddress(jit.vm().addressOfSoftStackLimit()), GPRInfo::regT1));
}
void JITCompiler::compile()
@@ -519,7 +519,7 @@
codeBlock()->shrinkToFit(CodeBlock::LateShrink);
if (requiresArityFixup)
- linkBuffer->link(callArityFixup, FunctionPtr<JITThunkPtrTag>(vm()->getCTIStub(arityFixupGenerator).code()));
+ linkBuffer->link(callArityFixup, FunctionPtr<JITThunkPtrTag>(vm().getCTIStub(arityFixupGenerator).code()));
disassemble(*linkBuffer);
@@ -653,11 +653,11 @@
bool willCatchException = m_graph.willCatchExceptionInMachineFrame(m_speculative->m_currentNode->origin.forExit, opCatchOrigin, exceptionHandler);
if (willCatchException) {
unsigned streamIndex = m_speculative->m_outOfLineStreamIndex ? *m_speculative->m_outOfLineStreamIndex : m_speculative->m_stream->size();
- MacroAssembler::Jump hadException = emitNonPatchableExceptionCheck(*vm());
+ MacroAssembler::Jump hadException = emitNonPatchableExceptionCheck(vm());
// We assume here that this is called after callOpeartion()/appendCall() is called.
appendExceptionHandlingOSRExit(ExceptionCheck, streamIndex, opCatchOrigin, exceptionHandler, m_jitCode->common.lastCallSite(), hadException);
} else
- m_exceptionChecks.append(emitExceptionCheck(*vm()));
+ m_exceptionChecks.append(emitExceptionCheck(vm()));
}
CallSiteIndex JITCompiler::recordCallSiteAndGenerateExceptionHandlingOSRExitIfNeeded(const CodeOrigin& callSiteCodeOrigin, unsigned eventStreamIndex)
@@ -691,7 +691,7 @@
{
if (m_graph.m_maxLocalsForCatchOSREntry) {
uint32_t numberOfLiveLocals = std::max(*m_graph.m_maxLocalsForCatchOSREntry, 1u); // Make sure we always allocate a non-null catchOSREntryBuffer.
- m_jitCode->common.catchOSREntryBuffer = vm()->scratchBufferForSize(sizeof(JSValue) * numberOfLiveLocals);
+ m_jitCode->common.catchOSREntryBuffer = vm().scratchBufferForSize(sizeof(JSValue) * numberOfLiveLocals);
}
}
diff --git a/Source/JavaScriptCore/dfg/DFGJITCompiler.h b/Source/JavaScriptCore/dfg/DFGJITCompiler.h
index 0bd66c7..08dfb8d 100644
--- a/Source/JavaScriptCore/dfg/DFGJITCompiler.h
+++ b/Source/JavaScriptCore/dfg/DFGJITCompiler.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2011-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
@@ -150,13 +150,13 @@
void exceptionCheckWithCallFrameRollback()
{
- m_exceptionChecksWithCallFrameRollback.append(emitExceptionCheck(*vm()));
+ m_exceptionChecksWithCallFrameRollback.append(emitExceptionCheck(vm()));
}
// Add a call out from JIT code, with a fast exception check that tests if the return value is zero.
void fastExceptionCheck()
{
- callExceptionFuzz(*vm());
+ callExceptionFuzz(vm());
m_exceptionChecks.append(branchTestPtr(Zero, GPRInfo::returnValueGPR));
}
@@ -254,7 +254,7 @@
PCToCodeOriginMapBuilder& pcToCodeOriginMapBuilder() { return m_pcToCodeOriginMapBuilder; }
- VM* vm() { return &m_graph.m_vm; }
+ VM& vm() { return m_graph.m_vm; }
private:
friend class OSRExitJumpPlaceholder;
diff --git a/Source/JavaScriptCore/dfg/DFGLazyJSValue.cpp b/Source/JavaScriptCore/dfg/DFGLazyJSValue.cpp
index 2458c46..ee7a581 100644
--- a/Source/JavaScriptCore/dfg/DFGLazyJSValue.cpp
+++ b/Source/JavaScriptCore/dfg/DFGLazyJSValue.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013, 2014, 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-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
@@ -49,11 +49,11 @@
case KnownValue:
return value()->value();
case SingleCharacterString:
- return jsSingleCharacterString(&vm, u.character);
+ return jsSingleCharacterString(vm, u.character);
case KnownStringImpl:
- return jsString(&vm, u.stringImpl);
+ return jsString(vm, u.stringImpl);
case NewStringImpl:
- return jsString(&vm, AtomStringImpl::add(u.stringImpl));
+ return jsString(vm, AtomStringImpl::add(u.stringImpl));
}
RELEASE_ASSERT_NOT_REACHED();
return JSValue();
@@ -251,7 +251,7 @@
jit.addLinkTask(
[codeBlock, label, thisValue] (LinkBuffer& linkBuffer) {
- JSValue realValue = thisValue.getValue(*codeBlock->vm());
+ JSValue realValue = thisValue.getValue(codeBlock->vm());
RELEASE_ASSERT(realValue.isCell());
codeBlock->addConstant(realValue);
diff --git a/Source/JavaScriptCore/dfg/DFGOSREntry.cpp b/Source/JavaScriptCore/dfg/DFGOSREntry.cpp
index d0e527c..ae93c1a 100644
--- a/Source/JavaScriptCore/dfg/DFGOSREntry.cpp
+++ b/Source/JavaScriptCore/dfg/DFGOSREntry.cpp
@@ -109,7 +109,7 @@
" from bc#", bytecodeIndex, "\n");
}
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
sanitizeStackForVM(vm);
@@ -238,7 +238,7 @@
// would have otherwise just kept running albeit less quickly.
unsigned frameSizeForCheck = jitCode->common.requiredRegisterCountForExecutionAndExit();
- if (UNLIKELY(!vm->ensureStackCapacityFor(&exec->registers()[virtualRegisterForLocal(frameSizeForCheck - 1).offset()]))) {
+ if (UNLIKELY(!vm.ensureStackCapacityFor(&exec->registers()[virtualRegisterForLocal(frameSizeForCheck - 1).offset()]))) {
if (Options::verboseOSR())
dataLogF(" OSR failed because stack growth failed.\n");
return nullptr;
@@ -258,7 +258,7 @@
unsigned baselineFrameSize = entry->m_expectedValues.numberOfLocals();
unsigned maxFrameSize = std::max(frameSize, baselineFrameSize);
- Register* scratch = bitwise_cast<Register*>(vm->scratchBufferForSize(sizeof(Register) * (2 + CallFrame::headerSizeInRegisters + maxFrameSize))->dataBuffer());
+ Register* scratch = bitwise_cast<Register*>(vm.scratchBufferForSize(sizeof(Register) * (2 + CallFrame::headerSizeInRegisters + maxFrameSize))->dataBuffer());
*bitwise_cast<size_t*>(scratch + 0) = frameSize;
@@ -311,7 +311,7 @@
RegisterSet dontSaveRegisters = RegisterSet(RegisterSet::stackRegisters(), RegisterSet::allFPRs());
unsigned registerCount = registerSaveLocations->size();
- VMEntryRecord* record = vmEntryRecord(vm->topEntryFrame);
+ VMEntryRecord* record = vmEntryRecord(vm.topEntryFrame);
for (unsigned i = 0; i < registerCount; i++) {
RegisterAtOffset currentEntry = registerSaveLocations->at(i);
if (dontSaveRegisters.get(currentEntry.reg()))
diff --git a/Source/JavaScriptCore/dfg/DFGOSRExit.cpp b/Source/JavaScriptCore/dfg/DFGOSRExit.cpp
index 09b30ba..4351596 100644
--- a/Source/JavaScriptCore/dfg/DFGOSRExit.cpp
+++ b/Source/JavaScriptCore/dfg/DFGOSRExit.cpp
@@ -1021,17 +1021,17 @@
void JIT_OPERATION OSRExit::compileOSRExit(ExecState* exec)
{
- VM* vm = &exec->vm();
- auto scope = DECLARE_THROW_SCOPE(*vm);
+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
if (validateDFGDoesGC) {
// We're about to exit optimized code. So, there's no longer any optimized
// code running that expects no GC.
- vm->heap.setExpectDoesGC(true);
+ vm.heap.setExpectDoesGC(true);
}
- if (vm->callFrameForCatch)
- RELEASE_ASSERT(vm->callFrameForCatch == exec);
+ if (vm.callFrameForCatch)
+ RELEASE_ASSERT(vm.callFrameForCatch == exec);
CodeBlock* codeBlock = exec->codeBlock();
ASSERT(codeBlock);
@@ -1039,12 +1039,12 @@
// It's sort of preferable that we don't GC while in here. Anyways, doing so wouldn't
// really be profitable.
- DeferGCForAWhile deferGC(vm->heap);
+ DeferGCForAWhile deferGC(vm.heap);
- uint32_t exitIndex = vm->osrExitIndex;
+ uint32_t exitIndex = vm.osrExitIndex;
OSRExit& exit = codeBlock->jitCode()->dfg()->osrExit[exitIndex];
- ASSERT(!vm->callFrameForCatch || exit.m_kind == GenericUnwind);
+ ASSERT(!vm.callFrameForCatch || exit.m_kind == GenericUnwind);
EXCEPTION_ASSERT_UNUSED(scope, !!scope.exception() || !exit.isExceptionHandler());
prepareCodeOriginForOSRExit(exec, exit.m_codeOrigin);
@@ -1063,8 +1063,8 @@
if (exit.m_kind == GenericUnwind) {
// We are acting as a defacto op_catch because we arrive here from genericUnwind().
// So, we must restore our call frame and stack pointer.
- jit.restoreCalleeSavesFromEntryFrameCalleeSavesBuffer(vm->topEntryFrame);
- jit.loadPtr(vm->addressOfCallFrameForCatch(), GPRInfo::callFrameRegister);
+ jit.restoreCalleeSavesFromEntryFrameCalleeSavesBuffer(vm.topEntryFrame);
+ jit.loadPtr(vm.addressOfCallFrameForCatch(), GPRInfo::callFrameRegister);
}
jit.addPtr(
CCallHelpers::TrustedImm32(codeBlock->stackPointerOffset() * sizeof(Register)),
@@ -1072,8 +1072,8 @@
jit.jitAssertHasValidCallFrame();
- if (UNLIKELY(vm->m_perBytecodeProfiler && codeBlock->jitCode()->dfgCommon()->compilation)) {
- Profiler::Database& database = *vm->m_perBytecodeProfiler;
+ if (UNLIKELY(vm.m_perBytecodeProfiler && codeBlock->jitCode()->dfgCommon()->compilation)) {
+ Profiler::Database& database = *vm.m_perBytecodeProfiler;
Profiler::Compilation* compilation = codeBlock->jitCode()->dfgCommon()->compilation.get();
Profiler::OSRExit* profilerExit = compilation->addOSRExit(
@@ -1082,7 +1082,7 @@
jit.add64(CCallHelpers::TrustedImm32(1), CCallHelpers::AbsoluteAddress(profilerExit->counterAddress()));
}
- compileExit(jit, *vm, exit, operands, recovery);
+ compileExit(jit, vm, exit, operands, recovery);
LinkBuffer patchBuffer(jit, codeBlock);
exit.m_code = FINALIZE_CODE_IF(
@@ -1096,7 +1096,7 @@
MacroAssembler::repatchJump(exit.codeLocationForRepatch(), CodeLocationLabel<OSRExitPtrTag>(exit.m_code.code()));
- vm->osrExitJumpDestination = exit.m_code.code().executableAddress();
+ vm.osrExitJumpDestination = exit.m_code.code().executableAddress();
}
void OSRExit::compileExit(CCallHelpers& jit, VM& vm, const OSRExit& exit, const Operands<ValueRecovery>& operands, SpeculationRecovery* recovery)
@@ -1647,14 +1647,14 @@
void JIT_OPERATION OSRExit::debugOperationPrintSpeculationFailure(ExecState* exec, void* debugInfoRaw, void* scratch)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
SpeculationFailureDebugInfo* debugInfo = static_cast<SpeculationFailureDebugInfo*>(debugInfoRaw);
CodeBlock* codeBlock = debugInfo->codeBlock;
CodeBlock* alternative = codeBlock->alternative();
dataLog("Speculation failure in ", *codeBlock);
- dataLog(" @ exit #", vm->osrExitIndex, " (bc#", debugInfo->bytecodeOffset, ", ", exitKindToString(debugInfo->kind), ") with ");
+ dataLog(" @ exit #", vm.osrExitIndex, " (bc#", debugInfo->bytecodeOffset, ", ", exitKindToString(debugInfo->kind), ") with ");
if (alternative) {
dataLog(
"executeCounter = ", alternative->jitExecuteCounter(),
diff --git a/Source/JavaScriptCore/dfg/DFGOSRExitCompilerCommon.h b/Source/JavaScriptCore/dfg/DFGOSRExitCompilerCommon.h
index aee32d5..a0bfd63 100644
--- a/Source/JavaScriptCore/dfg/DFGOSRExitCompilerCommon.h
+++ b/Source/JavaScriptCore/dfg/DFGOSRExitCompilerCommon.h
@@ -41,7 +41,7 @@
void adjustAndJumpToTarget(VM&, CCallHelpers&, const OSRExitBase&);
template <typename JITCodeType>
-void adjustFrameAndStackInOSRExitCompilerThunk(MacroAssembler& jit, VM* vm, JITType jitType)
+void adjustFrameAndStackInOSRExitCompilerThunk(MacroAssembler& jit, VM& vm, JITType jitType)
{
ASSERT(jitType == JITType::DFGJIT || jitType == JITType::FTLJIT);
@@ -58,7 +58,7 @@
if (isFTLOSRExit)
scratchSize += sizeof(void*);
- ScratchBuffer* scratchBuffer = vm->scratchBufferForSize(scratchSize);
+ ScratchBuffer* scratchBuffer = vm.scratchBufferForSize(scratchSize);
char* buffer = static_cast<char*>(scratchBuffer->dataBuffer());
jit.pushToSave(GPRInfo::regT1);
@@ -80,7 +80,7 @@
jit.popToRestore(GPRInfo::regT1);
// We need to reset FP in the case of an exception.
- jit.loadPtr(vm->addressOfCallFrameForCatch(), GPRInfo::regT0);
+ jit.loadPtr(vm.addressOfCallFrameForCatch(), GPRInfo::regT0);
MacroAssembler::Jump didNotHaveException = jit.branchTestPtr(MacroAssembler::Zero, GPRInfo::regT0);
jit.move(GPRInfo::regT0, GPRInfo::callFrameRegister);
didNotHaveException.link(&jit);
diff --git a/Source/JavaScriptCore/dfg/DFGOperations.cpp b/Source/JavaScriptCore/dfg/DFGOperations.cpp
index 25ac86d..ec1dd4f 100644
--- a/Source/JavaScriptCore/dfg/DFGOperations.cpp
+++ b/Source/JavaScriptCore/dfg/DFGOperations.cpp
@@ -189,7 +189,7 @@
char* newTypedArrayWithSize(ExecState* exec, Structure* structure, int32_t size, char* vector)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
if (size < 0) {
@@ -216,9 +216,9 @@
template<typename BigIntOperation, typename NumberOperation>
static ALWAYS_INLINE EncodedJSValue binaryOp(ExecState* exec, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2, BigIntOperation&& bigIntOp, NumberOperation&& numberOp, const char* errorMessage)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
- auto scope = DECLARE_THROW_SCOPE(*vm);
+ auto scope = DECLARE_THROW_SCOPE(vm);
JSValue op1 = JSValue::decode(encodedOp1);
JSValue op2 = JSValue::decode(encodedOp2);
@@ -243,9 +243,9 @@
template<typename BigIntOperation, typename Int32Operation>
static ALWAYS_INLINE EncodedJSValue bitwiseBinaryOp(ExecState* exec, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2, BigIntOperation&& bigIntOp, Int32Operation&& int32Op, const char* errorMessage)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
- auto scope = DECLARE_THROW_SCOPE(*vm);
+ auto scope = DECLARE_THROW_SCOPE(vm);
JSValue op1 = JSValue::decode(encodedOp1);
JSValue op2 = JSValue::decode(encodedOp2);
@@ -289,7 +289,7 @@
EncodedJSValue JIT_OPERATION operationToThis(ExecState* exec, EncodedJSValue encodedOp)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
return JSValue::encode(JSValue::decode(encodedOp).toThis(exec, NotStrictMode));
@@ -297,7 +297,7 @@
EncodedJSValue JIT_OPERATION operationToThisStrict(ExecState* exec, EncodedJSValue encodedOp)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
return JSValue::encode(JSValue::decode(encodedOp).toThis(exec, StrictMode));
@@ -306,7 +306,7 @@
JSArray* JIT_OPERATION operationObjectKeys(ExecState* exec, EncodedJSValue encodedObject)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
JSObject* object = JSValue::decode(encodedObject).toObject(exec);
@@ -318,14 +318,14 @@
JSArray* JIT_OPERATION operationObjectKeysObject(ExecState* exec, JSObject* object)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return ownPropertyKeys(exec, object, PropertyNameMode::Strings, DontEnumPropertiesMode::Exclude);
}
JSCell* JIT_OPERATION operationObjectCreate(ExecState* exec, EncodedJSValue encodedPrototype)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue prototype = JSValue::decode(encodedPrototype);
@@ -343,14 +343,14 @@
JSCell* JIT_OPERATION operationObjectCreateObject(ExecState* exec, JSObject* prototype)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return constructEmptyObject(exec, prototype);
}
JSCell* JIT_OPERATION operationCreateThis(ExecState* exec, JSObject* constructor, uint32_t inlineCapacity)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
if (constructor->type() == JSFunctionType && jsCast<JSFunction*>(constructor)->canUseAllocationProfile()) {
auto rareData = jsCast<JSFunction*>(constructor)->ensureRareDataAndAllocationProfile(exec, inlineCapacity);
@@ -377,7 +377,7 @@
JSCell* JIT_OPERATION operationCallObjectConstructor(ExecState* exec, JSGlobalObject* globalObject, EncodedJSValue encodedTarget)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
JSValue value = JSValue::decode(encodedTarget);
@@ -390,9 +390,9 @@
JSCell* JIT_OPERATION operationToObject(ExecState* exec, JSGlobalObject* globalObject, EncodedJSValue encodedTarget, UniquedStringImpl* errorMessage)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
- auto scope = DECLARE_THROW_SCOPE(*vm);
+ auto scope = DECLARE_THROW_SCOPE(vm);
JSValue value = JSValue::decode(encodedTarget);
ASSERT(!value.isObject());
@@ -422,9 +422,9 @@
EncodedJSValue JIT_OPERATION operationValueBitNot(ExecState* exec, EncodedJSValue encodedOp1)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
- auto scope = DECLARE_THROW_SCOPE(*vm);
+ auto scope = DECLARE_THROW_SCOPE(vm);
JSValue op1 = JSValue::decode(encodedOp1);
@@ -491,9 +491,9 @@
EncodedJSValue JIT_OPERATION operationValueBitRShift(ExecState* exec, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
- auto scope = DECLARE_THROW_SCOPE(*vm);
+ auto scope = DECLARE_THROW_SCOPE(vm);
JSValue op1 = JSValue::decode(encodedOp1);
JSValue op2 = JSValue::decode(encodedOp2);
@@ -507,9 +507,9 @@
EncodedJSValue JIT_OPERATION operationValueBitURShift(ExecState* exec, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
- auto scope = DECLARE_THROW_SCOPE(*vm);
+ auto scope = DECLARE_THROW_SCOPE(vm);
JSValue op1 = JSValue::decode(encodedOp1);
JSValue op2 = JSValue::decode(encodedOp2);
@@ -523,7 +523,7 @@
EncodedJSValue JIT_OPERATION operationValueAddNotNumber(ExecState* exec, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
JSValue op1 = JSValue::decode(encodedOp1);
@@ -560,9 +560,9 @@
double JIT_OPERATION operationArithAbs(ExecState* exec, EncodedJSValue encodedOp1)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
- auto scope = DECLARE_THROW_SCOPE(*vm);
+ auto scope = DECLARE_THROW_SCOPE(vm);
JSValue op1 = JSValue::decode(encodedOp1);
double a = op1.toNumber(exec);
@@ -572,9 +572,9 @@
uint32_t JIT_OPERATION operationArithClz32(ExecState* exec, EncodedJSValue encodedOp1)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
- auto scope = DECLARE_THROW_SCOPE(*vm);
+ auto scope = DECLARE_THROW_SCOPE(vm);
JSValue op1 = JSValue::decode(encodedOp1);
uint32_t value = op1.toUInt32(exec);
@@ -584,9 +584,9 @@
double JIT_OPERATION operationArithFRound(ExecState* exec, EncodedJSValue encodedOp1)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
- auto scope = DECLARE_THROW_SCOPE(*vm);
+ auto scope = DECLARE_THROW_SCOPE(vm);
JSValue op1 = JSValue::decode(encodedOp1);
double a = op1.toNumber(exec);
@@ -597,9 +597,9 @@
#define DFG_ARITH_UNARY(capitalizedName, lowerName) \
double JIT_OPERATION operationArith##capitalizedName(ExecState* exec, EncodedJSValue encodedOp1) \
{ \
- VM* vm = &exec->vm(); \
+ VM& vm = exec->vm(); \
NativeCallFrameTracer tracer(vm, exec); \
- auto scope = DECLARE_THROW_SCOPE(*vm); \
+ auto scope = DECLARE_THROW_SCOPE(vm); \
JSValue op1 = JSValue::decode(encodedOp1); \
double result = op1.toNumber(exec); \
RETURN_IF_EXCEPTION(scope, PNaN); \
@@ -610,9 +610,9 @@
double JIT_OPERATION operationArithSqrt(ExecState* exec, EncodedJSValue encodedOp1)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
- auto scope = DECLARE_THROW_SCOPE(*vm);
+ auto scope = DECLARE_THROW_SCOPE(vm);
JSValue op1 = JSValue::decode(encodedOp1);
double a = op1.toNumber(exec);
@@ -622,9 +622,9 @@
EncodedJSValue JIT_OPERATION operationArithRound(ExecState* exec, EncodedJSValue encodedArgument)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
- auto scope = DECLARE_THROW_SCOPE(*vm);
+ auto scope = DECLARE_THROW_SCOPE(vm);
JSValue argument = JSValue::decode(encodedArgument);
double valueOfArgument = argument.toNumber(exec);
@@ -634,9 +634,9 @@
EncodedJSValue JIT_OPERATION operationArithFloor(ExecState* exec, EncodedJSValue encodedArgument)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
- auto scope = DECLARE_THROW_SCOPE(*vm);
+ auto scope = DECLARE_THROW_SCOPE(vm);
JSValue argument = JSValue::decode(encodedArgument);
double valueOfArgument = argument.toNumber(exec);
@@ -646,9 +646,9 @@
EncodedJSValue JIT_OPERATION operationArithCeil(ExecState* exec, EncodedJSValue encodedArgument)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
- auto scope = DECLARE_THROW_SCOPE(*vm);
+ auto scope = DECLARE_THROW_SCOPE(vm);
JSValue argument = JSValue::decode(encodedArgument);
double valueOfArgument = argument.toNumber(exec);
@@ -658,9 +658,9 @@
EncodedJSValue JIT_OPERATION operationArithTrunc(ExecState* exec, EncodedJSValue encodedArgument)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
- auto scope = DECLARE_THROW_SCOPE(*vm);
+ auto scope = DECLARE_THROW_SCOPE(vm);
JSValue argument = JSValue::decode(encodedArgument);
double truncatedValueOfArgument = argument.toIntegerPreserveNaN(exec);
@@ -671,7 +671,7 @@
static ALWAYS_INLINE EncodedJSValue getByVal(ExecState* exec, JSCell* base, uint32_t index)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
if (base->isObject()) {
JSObject* object = asObject(base);
@@ -688,7 +688,7 @@
EncodedJSValue JIT_OPERATION operationGetByVal(ExecState* exec, EncodedJSValue encodedBase, EncodedJSValue encodedProperty)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue baseValue = JSValue::decode(encodedBase);
@@ -729,7 +729,7 @@
EncodedJSValue JIT_OPERATION operationGetByValCell(ExecState* exec, JSCell* base, EncodedJSValue encodedProperty)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue property = JSValue::decode(encodedProperty);
@@ -762,12 +762,12 @@
ALWAYS_INLINE EncodedJSValue getByValCellInt(ExecState* exec, JSCell* base, int32_t index)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
if (index < 0) {
// Go the slowest way possible because negative indices don't use indexed storage.
- return JSValue::encode(JSValue(base).get(exec, Identifier::from(exec, index)));
+ return JSValue::encode(JSValue(base).get(exec, Identifier::from(vm, index)));
}
// Use this since we know that the value is out of bounds.
@@ -787,7 +787,7 @@
EncodedJSValue JIT_OPERATION operationGetByValObjectString(ExecState* exec, JSCell* base, JSCell* string)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
@@ -800,7 +800,7 @@
EncodedJSValue JIT_OPERATION operationGetByValObjectSymbol(ExecState* exec, JSCell* base, JSCell* symbol)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto propertyName = asSymbol(symbol)->privateName();
return JSValue::encode(getByValObject(exec, vm, asObject(base), propertyName));
@@ -809,7 +809,7 @@
void JIT_OPERATION operationPutByValStrict(ExecState* exec, EncodedJSValue encodedBase, EncodedJSValue encodedProperty, EncodedJSValue encodedValue)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
putByValInternal<true, false>(exec, vm, encodedBase, encodedProperty, encodedValue);
}
@@ -817,7 +817,7 @@
void JIT_OPERATION operationPutByValNonStrict(ExecState* exec, EncodedJSValue encodedBase, EncodedJSValue encodedProperty, EncodedJSValue encodedValue)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
putByValInternal<false, false>(exec, vm, encodedBase, encodedProperty, encodedValue);
}
@@ -825,7 +825,7 @@
void JIT_OPERATION operationPutByValCellStrict(ExecState* exec, JSCell* cell, EncodedJSValue encodedProperty, EncodedJSValue encodedValue)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
putByValInternal<true, false>(exec, vm, JSValue::encode(cell), encodedProperty, encodedValue);
}
@@ -833,7 +833,7 @@
void JIT_OPERATION operationPutByValCellNonStrict(ExecState* exec, JSCell* cell, EncodedJSValue encodedProperty, EncodedJSValue encodedValue)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
putByValInternal<false, false>(exec, vm, JSValue::encode(cell), encodedProperty, encodedValue);
}
@@ -841,7 +841,7 @@
void JIT_OPERATION operationPutByValCellStringStrict(ExecState* exec, JSCell* cell, JSCell* string, EncodedJSValue encodedValue)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
putByValCellStringInternal<true, false>(exec, vm, cell, asString(string), JSValue::decode(encodedValue));
}
@@ -849,7 +849,7 @@
void JIT_OPERATION operationPutByValCellStringNonStrict(ExecState* exec, JSCell* cell, JSCell* string, EncodedJSValue encodedValue)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
putByValCellStringInternal<false, false>(exec, vm, cell, asString(string), JSValue::decode(encodedValue));
}
@@ -857,7 +857,7 @@
void JIT_OPERATION operationPutByValCellSymbolStrict(ExecState* exec, JSCell* cell, JSCell* symbol, EncodedJSValue encodedValue)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto propertyName = asSymbol(symbol)->privateName();
putByValCellInternal<true, false>(exec, vm, cell, propertyName, JSValue::decode(encodedValue));
@@ -866,7 +866,7 @@
void JIT_OPERATION operationPutByValCellSymbolNonStrict(ExecState* exec, JSCell* cell, JSCell* symbol, EncodedJSValue encodedValue)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto propertyName = asSymbol(symbol)->privateName();
putByValCellInternal<false, false>(exec, vm, cell, propertyName, JSValue::decode(encodedValue));
@@ -875,7 +875,7 @@
void JIT_OPERATION operationPutByValBeyondArrayBoundsStrict(ExecState* exec, JSObject* object, int32_t index, EncodedJSValue encodedValue)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
if (index >= 0) {
object->putByIndexInline(exec, index, JSValue::decode(encodedValue), true);
@@ -884,12 +884,12 @@
PutPropertySlot slot(object, true);
object->methodTable(vm)->put(
- object, exec, Identifier::from(exec, index), JSValue::decode(encodedValue), slot);
+ object, exec, Identifier::from(vm, index), JSValue::decode(encodedValue), slot);
}
void JIT_OPERATION operationPutByValBeyondArrayBoundsNonStrict(ExecState* exec, JSObject* object, int32_t index, EncodedJSValue encodedValue)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
if (index >= 0) {
@@ -898,13 +898,13 @@
}
PutPropertySlot slot(object, false);
- object->methodTable(*vm)->put(
- object, exec, Identifier::from(exec, index), JSValue::decode(encodedValue), slot);
+ object->methodTable(vm)->put(
+ object, exec, Identifier::from(vm, index), JSValue::decode(encodedValue), slot);
}
void JIT_OPERATION operationPutDoubleByValBeyondArrayBoundsStrict(ExecState* exec, JSObject* object, int32_t index, double value)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
JSValue jsValue = JSValue(JSValue::EncodeAsDouble, value);
@@ -915,13 +915,13 @@
}
PutPropertySlot slot(object, true);
- object->methodTable(*vm)->put(
- object, exec, Identifier::from(exec, index), jsValue, slot);
+ object->methodTable(vm)->put(
+ object, exec, Identifier::from(vm, index), jsValue, slot);
}
void JIT_OPERATION operationPutDoubleByValBeyondArrayBoundsNonStrict(ExecState* exec, JSObject* object, int32_t index, double value)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
JSValue jsValue = JSValue(JSValue::EncodeAsDouble, value);
@@ -932,14 +932,14 @@
}
PutPropertySlot slot(object, false);
- object->methodTable(*vm)->put(
- object, exec, Identifier::from(exec, index), jsValue, slot);
+ object->methodTable(vm)->put(
+ object, exec, Identifier::from(vm, index), jsValue, slot);
}
void JIT_OPERATION operationPutDoubleByValDirectBeyondArrayBoundsStrict(ExecState* exec, JSObject* object, int32_t index, double value)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
JSValue jsValue = JSValue(JSValue::EncodeAsDouble, value);
@@ -949,13 +949,13 @@
}
PutPropertySlot slot(object, true);
- CommonSlowPaths::putDirectWithReify(vm, exec, object, Identifier::from(exec, index), jsValue, slot);
+ CommonSlowPaths::putDirectWithReify(vm, exec, object, Identifier::from(vm, index), jsValue, slot);
}
void JIT_OPERATION operationPutDoubleByValDirectBeyondArrayBoundsNonStrict(ExecState* exec, JSObject* object, int32_t index, double value)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
JSValue jsValue = JSValue(JSValue::EncodeAsDouble, value);
@@ -965,13 +965,13 @@
}
PutPropertySlot slot(object, false);
- CommonSlowPaths::putDirectWithReify(vm, exec, object, Identifier::from(exec, index), jsValue, slot);
+ CommonSlowPaths::putDirectWithReify(vm, exec, object, Identifier::from(vm, index), jsValue, slot);
}
void JIT_OPERATION operationPutByValDirectStrict(ExecState* exec, EncodedJSValue encodedBase, EncodedJSValue encodedProperty, EncodedJSValue encodedValue)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
putByValInternal<true, true>(exec, vm, encodedBase, encodedProperty, encodedValue);
}
@@ -979,7 +979,7 @@
void JIT_OPERATION operationPutByValDirectNonStrict(ExecState* exec, EncodedJSValue encodedBase, EncodedJSValue encodedProperty, EncodedJSValue encodedValue)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
putByValInternal<false, true>(exec, vm, encodedBase, encodedProperty, encodedValue);
}
@@ -987,7 +987,7 @@
void JIT_OPERATION operationPutByValDirectCellStrict(ExecState* exec, JSCell* cell, EncodedJSValue encodedProperty, EncodedJSValue encodedValue)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
putByValInternal<true, true>(exec, vm, JSValue::encode(cell), encodedProperty, encodedValue);
}
@@ -995,7 +995,7 @@
void JIT_OPERATION operationPutByValDirectCellNonStrict(ExecState* exec, JSCell* cell, EncodedJSValue encodedProperty, EncodedJSValue encodedValue)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
putByValInternal<false, true>(exec, vm, JSValue::encode(cell), encodedProperty, encodedValue);
}
@@ -1003,7 +1003,7 @@
void JIT_OPERATION operationPutByValDirectCellStringStrict(ExecState* exec, JSCell* cell, JSCell* string, EncodedJSValue encodedValue)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
putByValCellStringInternal<true, true>(exec, vm, cell, asString(string), JSValue::decode(encodedValue));
}
@@ -1011,7 +1011,7 @@
void JIT_OPERATION operationPutByValDirectCellStringNonStrict(ExecState* exec, JSCell* cell, JSCell* string, EncodedJSValue encodedValue)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
putByValCellStringInternal<false, true>(exec, vm, cell, asString(string), JSValue::decode(encodedValue));
}
@@ -1019,7 +1019,7 @@
void JIT_OPERATION operationPutByValDirectCellSymbolStrict(ExecState* exec, JSCell* cell, JSCell* symbol, EncodedJSValue encodedValue)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto propertyName = asSymbol(symbol)->privateName();
putByValCellInternal<true, true>(exec, vm, cell, propertyName, JSValue::decode(encodedValue));
@@ -1028,7 +1028,7 @@
void JIT_OPERATION operationPutByValDirectCellSymbolNonStrict(ExecState* exec, JSCell* cell, JSCell* symbol, EncodedJSValue encodedValue)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto propertyName = asSymbol(symbol)->privateName();
putByValCellInternal<false, true>(exec, vm, cell, propertyName, JSValue::decode(encodedValue));
@@ -1037,20 +1037,20 @@
void JIT_OPERATION operationPutByValDirectBeyondArrayBoundsStrict(ExecState* exec, JSObject* object, int32_t index, EncodedJSValue encodedValue)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
if (index >= 0) {
object->putDirectIndex(exec, index, JSValue::decode(encodedValue), 0, PutDirectIndexShouldThrow);
return;
}
PutPropertySlot slot(object, true);
- CommonSlowPaths::putDirectWithReify(vm, exec, object, Identifier::from(exec, index), JSValue::decode(encodedValue), slot);
+ CommonSlowPaths::putDirectWithReify(vm, exec, object, Identifier::from(vm, index), JSValue::decode(encodedValue), slot);
}
void JIT_OPERATION operationPutByValDirectBeyondArrayBoundsNonStrict(ExecState* exec, JSObject* object, int32_t index, EncodedJSValue encodedValue)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
if (index >= 0) {
object->putDirectIndex(exec, index, JSValue::decode(encodedValue));
@@ -1058,12 +1058,12 @@
}
PutPropertySlot slot(object, false);
- CommonSlowPaths::putDirectWithReify(vm, exec, object, Identifier::from(exec, index), JSValue::decode(encodedValue), slot);
+ CommonSlowPaths::putDirectWithReify(vm, exec, object, Identifier::from(vm, index), JSValue::decode(encodedValue), slot);
}
EncodedJSValue JIT_OPERATION operationArrayPush(ExecState* exec, EncodedJSValue encodedValue, JSArray* array)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
array->pushInline(exec, JSValue::decode(encodedValue));
@@ -1072,7 +1072,7 @@
EncodedJSValue JIT_OPERATION operationArrayPushDouble(ExecState* exec, double value, JSArray* array)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
array->pushInline(exec, JSValue(JSValue::EncodeAsDouble, value));
@@ -1082,7 +1082,7 @@
EncodedJSValue JIT_OPERATION operationArrayPushMultiple(ExecState* exec, JSArray* array, void* buffer, int32_t elementCount)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
// We assume that multiple JSArray::push calls with ArrayWithInt32/ArrayWithContiguous do not cause JS traps.
@@ -1106,7 +1106,7 @@
EncodedJSValue JIT_OPERATION operationArrayPushDoubleMultiple(ExecState* exec, JSArray* array, void* buffer, int32_t elementCount)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
// We assume that multiple JSArray::push calls with ArrayWithDouble do not cause JS traps.
@@ -1125,7 +1125,7 @@
EncodedJSValue JIT_OPERATION operationArrayPop(ExecState* exec, JSArray* array)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
return JSValue::encode(array->pop(exec));
@@ -1133,7 +1133,7 @@
EncodedJSValue JIT_OPERATION operationArrayPopAndRecoverLength(ExecState* exec, JSArray* array)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
array->butterfly()->setPublicLength(array->butterfly()->publicLength() + 1);
@@ -1146,7 +1146,7 @@
SuperSamplerScope superSamplerScope(false);
VM& vm = globalObject->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return JSValue::encode(regExpObject->execInline(exec, globalObject, argument));
}
@@ -1156,7 +1156,7 @@
SuperSamplerScope superSamplerScope(false);
VM& vm = globalObject->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue argument = JSValue::decode(encodedArgument);
@@ -1173,7 +1173,7 @@
SuperSamplerScope superSamplerScope(false);
VM& vm = globalObject->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue base = JSValue::decode(encodedBase);
@@ -1195,7 +1195,7 @@
SuperSamplerScope superSamplerScope(false);
VM& vm = globalObject->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
@@ -1220,7 +1220,7 @@
SuperSamplerScope superSamplerScope(false);
VM& vm = globalObject->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
if (!regExpObject->regExp()->global())
return JSValue::encode(regExpObject->execInline(exec, globalObject, argument));
@@ -1232,7 +1232,7 @@
SuperSamplerScope superSamplerScope(false);
VM& vm = globalObject->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
@@ -1260,7 +1260,7 @@
EncodedJSValue JIT_OPERATION operationParseIntNoRadixGeneric(ExecState* exec, EncodedJSValue value)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return toStringView(exec, JSValue::decode(value), [&] (StringView view) {
// This version is as if radix was undefined. Hence, undefined.toNumber() === 0.
@@ -1271,7 +1271,7 @@
EncodedJSValue JIT_OPERATION operationParseIntStringNoRadix(ExecState* exec, JSString* string)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
auto viewWithString = string->viewWithUnderlyingString(exec);
@@ -1284,7 +1284,7 @@
EncodedJSValue JIT_OPERATION operationParseIntString(ExecState* exec, JSString* string, int32_t radix)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
auto viewWithString = string->viewWithUnderlyingString(exec);
@@ -1296,7 +1296,7 @@
EncodedJSValue JIT_OPERATION operationParseIntGeneric(ExecState* exec, EncodedJSValue value, int32_t radix)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return toStringView(exec, JSValue::decode(value), [&] (StringView view) {
return parseIntResult(parseInt(view, radix));
@@ -1308,7 +1308,7 @@
SuperSamplerScope superSamplerScope(false);
VM& vm = globalObject->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return regExpObject->testInline(exec, globalObject, input);
}
@@ -1318,7 +1318,7 @@
SuperSamplerScope superSamplerScope(false);
VM& vm = globalObject->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
JSValue argument = JSValue::decode(encodedArgument);
@@ -1333,7 +1333,7 @@
SuperSamplerScope superSamplerScope(false);
VM& vm = globalObject->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue base = JSValue::decode(encodedBase);
@@ -1354,7 +1354,7 @@
JSCell* JIT_OPERATION operationSubBigInt(ExecState* exec, JSCell* op1, JSCell* op2)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
JSBigInt* leftOperand = jsCast<JSBigInt*>(op1);
@@ -1365,7 +1365,7 @@
JSCell* JIT_OPERATION operationBitNotBigInt(ExecState* exec, JSCell* op1)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
JSBigInt* operand = jsCast<JSBigInt*>(op1);
@@ -1375,7 +1375,7 @@
JSCell* JIT_OPERATION operationMulBigInt(ExecState* exec, JSCell* op1, JSCell* op2)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
JSBigInt* leftOperand = jsCast<JSBigInt*>(op1);
@@ -1386,7 +1386,7 @@
JSCell* JIT_OPERATION operationModBigInt(ExecState* exec, JSCell* op1, JSCell* op2)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
JSBigInt* leftOperand = jsCast<JSBigInt*>(op1);
@@ -1397,7 +1397,7 @@
JSCell* JIT_OPERATION operationDivBigInt(ExecState* exec, JSCell* op1, JSCell* op2)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
JSBigInt* leftOperand = jsCast<JSBigInt*>(op1);
@@ -1408,7 +1408,7 @@
JSCell* JIT_OPERATION operationPowBigInt(ExecState* exec, JSCell* op1, JSCell* op2)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
JSBigInt* leftOperand = jsCast<JSBigInt*>(op1);
@@ -1419,7 +1419,7 @@
JSCell* JIT_OPERATION operationBitAndBigInt(ExecState* exec, JSCell* op1, JSCell* op2)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
JSBigInt* leftOperand = jsCast<JSBigInt*>(op1);
@@ -1430,7 +1430,7 @@
JSCell* JIT_OPERATION operationBitLShiftBigInt(ExecState* exec, JSCell* op1, JSCell* op2)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
JSBigInt* leftOperand = jsCast<JSBigInt*>(op1);
@@ -1441,7 +1441,7 @@
JSCell* JIT_OPERATION operationAddBigInt(ExecState* exec, JSCell* op1, JSCell* op2)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
JSBigInt* leftOperand = jsCast<JSBigInt*>(op1);
@@ -1452,7 +1452,7 @@
JSCell* JIT_OPERATION operationBitOrBigInt(ExecState* exec, JSCell* op1, JSCell* op2)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
JSBigInt* leftOperand = jsCast<JSBigInt*>(op1);
@@ -1463,7 +1463,7 @@
JSCell* JIT_OPERATION operationBitXorBigInt(ExecState* exec, JSCell* op1, JSCell* op2)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
JSBigInt* leftOperand = jsCast<JSBigInt*>(op1);
@@ -1474,7 +1474,7 @@
size_t JIT_OPERATION operationCompareStrictEqCell(ExecState* exec, JSCell* op1, JSCell* op2)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
return JSValue::strictEqualSlowCaseInline(exec, op1, op2);
@@ -1483,14 +1483,14 @@
size_t JIT_OPERATION operationSameValue(ExecState* exec, EncodedJSValue arg1, EncodedJSValue arg2)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return sameValue(exec, JSValue::decode(arg1), JSValue::decode(arg2));
}
EncodedJSValue JIT_OPERATION operationToPrimitive(ExecState* exec, EncodedJSValue value)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
return JSValue::encode(JSValue::decode(value).toPrimitive(exec));
@@ -1498,7 +1498,7 @@
EncodedJSValue JIT_OPERATION operationToNumber(ExecState* exec, EncodedJSValue value)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
return JSValue::encode(jsNumber(JSValue::decode(value).toNumber(exec)));
@@ -1507,7 +1507,7 @@
EncodedJSValue JIT_OPERATION operationGetByValWithThis(ExecState* exec, EncodedJSValue encodedBase, EncodedJSValue encodedThis, EncodedJSValue encodedSubscript)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue baseValue = JSValue::decode(encodedBase);
@@ -1546,23 +1546,23 @@
void JIT_OPERATION operationPutByIdWithThisStrict(ExecState* exec, EncodedJSValue encodedBase, EncodedJSValue encodedThis, EncodedJSValue encodedValue, UniquedStringImpl* impl)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
- putWithThis<true>(exec, encodedBase, encodedThis, encodedValue, Identifier::fromUid(exec, impl));
+ putWithThis<true>(exec, encodedBase, encodedThis, encodedValue, Identifier::fromUid(vm, impl));
}
void JIT_OPERATION operationPutByIdWithThis(ExecState* exec, EncodedJSValue encodedBase, EncodedJSValue encodedThis, EncodedJSValue encodedValue, UniquedStringImpl* impl)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
- putWithThis<false>(exec, encodedBase, encodedThis, encodedValue, Identifier::fromUid(exec, impl));
+ putWithThis<false>(exec, encodedBase, encodedThis, encodedValue, Identifier::fromUid(vm, impl));
}
void JIT_OPERATION operationPutByValWithThisStrict(ExecState* exec, EncodedJSValue encodedBase, EncodedJSValue encodedThis, EncodedJSValue encodedSubscript, EncodedJSValue encodedValue)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
Identifier property = JSValue::decode(encodedSubscript).toPropertyKey(exec);
@@ -1574,7 +1574,7 @@
void JIT_OPERATION operationPutByValWithThis(ExecState* exec, EncodedJSValue encodedBase, EncodedJSValue encodedThis, EncodedJSValue encodedSubscript, EncodedJSValue encodedValue)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
Identifier property = JSValue::decode(encodedSubscript).toPropertyKey(exec);
@@ -1596,7 +1596,7 @@
void JIT_OPERATION operationDefineDataProperty(ExecState* exec, JSObject* base, EncodedJSValue encodedProperty, EncodedJSValue encodedValue, int32_t attributes)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
Identifier propertyName = JSValue::decode(encodedProperty).toPropertyKey(exec);
@@ -1608,7 +1608,7 @@
void JIT_OPERATION operationDefineDataPropertyString(ExecState* exec, JSObject* base, JSString* property, EncodedJSValue encodedValue, int32_t attributes)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
Identifier propertyName = property->toIdentifier(exec);
@@ -1620,14 +1620,14 @@
void JIT_OPERATION operationDefineDataPropertyStringIdent(ExecState* exec, JSObject* base, UniquedStringImpl* property, EncodedJSValue encodedValue, int32_t attributes)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
- defineDataProperty(exec, vm, base, Identifier::fromUid(&vm, property), JSValue::decode(encodedValue), attributes);
+ NativeCallFrameTracer tracer(vm, exec);
+ defineDataProperty(exec, vm, base, Identifier::fromUid(vm, property), JSValue::decode(encodedValue), attributes);
}
void JIT_OPERATION operationDefineDataPropertySymbol(ExecState* exec, JSObject* base, Symbol* property, EncodedJSValue encodedValue, int32_t attributes)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
defineDataProperty(exec, vm, base, Identifier::fromUid(property->privateName()), JSValue::decode(encodedValue), attributes);
}
@@ -1644,7 +1644,7 @@
void JIT_OPERATION operationDefineAccessorProperty(ExecState* exec, JSObject* base, EncodedJSValue encodedProperty, JSObject* getter, JSObject* setter, int32_t attributes)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
Identifier propertyName = JSValue::decode(encodedProperty).toPropertyKey(exec);
@@ -1655,7 +1655,7 @@
void JIT_OPERATION operationDefineAccessorPropertyString(ExecState* exec, JSObject* base, JSString* property, JSObject* getter, JSObject* setter, int32_t attributes)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
Identifier propertyName = property->toIdentifier(exec);
@@ -1666,20 +1666,20 @@
void JIT_OPERATION operationDefineAccessorPropertyStringIdent(ExecState* exec, JSObject* base, UniquedStringImpl* property, JSObject* getter, JSObject* setter, int32_t attributes)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
- defineAccessorProperty(exec, vm, base, Identifier::fromUid(&vm, property), getter, setter, attributes);
+ NativeCallFrameTracer tracer(vm, exec);
+ defineAccessorProperty(exec, vm, base, Identifier::fromUid(vm, property), getter, setter, attributes);
}
void JIT_OPERATION operationDefineAccessorPropertySymbol(ExecState* exec, JSObject* base, Symbol* property, JSObject* getter, JSObject* setter, int32_t attributes)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
defineAccessorProperty(exec, vm, base, Identifier::fromUid(property->privateName()), getter, setter, attributes);
}
char* JIT_OPERATION operationNewArray(ExecState* exec, Structure* arrayStructure, void* buffer, size_t size)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
return bitwise_cast<char*>(constructArray(exec, arrayStructure, static_cast<JSValue*>(buffer), size));
@@ -1687,16 +1687,16 @@
char* JIT_OPERATION operationNewEmptyArray(ExecState* exec, Structure* arrayStructure)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
- return bitwise_cast<char*>(JSArray::create(*vm, arrayStructure));
+ return bitwise_cast<char*>(JSArray::create(vm, arrayStructure));
}
char* JIT_OPERATION operationNewArrayWithSize(ExecState* exec, Structure* arrayStructure, int32_t size, Butterfly* butterfly)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
if (UNLIKELY(size < 0))
@@ -1713,7 +1713,7 @@
char* JIT_OPERATION operationNewArrayWithSizeAndHint(ExecState* exec, Structure* arrayStructure, int32_t size, int32_t vectorLengthHint, Butterfly* butterfly)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
if (UNLIKELY(size < 0))
@@ -1732,7 +1732,7 @@
JSCell* JIT_OPERATION operationNewArrayBuffer(ExecState* exec, Structure* arrayStructure, JSCell* immutableButterflyCell)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
ASSERT(!arrayStructure->outOfLineCapacity());
auto* immutableButterfly = jsCast<JSImmutableButterfly*>(immutableButterflyCell);
ASSERT(arrayStructure->indexingMode() == immutableButterfly->indexingMode() || hasAnyArrayStorage(arrayStructure->indexingMode()));
@@ -1752,7 +1752,7 @@
ExecState* exec, Structure* structure, EncodedJSValue encodedValue)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return reinterpret_cast<char*>(constructGenericTypedArrayViewWithArguments<JSInt8Array>(exec, structure, encodedValue, 0, WTF::nullopt));
}
@@ -1766,7 +1766,7 @@
ExecState* exec, Structure* structure, EncodedJSValue encodedValue)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return reinterpret_cast<char*>(constructGenericTypedArrayViewWithArguments<JSInt16Array>(exec, structure, encodedValue, 0, WTF::nullopt));
}
@@ -1780,7 +1780,7 @@
ExecState* exec, Structure* structure, EncodedJSValue encodedValue)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return reinterpret_cast<char*>(constructGenericTypedArrayViewWithArguments<JSInt32Array>(exec, structure, encodedValue, 0, WTF::nullopt));
}
@@ -1794,7 +1794,7 @@
ExecState* exec, Structure* structure, EncodedJSValue encodedValue)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return reinterpret_cast<char*>(constructGenericTypedArrayViewWithArguments<JSUint8Array>(exec, structure, encodedValue, 0, WTF::nullopt));
}
@@ -1808,7 +1808,7 @@
ExecState* exec, Structure* structure, EncodedJSValue encodedValue)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return reinterpret_cast<char*>(constructGenericTypedArrayViewWithArguments<JSUint8ClampedArray>(exec, structure, encodedValue, 0, WTF::nullopt));
}
@@ -1822,7 +1822,7 @@
ExecState* exec, Structure* structure, EncodedJSValue encodedValue)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return reinterpret_cast<char*>(constructGenericTypedArrayViewWithArguments<JSUint16Array>(exec, structure, encodedValue, 0, WTF::nullopt));
}
@@ -1836,7 +1836,7 @@
ExecState* exec, Structure* structure, EncodedJSValue encodedValue)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return reinterpret_cast<char*>(constructGenericTypedArrayViewWithArguments<JSUint32Array>(exec, structure, encodedValue, 0, WTF::nullopt));
}
@@ -1850,7 +1850,7 @@
ExecState* exec, Structure* structure, EncodedJSValue encodedValue)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return reinterpret_cast<char*>(constructGenericTypedArrayViewWithArguments<JSFloat32Array>(exec, structure, encodedValue, 0, WTF::nullopt));
}
@@ -1864,23 +1864,23 @@
ExecState* exec, Structure* structure, EncodedJSValue encodedValue)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return reinterpret_cast<char*>(constructGenericTypedArrayViewWithArguments<JSFloat64Array>(exec, structure, encodedValue, 0, WTF::nullopt));
}
JSCell* JIT_OPERATION operationCreateActivationDirect(ExecState* exec, Structure* structure, JSScope* scope, SymbolTable* table, EncodedJSValue initialValueEncoded)
{
+ VM& vm = exec->vm();
+ NativeCallFrameTracer tracer(vm, exec);
JSValue initialValue = JSValue::decode(initialValueEncoded);
ASSERT(initialValue == jsUndefined() || initialValue == jsTDZValue());
- VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
return JSLexicalEnvironment::create(vm, structure, scope, table, initialValue);
}
JSCell* JIT_OPERATION operationCreateDirectArguments(ExecState* exec, Structure* structure, uint32_t length, uint32_t minCapacity)
{
VM& vm = exec->vm();
- NativeCallFrameTracer target(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
DirectArguments* result = DirectArguments::create(
vm, structure, length, std::max(length, minCapacity));
// The caller will store to this object without barriers. Most likely, at this point, this is
@@ -1893,7 +1893,7 @@
JSCell* JIT_OPERATION operationCreateScopedArguments(ExecState* exec, Structure* structure, Register* argumentStart, uint32_t length, JSFunction* callee, JSLexicalEnvironment* scope)
{
VM& vm = exec->vm();
- NativeCallFrameTracer target(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
// We could pass the ScopedArgumentsTable* as an argument. We currently don't because I
// didn't feel like changing the max number of arguments for a slow path call from 6 to 7.
@@ -1906,7 +1906,7 @@
JSCell* JIT_OPERATION operationCreateClonedArguments(ExecState* exec, Structure* structure, Register* argumentStart, uint32_t length, JSFunction* callee)
{
VM& vm = exec->vm();
- NativeCallFrameTracer target(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return ClonedArguments::createByCopyingFrom(
exec, structure, argumentStart, length, callee);
}
@@ -1914,7 +1914,7 @@
JSCell* JIT_OPERATION operationCreateDirectArgumentsDuringExit(ExecState* exec, InlineCallFrame* inlineCallFrame, JSFunction* callee, uint32_t argumentCount)
{
VM& vm = exec->vm();
- NativeCallFrameTracer target(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
DeferGCForAWhile deferGC(vm.heap);
@@ -1943,7 +1943,7 @@
JSCell* JIT_OPERATION operationCreateClonedArgumentsDuringExit(ExecState* exec, InlineCallFrame* inlineCallFrame, JSFunction* callee, uint32_t argumentCount)
{
VM& vm = exec->vm();
- NativeCallFrameTracer target(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
DeferGCForAWhile deferGC(vm.heap);
@@ -1969,7 +1969,7 @@
JSCell* JIT_OPERATION operationCreateRest(ExecState* exec, Register* argumentStart, unsigned numberOfParamsToSkip, unsigned arraySize)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
JSGlobalObject* globalObject = exec->lexicalGlobalObject();
@@ -1982,7 +1982,7 @@
size_t JIT_OPERATION operationObjectIsObject(ExecState* exec, JSGlobalObject* globalObject, JSCell* object)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
ASSERT(jsDynamicCast<JSObject*>(vm, object));
@@ -1996,7 +1996,7 @@
size_t JIT_OPERATION operationObjectIsFunction(ExecState* exec, JSGlobalObject* globalObject, JSCell* object)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
ASSERT(jsDynamicCast<JSObject*>(vm, object));
@@ -2010,7 +2010,7 @@
JSCell* JIT_OPERATION operationTypeOfObject(ExecState* exec, JSGlobalObject* globalObject, JSCell* object)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
ASSERT(jsDynamicCast<JSObject*>(vm, object));
@@ -2024,7 +2024,7 @@
int32_t JIT_OPERATION operationTypeOfObjectAsTypeofType(ExecState* exec, JSGlobalObject* globalObject, JSCell* object)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
ASSERT(jsDynamicCast<JSObject*>(vm, object));
@@ -2038,7 +2038,7 @@
char* JIT_OPERATION operationAllocateSimplePropertyStorageWithInitialCapacity(ExecState* exec)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return reinterpret_cast<char*>(
Butterfly::createUninitialized(vm, 0, 0, initialOutOfLineCapacity, false, 0));
@@ -2047,7 +2047,7 @@
char* JIT_OPERATION operationAllocateSimplePropertyStorage(ExecState* exec, size_t newSize)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return reinterpret_cast<char*>(
Butterfly::createUninitialized(vm, 0, 0, newSize, false, 0));
@@ -2056,7 +2056,7 @@
char* JIT_OPERATION operationAllocateComplexPropertyStorageWithInitialCapacity(ExecState* exec, JSObject* object)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
ASSERT(!object->structure(vm)->outOfLineCapacity());
return reinterpret_cast<char*>(
@@ -2066,7 +2066,7 @@
char* JIT_OPERATION operationAllocateComplexPropertyStorage(ExecState* exec, JSObject* object, size_t newSize)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return reinterpret_cast<char*>(
object->allocateMoreOutOfLineStorage(vm, object->structure(vm)->outOfLineCapacity(), newSize));
@@ -2075,7 +2075,7 @@
char* JIT_OPERATION operationEnsureInt32(ExecState* exec, JSCell* cell)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
if (!cell->isObject())
return 0;
@@ -2088,7 +2088,7 @@
char* JIT_OPERATION operationEnsureDouble(ExecState* exec, JSCell* cell)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
if (!cell->isObject())
return 0;
@@ -2101,7 +2101,7 @@
char* JIT_OPERATION operationEnsureContiguous(ExecState* exec, JSCell* cell)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
if (!cell->isObject())
return 0;
@@ -2114,7 +2114,7 @@
char* JIT_OPERATION operationEnsureArrayStorage(ExecState* exec, JSCell* cell)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
if (!cell->isObject())
return 0;
@@ -2127,7 +2127,7 @@
EncodedJSValue JIT_OPERATION operationHasGenericProperty(ExecState* exec, EncodedJSValue encodedBaseValue, JSCell* property)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue baseValue = JSValue::decode(encodedBaseValue);
@@ -2145,11 +2145,11 @@
size_t JIT_OPERATION operationHasIndexedPropertyByInt(ExecState* exec, JSCell* baseCell, int32_t subscript, int32_t internalMethodType)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
JSObject* object = baseCell->toObject(exec, exec->lexicalGlobalObject());
if (UNLIKELY(subscript < 0)) {
// Go the slowest way possible because negative indices don't use indexed storage.
- return object->hasPropertyGeneric(exec, Identifier::from(exec, subscript), static_cast<PropertySlot::InternalMethodType>(internalMethodType));
+ return object->hasPropertyGeneric(exec, Identifier::from(vm, subscript), static_cast<PropertySlot::InternalMethodType>(internalMethodType));
}
return object->hasPropertyGeneric(exec, subscript, static_cast<PropertySlot::InternalMethodType>(internalMethodType));
}
@@ -2157,7 +2157,7 @@
JSCell* JIT_OPERATION operationGetPropertyEnumerator(ExecState* exec, EncodedJSValue encodedBase)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue base = JSValue::decode(encodedBase);
@@ -2173,7 +2173,7 @@
JSCell* JIT_OPERATION operationGetPropertyEnumeratorCell(ExecState* exec, JSCell* cell)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
JSObject* base = cell->toObject(exec, exec->lexicalGlobalObject());
@@ -2185,14 +2185,14 @@
JSCell* JIT_OPERATION operationToIndexString(ExecState* exec, int32_t index)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
- return jsString(exec, Identifier::from(exec, index).string());
+ NativeCallFrameTracer tracer(vm, exec);
+ return jsString(vm, Identifier::from(vm, index).string());
}
JSCell* JIT_OPERATION operationNewRegexpWithLastIndex(ExecState* exec, JSCell* regexpPtr, EncodedJSValue encodedLastIndex)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
RegExp* regexp = static_cast<RegExp*>(regexpPtr);
ASSERT(regexp->isValid());
@@ -2202,7 +2202,7 @@
StringImpl* JIT_OPERATION operationResolveRope(ExecState* exec, JSString* string)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return string->value(exec).impl();
}
@@ -2210,7 +2210,7 @@
JSString* JIT_OPERATION operationStringValueOf(ExecState* exec, EncodedJSValue encodedArgument)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue argument = JSValue::decode(encodedArgument);
@@ -2228,7 +2228,7 @@
JSCell* JIT_OPERATION operationStringSubstr(ExecState* exec, JSCell* cell, int32_t from, int32_t span)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return jsSubstring(vm, exec, jsCast<JSString*>(cell), from, span);
}
@@ -2236,7 +2236,7 @@
JSCell* JIT_OPERATION operationStringSlice(ExecState* exec, JSCell* cell, int32_t start, int32_t end)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
JSString* string = asString(cell);
static_assert(static_cast<uint64_t>(JSString::MaxLength) <= static_cast<uint64_t>(std::numeric_limits<int32_t>::max()), "");
@@ -2246,7 +2246,7 @@
JSString* JIT_OPERATION operationToLowerCase(ExecState* exec, JSString* string, uint32_t failingIndex)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
@@ -2258,13 +2258,13 @@
String lowercasedString = inputString.is8Bit() ? inputString.convertToLowercaseWithoutLocaleStartingAtFailingIndex8Bit(failingIndex) : inputString.convertToLowercaseWithoutLocale();
if (lowercasedString.impl() == inputString.impl())
return string;
- RELEASE_AND_RETURN(scope, jsString(exec, lowercasedString));
+ RELEASE_AND_RETURN(scope, jsString(vm, lowercasedString));
}
char* JIT_OPERATION operationInt32ToString(ExecState* exec, int32_t value, int32_t radix)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
@@ -2279,7 +2279,7 @@
char* JIT_OPERATION operationInt52ToString(ExecState* exec, int64_t value, int32_t radix)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
@@ -2294,7 +2294,7 @@
char* JIT_OPERATION operationDoubleToString(ExecState* exec, double value, int32_t radix)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
@@ -2309,7 +2309,7 @@
char* JIT_OPERATION operationInt32ToStringWithValidRadix(ExecState* exec, int32_t value, int32_t radix)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return reinterpret_cast<char*>(int32ToString(vm, value, radix));
}
@@ -2317,7 +2317,7 @@
char* JIT_OPERATION operationInt52ToStringWithValidRadix(ExecState* exec, int64_t value, int32_t radix)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return reinterpret_cast<char*>(int52ToString(vm, value, radix));
}
@@ -2325,7 +2325,7 @@
char* JIT_OPERATION operationDoubleToStringWithValidRadix(ExecState* exec, double value, int32_t radix)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return reinterpret_cast<char*>(numberToString(vm, value, radix));
}
@@ -2333,15 +2333,15 @@
JSString* JIT_OPERATION operationSingleCharacterString(ExecState* exec, int32_t character)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
- return jsSingleCharacterString(exec, static_cast<UChar>(character));
+ return jsSingleCharacterString(vm, static_cast<UChar>(character));
}
Symbol* JIT_OPERATION operationNewSymbol(ExecState* exec)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return Symbol::create(vm);
}
@@ -2349,7 +2349,7 @@
Symbol* JIT_OPERATION operationNewSymbolWithDescription(ExecState* exec, JSString* description)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
String string = description->value(exec);
@@ -2361,7 +2361,7 @@
JSCell* JIT_OPERATION operationNewStringObject(ExecState* exec, JSString* string, Structure* structure)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return StringObject::create(vm, structure, string);
}
@@ -2369,7 +2369,7 @@
JSString* JIT_OPERATION operationToStringOnCell(ExecState* exec, JSCell* cell)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return JSValue(cell).toString(exec);
}
@@ -2377,7 +2377,7 @@
JSString* JIT_OPERATION operationToString(ExecState* exec, EncodedJSValue value)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return JSValue::decode(value).toString(exec);
}
@@ -2385,7 +2385,7 @@
JSString* JIT_OPERATION operationCallStringConstructorOnCell(ExecState* exec, JSCell* cell)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return stringConstructor(exec, cell);
}
@@ -2393,7 +2393,7 @@
JSString* JIT_OPERATION operationCallStringConstructor(ExecState* exec, EncodedJSValue value)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return stringConstructor(exec, JSValue::decode(value));
}
@@ -2401,7 +2401,7 @@
JSString* JIT_OPERATION operationMakeRope2(ExecState* exec, JSString* left, JSString* right)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return jsString(exec, left, right);
}
@@ -2409,7 +2409,7 @@
JSString* JIT_OPERATION operationMakeRope3(ExecState* exec, JSString* a, JSString* b, JSString* c)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return jsString(exec, a, b, c);
}
@@ -2417,7 +2417,7 @@
JSString* JIT_OPERATION operationStrCat2(ExecState* exec, EncodedJSValue a, EncodedJSValue b)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
ASSERT(!JSValue::decode(a).isSymbol());
@@ -2433,7 +2433,7 @@
JSString* JIT_OPERATION operationStrCat3(ExecState* exec, EncodedJSValue a, EncodedJSValue b, EncodedJSValue c)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
ASSERT(!JSValue::decode(a).isSymbol());
@@ -2453,7 +2453,7 @@
ExecState* exec, EncodedJSValue encodedValue, size_t tableIndex)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
CodeBlock* codeBlock = exec->codeBlock();
SimpleJumpTable& table = codeBlock->switchJumpTable(tableIndex);
JSValue value = JSValue::decode(encodedValue);
@@ -2468,7 +2468,7 @@
char* JIT_OPERATION operationSwitchString(ExecState* exec, size_t tableIndex, JSString* string)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto throwScope = DECLARE_THROW_SCOPE(vm);
StringImpl* strImpl = string->value(exec).impl();
@@ -2481,7 +2481,7 @@
int32_t JIT_OPERATION operationSwitchStringAndGetBranchOffset(ExecState* exec, size_t tableIndex, JSString* string)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto throwScope = DECLARE_THROW_SCOPE(vm);
StringImpl* strImpl = string->value(exec).impl();
@@ -2514,7 +2514,7 @@
uintptr_t JIT_OPERATION operationCompareStringLess(ExecState* exec, JSString* a, JSString* b)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return codePointCompareLessThan(asString(a)->value(exec), asString(b)->value(exec));
}
@@ -2522,7 +2522,7 @@
uintptr_t JIT_OPERATION operationCompareStringLessEq(ExecState* exec, JSString* a, JSString* b)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return !codePointCompareLessThan(asString(b)->value(exec), asString(a)->value(exec));
}
@@ -2530,7 +2530,7 @@
uintptr_t JIT_OPERATION operationCompareStringGreater(ExecState* exec, JSString* a, JSString* b)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return codePointCompareLessThan(asString(b)->value(exec), asString(a)->value(exec));
}
@@ -2538,7 +2538,7 @@
uintptr_t JIT_OPERATION operationCompareStringGreaterEq(ExecState* exec, JSString* a, JSString* b)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return !codePointCompareLessThan(asString(a)->value(exec), asString(b)->value(exec));
}
@@ -2546,7 +2546,7 @@
void JIT_OPERATION operationNotifyWrite(ExecState* exec, WatchpointSet* set)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
set->touch(vm, "Executed NotifyWrite");
}
@@ -2554,7 +2554,7 @@
void JIT_OPERATION operationThrowStackOverflowForVarargs(ExecState* exec)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
throwStackOverflowError(exec, scope);
}
@@ -2562,7 +2562,7 @@
int32_t JIT_OPERATION operationSizeOfVarargs(ExecState* exec, EncodedJSValue encodedArguments, uint32_t firstVarArgOffset)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
JSValue arguments = JSValue::decode(encodedArguments);
return sizeOfVarargs(exec, arguments, firstVarArgOffset);
@@ -2571,7 +2571,7 @@
int32_t JIT_OPERATION operationHasOwnProperty(ExecState* exec, JSObject* thisObject, EncodedJSValue encodedKey)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue key = JSValue::decode(encodedKey);
@@ -2591,14 +2591,14 @@
int32_t JIT_OPERATION operationNumberIsInteger(ExecState* exec, EncodedJSValue value)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return NumberConstructor::isIntegerImpl(JSValue::decode(value));
}
int32_t JIT_OPERATION operationArrayIndexOfString(ExecState* exec, Butterfly* butterfly, JSString* searchElement, int32_t index)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
int32_t length = butterfly->publicLength();
@@ -2622,7 +2622,7 @@
int32_t JIT_OPERATION operationArrayIndexOfValueInt32OrContiguous(ExecState* exec, Butterfly* butterfly, EncodedJSValue encodedValue, int32_t index)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue searchElement = JSValue::decode(encodedValue);
@@ -2644,7 +2644,7 @@
int32_t JIT_OPERATION operationArrayIndexOfValueDouble(ExecState* exec, Butterfly* butterfly, EncodedJSValue encodedValue, int32_t index)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
JSValue searchElement = JSValue::decode(encodedValue);
@@ -2665,7 +2665,7 @@
void JIT_OPERATION operationLoadVarargs(ExecState* exec, int32_t firstElementDest, EncodedJSValue encodedArguments, uint32_t offset, uint32_t length, uint32_t mandatoryMinimum)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
JSValue arguments = JSValue::decode(encodedArguments);
loadVarargs(exec, VirtualRegister(firstElementDest), arguments, offset, length);
@@ -2688,14 +2688,14 @@
JSCell* JIT_OPERATION operationStringFromCharCode(ExecState* exec, int32_t op1)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
return JSC::stringFromCharCode(exec, op1);
}
EncodedJSValue JIT_OPERATION operationStringFromCharCodeUntyped(ExecState* exec, EncodedJSValue encodedValue)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
JSValue charValue = JSValue::decode(encodedValue);
int32_t chInt = charValue.toUInt32(exec);
@@ -2718,7 +2718,7 @@
char* JIT_OPERATION operationNewRawObject(ExecState* exec, Structure* structure, int32_t length, Butterfly* butterfly)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
if (!butterfly
&& (structure->outOfLineCapacity() || hasIndexedProperties(structure->indexingType()))) {
@@ -2740,7 +2740,7 @@
JSCell* JIT_OPERATION operationNewObjectWithButterfly(ExecState* exec, Structure* structure, Butterfly* butterfly)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
if (!butterfly) {
butterfly = Butterfly::create(
@@ -2755,7 +2755,7 @@
JSCell* JIT_OPERATION operationNewObjectWithButterflyWithIndexingHeaderAndVectorLength(ExecState* exec, Structure* structure, unsigned length, Butterfly* butterfly)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
IndexingHeader header;
header.setVectorLength(length);
@@ -2777,7 +2777,7 @@
JSCell* JIT_OPERATION operationNewArrayWithSpreadSlow(ExecState* exec, void* buffer, uint32_t numItems)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
EncodedJSValue* values = static_cast<EncodedJSValue*>(buffer);
@@ -2835,7 +2835,7 @@
JSCell* operationCreateFixedArray(ExecState* exec, unsigned length)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
if (JSFixedArray* result = JSFixedArray::tryCreate(vm, vm.fixedArrayStructure.get(), length))
@@ -2848,7 +2848,7 @@
JSCell* JIT_OPERATION operationSpreadGeneric(ExecState* exec, JSCell* iterable)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto throwScope = DECLARE_THROW_SCOPE(vm);
@@ -2883,7 +2883,7 @@
JSCell* JIT_OPERATION operationSpreadFastArray(ExecState* exec, JSCell* cell)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
ASSERT(isJSArray(cell));
JSArray* array = jsCast<JSArray*>(cell);
@@ -2895,7 +2895,7 @@
void JIT_OPERATION operationProcessTypeProfilerLogDFG(ExecState* exec)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
vm.typeProfilerLog()->processLogEntries(vm, "Log Full, called from inside DFG."_s);
}
@@ -2903,28 +2903,28 @@
EncodedJSValue JIT_OPERATION operationResolveScopeForHoistingFuncDeclInEval(ExecState* exec, JSScope* scope, UniquedStringImpl* impl)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
- JSValue resolvedScope = JSScope::resolveScopeForHoistingFuncDeclInEval(exec, scope, Identifier::fromUid(exec, impl));
+ JSValue resolvedScope = JSScope::resolveScopeForHoistingFuncDeclInEval(exec, scope, Identifier::fromUid(vm, impl));
return JSValue::encode(resolvedScope);
}
JSCell* JIT_OPERATION operationResolveScope(ExecState* exec, JSScope* scope, UniquedStringImpl* impl)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
- JSObject* resolvedScope = JSScope::resolve(exec, scope, Identifier::fromUid(exec, impl));
+ JSObject* resolvedScope = JSScope::resolve(exec, scope, Identifier::fromUid(vm, impl));
return resolvedScope;
}
EncodedJSValue JIT_OPERATION operationGetDynamicVar(ExecState* exec, JSObject* scope, UniquedStringImpl* impl, unsigned getPutInfoBits)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto throwScope = DECLARE_THROW_SCOPE(vm);
- Identifier ident = Identifier::fromUid(exec, impl);
+ Identifier ident = Identifier::fromUid(vm, impl);
RELEASE_AND_RETURN(throwScope, JSValue::encode(scope->getPropertySlot(exec, ident, [&] (bool found, PropertySlot& slot) -> JSValue {
if (!found) {
GetPutInfo getPutInfo(getPutInfoBits);
@@ -2951,7 +2951,7 @@
{
auto throwScope = DECLARE_THROW_SCOPE(vm);
- const Identifier& ident = Identifier::fromUid(exec, impl);
+ const Identifier& ident = Identifier::fromUid(vm, impl);
GetPutInfo getPutInfo(getPutInfoBits);
bool hasProperty = scope->hasProperty(exec, ident);
RETURN_IF_EXCEPTION(throwScope, void());
@@ -2980,7 +2980,7 @@
void JIT_OPERATION operationPutDynamicVarStrict(ExecState* exec, JSObject* scope, EncodedJSValue value, UniquedStringImpl* impl, unsigned getPutInfoBits)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
constexpr bool isStrictMode = true;
return putDynamicVar(exec, vm, scope, value, impl, getPutInfoBits, isStrictMode);
}
@@ -2988,7 +2988,7 @@
void JIT_OPERATION operationPutDynamicVarNonStrict(ExecState* exec, JSObject* scope, EncodedJSValue value, UniquedStringImpl* impl, unsigned getPutInfoBits)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
constexpr bool isStrictMode = false;
return putDynamicVar(exec, vm, scope, value, impl, getPutInfoBits, isStrictMode);
}
@@ -2996,7 +2996,7 @@
int32_t JIT_OPERATION operationMapHash(ExecState* exec, EncodedJSValue input)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return jsMapHash(exec, vm, JSValue::decode(input));
}
@@ -3004,7 +3004,7 @@
JSCell* JIT_OPERATION operationJSMapFindBucket(ExecState* exec, JSCell* map, EncodedJSValue key, int32_t hash)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
JSMap::BucketType** bucket = jsCast<JSMap*>(map)->findBucket(exec, JSValue::decode(key), hash);
if (!bucket)
return vm.sentinelMapBucket();
@@ -3014,7 +3014,7 @@
JSCell* JIT_OPERATION operationJSSetFindBucket(ExecState* exec, JSCell* map, EncodedJSValue key, int32_t hash)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
JSSet::BucketType** bucket = jsCast<JSSet*>(map)->findBucket(exec, JSValue::decode(key), hash);
if (!bucket)
return vm.sentinelSetBucket();
@@ -3024,7 +3024,7 @@
JSCell* JIT_OPERATION operationSetAdd(ExecState* exec, JSCell* set, EncodedJSValue key, int32_t hash)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto* bucket = jsCast<JSSet*>(set)->addNormalized(exec, JSValue::decode(key), JSValue(), hash);
if (!bucket)
return vm.sentinelSetBucket();
@@ -3034,7 +3034,7 @@
JSCell* JIT_OPERATION operationMapSet(ExecState* exec, JSCell* map, EncodedJSValue key, EncodedJSValue value, int32_t hash)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto* bucket = jsCast<JSMap*>(map)->addNormalized(exec, JSValue::decode(key), JSValue::decode(value), hash);
if (!bucket)
return vm.sentinelMapBucket();
@@ -3044,28 +3044,28 @@
void JIT_OPERATION operationWeakSetAdd(ExecState* exec, JSCell* set, JSCell* key, int32_t hash)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
jsCast<JSWeakSet*>(set)->add(vm, asObject(key), JSValue(), hash);
}
void JIT_OPERATION operationWeakMapSet(ExecState* exec, JSCell* map, JSCell* key, EncodedJSValue value, int32_t hash)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
jsCast<JSWeakMap*>(map)->add(vm, asObject(key), JSValue::decode(value), hash);
}
EncodedJSValue JIT_OPERATION operationGetPrototypeOfObject(ExecState* exec, JSObject* thisObject)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return JSValue::encode(thisObject->getPrototype(vm, exec));
}
EncodedJSValue JIT_OPERATION operationGetPrototypeOf(ExecState* exec, EncodedJSValue encodedValue)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue thisValue = JSValue::decode(encodedValue).toThis(exec, StrictMode);
@@ -3087,7 +3087,7 @@
void JIT_OPERATION operationThrowDFG(ExecState* exec, EncodedJSValue valueToThrow)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
scope.throwException(exec, JSValue::decode(valueToThrow));
}
@@ -3095,7 +3095,7 @@
void JIT_OPERATION operationThrowStaticError(ExecState* exec, JSString* message, uint32_t errorType)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
String errorMessage = message->value(exec);
scope.throwException(exec, createError(exec, static_cast<ErrorType>(errorType), errorMessage));
@@ -3105,7 +3105,7 @@
{
// It's sort of preferable that we don't GC while in here. Anyways, doing so wouldn't
// really be profitable.
- DeferGCForAWhile deferGC(codeBlock->vm()->heap);
+ DeferGCForAWhile deferGC(codeBlock->vm().heap);
sanitizeStackForVM(codeBlock->vm());
@@ -3178,7 +3178,7 @@
return true;
}
-static void triggerFTLReplacementCompile(VM* vm, CodeBlock* codeBlock, JITCode* jitCode)
+static void triggerFTLReplacementCompile(VM& vm, CodeBlock* codeBlock, JITCode* jitCode)
{
if (codeBlock->codeType() == GlobalCode) {
// Global code runs once, so we don't want to do anything. We don't want to defer indefinitely,
@@ -3191,7 +3191,7 @@
Worklist::State worklistState;
if (Worklist* worklist = existingGlobalFTLWorklistOrNull()) {
worklistState = worklist->completeAllReadyPlansForVM(
- *vm, CompilationKey(codeBlock->baselineVersion(), FTLMode));
+ vm, CompilationKey(codeBlock->baselineVersion(), FTLMode));
} else
worklistState = Worklist::NotKnown;
@@ -3222,7 +3222,7 @@
CODEBLOCK_LOG_EVENT(codeBlock, "triggerFTLReplacement", ());
// We need to compile the code.
compile(
- *vm, codeBlock->newReplacement(), codeBlock, FTLMode, UINT_MAX,
+ vm, codeBlock->newReplacement(), codeBlock, FTLMode, UINT_MAX,
Operands<Optional<JSValue>>(), ToFTLDeferredCompilationCallback::create());
// If we reached here, the counter has not be reset. Do that now.
@@ -3232,9 +3232,9 @@
void JIT_OPERATION triggerTierUpNow(ExecState* exec)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
- DeferGCForAWhile deferGC(vm->heap);
+ DeferGCForAWhile deferGC(vm.heap);
CodeBlock* codeBlock = exec->codeBlock();
sanitizeStackForVM(vm);
@@ -3277,14 +3277,14 @@
static char* tierUpCommon(ExecState* exec, unsigned originBytecodeIndex, bool canOSREnterHere)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
CodeBlock* codeBlock = exec->codeBlock();
// Resolve any pending plan for OSR Enter on this function.
Worklist::State worklistState;
if (Worklist* worklist = existingGlobalFTLWorklistOrNull()) {
worklistState = worklist->completeAllReadyPlansForVM(
- *vm, CompilationKey(codeBlock->baselineVersion(), FTLForOSREntryMode));
+ vm, CompilationKey(codeBlock->baselineVersion(), FTLForOSREntryMode));
} else
worklistState = Worklist::NotKnown;
@@ -3464,7 +3464,7 @@
CODEBLOCK_LOG_EVENT(codeBlock, "triggerFTLOSR", ());
CompilationResult forEntryResult = compile(
- *vm, replacementCodeBlock, codeBlock, FTLForOSREntryMode, originBytecodeIndex,
+ vm, replacementCodeBlock, codeBlock, FTLForOSREntryMode, originBytecodeIndex,
mustHandleValues, ToFTLForOSREntryDeferredCompilationCallback::create(triggerAddress));
if (jitCode->neverExecutedEntry)
@@ -3493,9 +3493,9 @@
void JIT_OPERATION triggerTierUpNowInLoop(ExecState* exec, unsigned bytecodeIndex)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
- DeferGCForAWhile deferGC(vm->heap);
+ DeferGCForAWhile deferGC(vm.heap);
CodeBlock* codeBlock = exec->codeBlock();
sanitizeStackForVM(vm);
@@ -3527,9 +3527,9 @@
char* JIT_OPERATION triggerOSREntryNow(ExecState* exec, unsigned bytecodeIndex)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
- DeferGCForAWhile deferGC(vm->heap);
+ DeferGCForAWhile deferGC(vm.heap);
CodeBlock* codeBlock = exec->codeBlock();
sanitizeStackForVM(vm);
diff --git a/Source/JavaScriptCore/dfg/DFGPlan.cpp b/Source/JavaScriptCore/dfg/DFGPlan.cpp
index 5592b5a..3000c31 100644
--- a/Source/JavaScriptCore/dfg/DFGPlan.cpp
+++ b/Source/JavaScriptCore/dfg/DFGPlan.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-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
@@ -137,7 +137,7 @@
CompilationMode mode, unsigned osrEntryBytecodeIndex,
const Operands<Optional<JSValue>>& mustHandleValues)
: m_mode(mode)
- , m_vm(passedCodeBlock->vm())
+ , m_vm(&passedCodeBlock->vm())
, m_codeBlock(passedCodeBlock)
, m_profiledDFGCodeBlock(profiledDFGCodeBlock)
, m_mustHandleValues(mustHandleValues)
diff --git a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp
index 70e705d..893d668 100644
--- a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp
+++ b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp
@@ -116,8 +116,9 @@
m_jit.move(TrustedImmPtr(nullptr), storageGPR);
+ VM& vm = this->vm();
if (size) {
- if (Allocator allocator = m_jit.vm()->jsValueGigacageAuxiliarySpace.allocatorForNonVirtual(size, AllocatorForMode::AllocatorIfExists)) {
+ if (Allocator allocator = vm.jsValueGigacageAuxiliarySpace.allocatorForNonVirtual(size, AllocatorForMode::AllocatorIfExists)) {
m_jit.emitAllocate(storageGPR, JITAllocator::constant(allocator), scratchGPR, scratch2GPR, slowCases);
m_jit.addPtr(
@@ -131,7 +132,7 @@
}
size_t allocationSize = JSFinalObject::allocationSize(inlineCapacity);
- Allocator allocator = allocatorForNonVirtualConcurrently<JSFinalObject>(*m_jit.vm(), allocationSize, AllocatorForMode::AllocatorIfExists);
+ Allocator allocator = allocatorForNonVirtualConcurrently<JSFinalObject>(vm, allocationSize, AllocatorForMode::AllocatorIfExists);
if (allocator) {
emitAllocateJSObject(resultGPR, JITAllocator::constant(allocator), scratchGPR, TrustedImmPtr(structure), storageGPR, scratch2GPR, slowCases);
m_jit.emitInitializeInlineStorage(resultGPR, structure->inlineCapacity());
@@ -171,7 +172,7 @@
m_jit.emitInitializeOutOfLineStorage(storageGPR, structure->outOfLineCapacity());
- m_jit.mutatorFence(*m_jit.vm());
+ m_jit.mutatorFence(vm);
}
void SpeculativeJIT::emitGetLength(InlineCallFrame* inlineCallFrame, GPRReg lengthGPR, bool includeThis)
@@ -1571,8 +1572,9 @@
CCallHelpers::JumpList doneCases;
CCallHelpers::JumpList slowCases;
+ VM& vm = this->vm();
auto nonEmptyCase = m_jit.branch32(MacroAssembler::Below, startIndexGPR, tempGPR);
- m_jit.move(TrustedImmPtr::weakPointer(m_jit.graph(), jsEmptyString(&vm())), tempGPR);
+ m_jit.move(TrustedImmPtr::weakPointer(m_jit.graph(), jsEmptyString(vm)), tempGPR);
doneCases.append(m_jit.jump());
nonEmptyCase.link(&m_jit);
@@ -1599,7 +1601,7 @@
cont8Bit.link(&m_jit);
m_jit.lshift32(MacroAssembler::TrustedImm32(sizeof(void*) == 4 ? 2 : 3), tempGPR);
- m_jit.addPtr(TrustedImmPtr(m_jit.vm()->smallStrings.singleCharacterStrings()), tempGPR);
+ m_jit.addPtr(TrustedImmPtr(vm.smallStrings.singleCharacterStrings()), tempGPR);
m_jit.loadPtr(tempGPR, tempGPR);
addSlowPathGenerator(slowPathCall(bigCharacter, this, operationSingleCharacterString, tempGPR, tempGPR));
@@ -1869,7 +1871,7 @@
}
if (Options::validateDFGExceptionHandling() && (mayExit(m_jit.graph(), m_currentNode) != DoesNotExit || m_currentNode->isTerminal()))
- m_jit.jitReleaseAssertNoException(*m_jit.vm());
+ m_jit.jitReleaseAssertNoException(m_jit.vm());
m_jit.pcToCodeOriginMapBuilder().appendItem(m_jit.labelIgnoringWatchpoints(), m_origin.semantic);
@@ -2049,7 +2051,7 @@
GPRReg unusedGPR = unused.gpr();
JITCompiler::Jump needTrapHandling = m_jit.branchTest8(JITCompiler::NonZero,
- JITCompiler::AbsoluteAddress(m_jit.vm()->needTrapHandlingAddress()));
+ JITCompiler::AbsoluteAddress(m_jit.vm().needTrapHandlingAddress()));
addSlowPathGenerator(slowPathCall(needTrapHandling, this, operationHandleTraps, unusedGPR));
noResult(node);
@@ -2214,8 +2216,9 @@
// 8 bit string values don't need the isASCII check.
cont8Bit.link(&m_jit);
+ VM& vm = this->vm();
m_jit.lshift32(MacroAssembler::TrustedImm32(sizeof(void*) == 4 ? 2 : 3), scratchReg);
- m_jit.addPtr(TrustedImmPtr(m_jit.vm()->smallStrings.singleCharacterStrings()), scratchReg);
+ m_jit.addPtr(TrustedImmPtr(vm.smallStrings.singleCharacterStrings()), scratchReg);
m_jit.loadPtr(scratchReg, scratchReg);
addSlowPathGenerator(
@@ -2236,8 +2239,8 @@
// on a stringPrototypeChainIsSane() guaranteeing that the prototypes have no negative
// indexed properties either.
// https://bugs.webkit.org/show_bug.cgi?id=144668
- m_jit.graph().registerAndWatchStructureTransition(globalObject->stringPrototype()->structure(*m_jit.vm()));
- m_jit.graph().registerAndWatchStructureTransition(globalObject->objectPrototype()->structure(*m_jit.vm()));
+ m_jit.graph().registerAndWatchStructureTransition(globalObject->stringPrototype()->structure(vm));
+ m_jit.graph().registerAndWatchStructureTransition(globalObject->objectPrototype()->structure(vm));
prototypeChainIsSane = globalObject->stringPrototypeChainIsSane();
}
if (prototypeChainIsSane) {
@@ -2298,7 +2301,7 @@
JITCompiler::JumpList slowCases;
slowCases.append(m_jit.branch32(MacroAssembler::Above, propertyReg, TrustedImm32(maxSingleCharacterString)));
- m_jit.move(TrustedImmPtr(m_jit.vm()->smallStrings.singleCharacterStrings()), smallStringsReg);
+ m_jit.move(TrustedImmPtr(vm().smallStrings.singleCharacterStrings()), smallStringsReg);
m_jit.loadPtr(MacroAssembler::BaseIndex(smallStringsReg, propertyReg, MacroAssembler::ScalePtr, 0), scratchReg);
slowCases.append(m_jit.branchTest32(MacroAssembler::Zero, scratchReg));
@@ -6705,7 +6708,7 @@
GPRTemporary eq(this);
GPRReg eqGPR = eq.gpr();
- m_jit.move(TrustedImmPtr::weakPointer(m_jit.graph(), jsEmptyString(m_jit.vm())), eqGPR);
+ m_jit.move(TrustedImmPtr::weakPointer(m_jit.graph(), jsEmptyString(vm())), eqGPR);
m_jit.comparePtr(CCallHelpers::Equal, strGPR, eqGPR, eqGPR);
unblessedBooleanResult(eqGPR, node);
}
@@ -6722,7 +6725,7 @@
DFG_TYPE_CHECK(
valueRegs, node->child1(), (~SpecCellCheck) | SpecString, m_jit.branchIfNotString(cellGPR));
- m_jit.move(TrustedImmPtr::weakPointer(m_jit.graph(), jsEmptyString(m_jit.vm())), tempGPR);
+ m_jit.move(TrustedImmPtr::weakPointer(m_jit.graph(), jsEmptyString(vm())), tempGPR);
m_jit.comparePtr(CCallHelpers::Equal, cellGPR, tempGPR, tempGPR);
auto done = m_jit.jump();
@@ -6744,7 +6747,7 @@
speculateString(nodeUse, strGPR);
- branchPtr(CCallHelpers::Equal, strGPR, TrustedImmPtr::weakPointer(m_jit.graph(), jsEmptyString(m_jit.vm())), notTaken);
+ branchPtr(CCallHelpers::Equal, strGPR, TrustedImmPtr::weakPointer(m_jit.graph(), jsEmptyString(vm())), notTaken);
jump(taken);
noResult(m_currentNode);
@@ -6761,7 +6764,7 @@
GPRReg cellGPR = valueRegs.payloadGPR();
DFG_TYPE_CHECK(valueRegs, nodeUse, (~SpecCellCheck) | SpecString, m_jit.branchIfNotString(cellGPR));
- branchPtr(CCallHelpers::Equal, cellGPR, TrustedImmPtr::weakPointer(m_jit.graph(), jsEmptyString(m_jit.vm())), notTaken);
+ branchPtr(CCallHelpers::Equal, cellGPR, TrustedImmPtr::weakPointer(m_jit.graph(), jsEmptyString(vm())), notTaken);
jump(taken, ForceJump);
notCell.link(&m_jit);
@@ -6794,8 +6797,9 @@
return;
if (Gigacage::canPrimitiveGigacageBeDisabled()) {
- if (m_jit.vm()->primitiveGigacageEnabled().isStillValid())
- m_jit.graph().watchpoints().addLazily(m_jit.vm()->primitiveGigacageEnabled());
+ VM& vm = this->vm();
+ if (vm.primitiveGigacageEnabled().isStillValid())
+ m_jit.graph().watchpoints().addLazily(vm.primitiveGigacageEnabled());
else
return;
}
@@ -7032,7 +7036,7 @@
SpeculateCellOperand object(this, node->child1());
GPRTemporary result(this);
GPRTemporary scratch(this);
- m_jit.emitLoadStructure(*m_jit.vm(), object.gpr(), result.gpr(), scratch.gpr());
+ m_jit.emitLoadStructure(vm(), object.gpr(), result.gpr(), scratch.gpr());
m_jit.loadPtr(JITCompiler::Address(result.gpr(), Structure::globalObjectOffset()), result.gpr());
cellResult(result.gpr(), node);
}
@@ -7204,7 +7208,7 @@
m_jit.storePtr(TrustedImmPtr(nullptr), JITCompiler::Address(resultGPR, JSFunction::offsetOfRareData()));
if (executable->isAnonymousBuiltinFunction()) {
- VM& vm = *m_jit.vm();
+ VM& vm = this->vm();
m_jit.mutatorFence(vm);
GPRTemporary allocator(this);
Allocator allocatorValue = allocatorForNonVirtualConcurrently<FunctionRareData>(vm, sizeof(FunctionRareData), AllocatorForMode::AllocatorIfExists);
@@ -7223,7 +7227,7 @@
m_jit.mutatorFence(vm);
m_jit.storePtr(scratch1GPR, JITCompiler::Address(resultGPR, JSFunction::offsetOfRareData()));
} else
- m_jit.mutatorFence(*m_jit.vm());
+ m_jit.mutatorFence(vm());
}
@@ -7512,7 +7516,7 @@
resultGPR, JSLexicalEnvironment::offsetOfVariable(ScopeOffset(i))));
}
- m_jit.mutatorFence(*m_jit.vm());
+ m_jit.mutatorFence(vm());
#if USE(JSVALUE64)
addSlowPathGenerator(
@@ -7677,7 +7681,7 @@
done.link(&m_jit);
}
- m_jit.mutatorFence(*m_jit.vm());
+ m_jit.mutatorFence(vm());
cellResult(resultGPR, node);
}
@@ -7897,7 +7901,7 @@
m_jit.lshift32(TrustedImm32(3), scratch1GPR);
m_jit.add32(TrustedImm32(JSFixedArray::offsetOfData()), scratch1GPR);
- m_jit.emitAllocateVariableSizedCell<JSFixedArray>(*m_jit.vm(), resultGPR, TrustedImmPtr(m_jit.graph().registerStructure(m_jit.graph().m_vm.fixedArrayStructure.get())), scratch1GPR, scratch1GPR, scratch2GPR, slowPath);
+ m_jit.emitAllocateVariableSizedCell<JSFixedArray>(vm(), resultGPR, TrustedImmPtr(m_jit.graph().registerStructure(m_jit.graph().m_vm.fixedArrayStructure.get())), scratch1GPR, scratch1GPR, scratch2GPR, slowPath);
m_jit.store32(lengthGPR, MacroAssembler::Address(resultGPR, JSFixedArray::offsetOfSize()));
m_jit.loadPtr(MacroAssembler::Address(argument, JSObject::butterflyOffset()), scratch1GPR);
@@ -7938,7 +7942,7 @@
done.append(m_jit.jump());
}
- m_jit.mutatorFence(*m_jit.vm());
+ m_jit.mutatorFence(vm());
slowPath.link(&m_jit);
addSlowPathGenerator(slowPathCall(m_jit.jump(), this, operationSpreadFastArray, resultGPR, argument));
@@ -8049,7 +8053,7 @@
}
size_t scratchSize = sizeof(EncodedJSValue) * node->numChildren();
- ScratchBuffer* scratchBuffer = m_jit.vm()->scratchBufferForSize(scratchSize);
+ ScratchBuffer* scratchBuffer = vm().scratchBufferForSize(scratchSize);
EncodedJSValue* buffer = scratchBuffer ? static_cast<EncodedJSValue*>(scratchBuffer->dataBuffer()) : nullptr;
for (unsigned operandIdx = 0; operandIdx < node->numChildren(); ++operandIdx) {
@@ -8221,7 +8225,7 @@
ASSERT(node->numChildren());
size_t scratchSize = sizeof(EncodedJSValue) * node->numChildren();
- ScratchBuffer* scratchBuffer = m_jit.vm()->scratchBufferForSize(scratchSize);
+ ScratchBuffer* scratchBuffer = vm().scratchBufferForSize(scratchSize);
EncodedJSValue* buffer = static_cast<EncodedJSValue*>(scratchBuffer->dataBuffer());
BitVector* bitVector = node->bitVector();
@@ -8434,7 +8438,7 @@
emitAllocateButterfly(storageResultGPR, sizeGPR, scratchGPR, scratch2GPR, resultGPR, slowCases);
emitInitializeButterfly(storageResultGPR, sizeGPR, emptyValueRegs, scratchGPR);
emitAllocateJSObject<JSArray>(resultGPR, tempValue, storageResultGPR, scratchGPR, scratch2GPR, slowCases);
- m_jit.mutatorFence(*m_jit.vm());
+ m_jit.mutatorFence(vm());
} else {
slowCases.append(m_jit.jump());
}
@@ -8778,7 +8782,7 @@
slowPath.link(&m_jit);
size_t scratchSize = sizeof(EncodedJSValue) * elementCount;
- ScratchBuffer* scratchBuffer = m_jit.vm()->scratchBufferForSize(scratchSize);
+ ScratchBuffer* scratchBuffer = vm().scratchBufferForSize(scratchSize);
m_jit.move(TrustedImmPtr(static_cast<EncodedJSValue*>(scratchBuffer->dataBuffer())), bufferGPR);
m_jit.move(TrustedImmPtr(scratchBuffer->addressOfActiveLength()), storageLengthGPR);
m_jit.storePtr(TrustedImmPtr(scratchSize), MacroAssembler::Address(storageLengthGPR));
@@ -8852,7 +8856,7 @@
slowPath.link(&m_jit);
size_t scratchSize = sizeof(double) * elementCount;
- ScratchBuffer* scratchBuffer = m_jit.vm()->scratchBufferForSize(scratchSize);
+ ScratchBuffer* scratchBuffer = vm().scratchBufferForSize(scratchSize);
m_jit.move(TrustedImmPtr(static_cast<EncodedJSValue*>(scratchBuffer->dataBuffer())), bufferGPR);
m_jit.move(TrustedImmPtr(scratchBuffer->addressOfActiveLength()), storageLengthGPR);
m_jit.storePtr(TrustedImmPtr(scratchSize), MacroAssembler::Address(storageLengthGPR));
@@ -8933,7 +8937,7 @@
slowPath.link(&m_jit);
size_t scratchSize = sizeof(EncodedJSValue) * elementCount;
- ScratchBuffer* scratchBuffer = m_jit.vm()->scratchBufferForSize(scratchSize);
+ ScratchBuffer* scratchBuffer = vm().scratchBufferForSize(scratchSize);
m_jit.move(TrustedImmPtr(static_cast<EncodedJSValue*>(scratchBuffer->dataBuffer())), bufferGPR);
m_jit.move(TrustedImmPtr(scratchBuffer->addressOfActiveLength()), storageLengthGPR);
m_jit.storePtr(TrustedImmPtr(scratchSize), MacroAssembler::Address(storageLengthGPR));
@@ -9102,7 +9106,7 @@
m_jit.emitTypeOf(
valueRegs, resultGPR,
[&] (TypeofType type, bool fallsThrough) {
- m_jit.move(TrustedImmPtr::weakPointer(m_jit.graph(), m_jit.vm()->smallStrings.typeString(type)), resultGPR);
+ m_jit.move(TrustedImmPtr::weakPointer(m_jit.graph(), vm().smallStrings.typeString(type)), resultGPR);
if (!fallsThrough)
done.append(m_jit.jump());
},
@@ -9216,7 +9220,7 @@
size_t size = initialOutOfLineCapacity * sizeof(JSValue);
- Allocator allocator = m_jit.vm()->jsValueGigacageAuxiliarySpace.allocatorForNonVirtual(size, AllocatorForMode::AllocatorIfExists);
+ Allocator allocator = vm().jsValueGigacageAuxiliarySpace.allocatorForNonVirtual(size, AllocatorForMode::AllocatorIfExists);
if (!allocator || node->transition()->previous->couldHaveIndexingHeader()) {
SpeculateCellOperand base(this, node->child1());
@@ -9260,7 +9264,7 @@
size_t newSize = oldSize * outOfLineGrowthFactor;
ASSERT(newSize == node->transition()->next->outOfLineCapacity() * sizeof(JSValue));
- Allocator allocator = m_jit.vm()->jsValueGigacageAuxiliarySpace.allocatorForNonVirtual(newSize, AllocatorForMode::AllocatorIfExists);
+ Allocator allocator = vm().jsValueGigacageAuxiliarySpace.allocatorForNonVirtual(newSize, AllocatorForMode::AllocatorIfExists);
if (!allocator || node->transition()->previous->couldHaveIndexingHeader()) {
SpeculateCellOperand base(this, node->child1());
@@ -9315,7 +9319,7 @@
GPRReg baseGPR = base.gpr();
GPRReg storageGPR = storage.gpr();
- m_jit.nukeStructureAndStoreButterfly(*m_jit.vm(), storageGPR, baseGPR);
+ m_jit.nukeStructureAndStoreButterfly(vm(), storageGPR, baseGPR);
noResult(node);
}
@@ -9445,7 +9449,7 @@
flushRegisters();
m_jit.setupArguments<J_JITOperation_EJI>(CCallHelpers::CellValue(baseGPR), identifierUID(node->callDOMGetterData()->identifierNumber));
- m_jit.storePtr(GPRInfo::callFrameRegister, &m_jit.vm()->topCallFrame);
+ m_jit.storePtr(GPRInfo::callFrameRegister, &vm().topCallFrame);
m_jit.emitStoreCodeOrigin(m_currentNode->origin.semantic);
m_jit.appendCall(getter.retagged<CFunctionPtrTag>());
m_jit.setupResults(resultRegs);
@@ -9493,7 +9497,7 @@
GPRReg otherGPR = other.gpr();
GPRReg specifiedGPR = specified.gpr();
- m_jit.emitLoadStructure(*m_jit.vm(), baseGPR, otherGPR, specifiedGPR);
+ m_jit.emitLoadStructure(vm(), baseGPR, otherGPR, specifiedGPR);
m_jit.loadPtr(CCallHelpers::Address(otherGPR, Structure::classInfoOffset()), otherGPR);
m_jit.move(CCallHelpers::TrustedImmPtr(node->classInfo()), specifiedGPR);
@@ -9802,7 +9806,7 @@
JITCompiler::Address(resultGPR, JSWrapperObject::internalValueOffset() + OBJECT_OFFSETOF(JSValue, u.asBits.payload)));
#endif
- m_jit.mutatorFence(*m_jit.vm());
+ m_jit.mutatorFence(vm());
addSlowPathGenerator(slowPathCall(
slowPath, this, operationNewStringObject, resultGPR, operandGPR, node->structure()));
@@ -9869,7 +9873,7 @@
m_jit.and32(TrustedImm32(~7), scratchGPR);
}
m_jit.emitAllocateVariableSized(
- storageGPR, m_jit.vm()->primitiveGigacageAuxiliarySpace, scratchGPR, scratchGPR,
+ storageGPR, vm().primitiveGigacageAuxiliarySpace, scratchGPR, scratchGPR,
scratchGPR2, slowCases);
MacroAssembler::Jump done = m_jit.branchTest32(MacroAssembler::Zero, sizeGPR);
@@ -9912,7 +9916,7 @@
TrustedImm32(FastTypedArray),
MacroAssembler::Address(resultGPR, JSArrayBufferView::offsetOfMode()));
- m_jit.mutatorFence(*m_jit.vm());
+ m_jit.mutatorFence(vm());
addSlowPathGenerator(slowPathCall(
slowCases, this, operationNewTypedArrayWithSizeForType(typedArrayType),
@@ -9945,7 +9949,7 @@
TrustedImmPtr(node->cellOperand()),
CCallHelpers::Address(resultGPR, RegExpObject::offsetOfRegExpAndLastIndexIsNotWritableFlag()));
m_jit.storeValue(lastIndexRegs, CCallHelpers::Address(resultGPR, RegExpObject::offsetOfLastIndex()));
- m_jit.mutatorFence(*m_jit.vm());
+ m_jit.mutatorFence(vm());
addSlowPathGenerator(slowPathCall(slowPath, this, operationNewRegexpWithLastIndex, resultGPR, regexp, lastIndexRegs));
@@ -11087,9 +11091,9 @@
JITCompiler::JumpList ok;
if (isFenced) {
- ok.append(m_jit.barrierBranch(*m_jit.vm(), baseGPR, scratch1GPR));
+ ok.append(m_jit.barrierBranch(vm(), baseGPR, scratch1GPR));
- JITCompiler::Jump noFence = m_jit.jumpIfMutatorFenceNotNeeded(*m_jit.vm());
+ JITCompiler::Jump noFence = m_jit.jumpIfMutatorFenceNotNeeded(vm());
m_jit.memoryFence();
ok.append(m_jit.barrierBranchWithoutFence(baseGPR));
noFence.link(&m_jit);
@@ -11420,7 +11424,7 @@
if (node->child1().useKind() == StringUse
&& node->child2().useKind() == RegExpObjectUse
&& node->child3().useKind() == StringUse) {
- if (JSString* replace = node->child3()->dynamicCastConstant<JSString*>(*m_jit.vm())) {
+ if (JSString* replace = node->child3()->dynamicCastConstant<JSString*>(vm())) {
if (!replace->length()) {
SpeculateCellOperand string(this, node->child1());
SpeculateCellOperand regExp(this, node->child2());
@@ -11554,7 +11558,7 @@
void SpeculativeJIT::compileMaterializeNewObject(Node* node)
{
RegisteredStructure structure = node->structureSet().at(0);
- ASSERT(m_jit.graph().varArgChild(node, 0)->dynamicCastConstant<Structure*>(*m_jit.vm()) == structure.get());
+ ASSERT(m_jit.graph().varArgChild(node, 0)->dynamicCastConstant<Structure*>(vm()) == structure.get());
ObjectMaterializationData& data = node->objectMaterializationData();
@@ -11842,7 +11846,7 @@
didNotOverflow.link(&m_jit);
#endif
m_jit.emitAllocateVariableSized(
- storageResultGPR, m_jit.vm()->jsValueGigacageAuxiliarySpace, scratch2, scratch1, scratch3, slowCases);
+ storageResultGPR, vm().jsValueGigacageAuxiliarySpace, scratch2, scratch1, scratch3, slowCases);
m_jit.addPtr(TrustedImm32(sizeof(IndexingHeader)), storageResultGPR);
m_jit.store32(sizeGPR, MacroAssembler::Address(storageResultGPR, Butterfly::offsetOfPublicLength()));
@@ -11939,10 +11943,10 @@
notBucket.link(&m_jit);
JSCell* sentinel = nullptr;
if (node->bucketOwnerType() == BucketOwnerType::Map)
- sentinel = m_jit.vm()->sentinelMapBucket();
+ sentinel = vm().sentinelMapBucket();
else {
ASSERT(node->bucketOwnerType() == BucketOwnerType::Set);
- sentinel = m_jit.vm()->sentinelSetBucket();
+ sentinel = vm().sentinelSetBucket();
}
m_jit.move(TrustedImmPtr::weakPointer(m_jit.graph(), sentinel), resultGPR);
done.link(&m_jit);
@@ -12516,11 +12520,11 @@
speculateObject(node->child1(), objectGPR);
CCallHelpers::JumpList slowCases;
- m_jit.emitLoadStructure(*m_jit.vm(), objectGPR, structureGPR, scratchGPR);
+ m_jit.emitLoadStructure(vm(), objectGPR, structureGPR, scratchGPR);
m_jit.loadPtr(CCallHelpers::Address(structureGPR, Structure::previousOrRareDataOffset()), scratchGPR);
slowCases.append(m_jit.branchTestPtr(CCallHelpers::Zero, scratchGPR));
- slowCases.append(m_jit.branch32(CCallHelpers::Equal, CCallHelpers::Address(scratchGPR, JSCell::structureIDOffset()), TrustedImm32(bitwise_cast<int32_t>(m_jit.vm()->structureStructure->structureID()))));
+ slowCases.append(m_jit.branch32(CCallHelpers::Equal, CCallHelpers::Address(scratchGPR, JSCell::structureIDOffset()), TrustedImm32(bitwise_cast<int32_t>(vm().structureStructure->structureID()))));
m_jit.loadPtr(CCallHelpers::Address(scratchGPR, StructureRareData::offsetOfCachedOwnKeys()), scratchGPR);
@@ -12660,7 +12664,7 @@
m_jit.load8(JITCompiler::Address(structureGPR, Structure::inlineCapacityOffset()), inlineCapacityGPR);
m_jit.emitInitializeInlineStorage(resultGPR, inlineCapacityGPR);
- m_jit.mutatorFence(*m_jit.vm());
+ m_jit.mutatorFence(vm());
addSlowPathGenerator(slowPathCall(slowPath, this, operationCreateThis, resultGPR, calleeGPR, node->inlineCapacity()));
@@ -12681,14 +12685,14 @@
RegisteredStructure structure = node->structure();
size_t allocationSize = JSFinalObject::allocationSize(structure->inlineCapacity());
- Allocator allocatorValue = allocatorForNonVirtualConcurrently<JSFinalObject>(*m_jit.vm(), allocationSize, AllocatorForMode::AllocatorIfExists);
+ Allocator allocatorValue = allocatorForNonVirtualConcurrently<JSFinalObject>(vm(), allocationSize, AllocatorForMode::AllocatorIfExists);
if (!allocatorValue)
slowPath.append(m_jit.jump());
else {
auto butterfly = TrustedImmPtr(nullptr);
emitAllocateJSObject(resultGPR, JITAllocator::constant(allocatorValue), allocatorGPR, TrustedImmPtr(structure), butterfly, scratchGPR, slowPath);
m_jit.emitInitializeInlineStorage(resultGPR, structure->inlineCapacity());
- m_jit.mutatorFence(*m_jit.vm());
+ m_jit.mutatorFence(vm());
}
addSlowPathGenerator(slowPathCall(slowPath, this, operationNewObject, resultGPR, structure));
@@ -12731,7 +12735,7 @@
GPRTemporary shadowPacket(this);
GPRReg shadowPacketReg = shadowPacket.gpr();
- m_jit.ensureShadowChickenPacket(*m_jit.vm(), shadowPacketReg, scratch1Reg, scratch2Reg);
+ m_jit.ensureShadowChickenPacket(vm(), shadowPacketReg, scratch1Reg, scratch2Reg);
SpeculateCellOperand scope(this, node->child1());
GPRReg scopeReg = scope.gpr();
@@ -12753,7 +12757,7 @@
GPRTemporary shadowPacket(this);
GPRReg shadowPacketReg = shadowPacket.gpr();
- m_jit.ensureShadowChickenPacket(*m_jit.vm(), shadowPacketReg, scratch1Reg, scratch2Reg);
+ m_jit.ensureShadowChickenPacket(vm(), shadowPacketReg, scratch1Reg, scratch2Reg);
JSValueOperand thisValue(this, node->child1());
JSValueRegs thisRegs = thisValue.jsValueRegs();
@@ -12973,7 +12977,7 @@
break;
}
- m_jit.emitLoadStructure(*m_jit.vm(), objectGPR, tempGPR, temp2GPR);
+ m_jit.emitLoadStructure(vm(), objectGPR, tempGPR, temp2GPR);
AbstractValue& value = m_state.forNode(node->child1());
if ((value.m_type && !(value.m_type & ~SpecObject)) && value.m_structure.isFinite()) {
@@ -13174,7 +13178,7 @@
emitAllocateJSObject<JSArray>(resultGPR, TrustedImmPtr(structure), storageGPR, scratchGPR, scratch2GPR, slowCases);
- m_jit.mutatorFence(*m_jit.vm());
+ m_jit.mutatorFence(vm());
addSlowPathGenerator(makeUnique<CallArrayAllocatorWithVariableSizeSlowPathGenerator>(
slowCases, this, operationNewArrayWithSize, resultGPR,
@@ -13401,7 +13405,7 @@
}
// Load the TypeProfilerLog into Scratch2.
- TypeProfilerLog* cachedTypeProfilerLog = m_jit.vm()->typeProfilerLog();
+ TypeProfilerLog* cachedTypeProfilerLog = vm().typeProfilerLog();
m_jit.move(TrustedImmPtr(cachedTypeProfilerLog), scratch2GPR);
// Load the next LogEntry into Scratch1.
@@ -13651,14 +13655,14 @@
GPRReg scratch2GPR = scratch2.gpr();
CCallHelpers::JumpList slowPath;
- 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);
+ Allocator allocatorValue = allocatorForNonVirtualConcurrently<JSRopeString>(vm(), sizeof(JSRopeString), AllocatorForMode::AllocatorIfExists);
+ emitAllocateJSCell(resultGPR, JITAllocator::constant(allocatorValue), allocatorGPR, TrustedImmPtr(m_jit.graph().registerStructure(vm().stringStructure.get())), scratchGPR, slowPath);
// This puts nullptr for the first fiber. It makes visitChildren safe even if this JSRopeString is discarded due to the speculation failure in the following path.
m_jit.storePtr(TrustedImmPtr(JSString::isRopeInPointer), CCallHelpers::Address(resultGPR, JSRopeString::offsetOfFiber0()));
{
- if (JSString* string = edges[0]->dynamicCastConstant<JSString*>(*m_jit.vm())) {
+ if (JSString* string = edges[0]->dynamicCastConstant<JSString*>(vm())) {
m_jit.move(TrustedImm32(string->is8Bit() ? StringImpl::flagIs8Bit() : 0), scratchGPR);
m_jit.move(TrustedImm32(string->length()), allocatorGPR);
} else {
@@ -13690,7 +13694,7 @@
}
for (unsigned i = 1; i < numOpGPRs; ++i) {
- if (JSString* string = edges[i]->dynamicCastConstant<JSString*>(*m_jit.vm())) {
+ if (JSString* string = edges[i]->dynamicCastConstant<JSString*>(vm())) {
m_jit.and32(TrustedImm32(string->is8Bit() ? StringImpl::flagIs8Bit() : 0), scratchGPR);
speculationCheck(
Uncountable, JSValueSource(), nullptr,
@@ -13758,10 +13762,10 @@
auto isNonEmptyString = m_jit.branchTest32(CCallHelpers::NonZero, allocatorGPR);
- m_jit.move(TrustedImmPtr::weakPointer(m_jit.graph(), jsEmptyString(&m_jit.graph().m_vm)), resultGPR);
+ m_jit.move(TrustedImmPtr::weakPointer(m_jit.graph(), jsEmptyString(m_jit.graph().m_vm)), resultGPR);
isNonEmptyString.link(&m_jit);
- m_jit.mutatorFence(*m_jit.vm());
+ m_jit.mutatorFence(vm());
switch (numOpGPRs) {
case 2:
diff --git a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h
index 507d2fc..88d8b32 100644
--- a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h
+++ b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h
@@ -113,7 +113,7 @@
VM& vm()
{
- return *m_jit.vm();
+ return m_jit.vm();
}
struct TrustedImmPtr {
@@ -991,7 +991,7 @@
// anyway since it was not being updated by JIT'ed code by design.
for (unsigned i = 0; i < sizeof(void*) / 4; i++)
- m_jit.store32(TrustedImm32(0xbadbeef), reinterpret_cast<char*>(&m_jit.vm()->topCallFrame) + i * 4);
+ m_jit.store32(TrustedImm32(0xbadbeef), reinterpret_cast<char*>(&vm().topCallFrame) + i * 4);
}
#else
void prepareForExternalCall() { }
@@ -1518,7 +1518,7 @@
GPRReg resultGPR, StructureType structure, StorageType storage, GPRReg scratchGPR1,
GPRReg scratchGPR2, MacroAssembler::JumpList& slowPath, size_t size)
{
- m_jit.emitAllocateJSObjectWithKnownSize<ClassType>(*m_jit.vm(), resultGPR, structure, storage, scratchGPR1, scratchGPR2, slowPath, size);
+ m_jit.emitAllocateJSObjectWithKnownSize<ClassType>(vm(), resultGPR, structure, storage, scratchGPR1, scratchGPR2, slowPath, size);
}
// Convenience allocator for a built-in object.
@@ -1526,20 +1526,20 @@
void emitAllocateJSObject(GPRReg resultGPR, StructureType structure, StorageType storage,
GPRReg scratchGPR1, GPRReg scratchGPR2, MacroAssembler::JumpList& slowPath)
{
- m_jit.emitAllocateJSObject<ClassType>(*m_jit.vm(), resultGPR, structure, storage, scratchGPR1, scratchGPR2, slowPath);
+ m_jit.emitAllocateJSObject<ClassType>(vm(), resultGPR, structure, storage, scratchGPR1, scratchGPR2, slowPath);
}
template <typename ClassType, typename StructureType> // StructureType and StorageType can be GPR or ImmPtr.
void emitAllocateVariableSizedJSObject(GPRReg resultGPR, StructureType structure, GPRReg allocationSize, GPRReg scratchGPR1, GPRReg scratchGPR2, MacroAssembler::JumpList& slowPath)
{
- m_jit.emitAllocateVariableSizedJSObject<ClassType>(*m_jit.vm(), resultGPR, structure, allocationSize, scratchGPR1, scratchGPR2, slowPath);
+ m_jit.emitAllocateVariableSizedJSObject<ClassType>(vm(), resultGPR, structure, allocationSize, scratchGPR1, scratchGPR2, slowPath);
}
template<typename ClassType>
void emitAllocateDestructibleObject(GPRReg resultGPR, RegisteredStructure structure,
GPRReg scratchGPR1, GPRReg scratchGPR2, MacroAssembler::JumpList& slowPath)
{
- m_jit.emitAllocateDestructibleObject<ClassType>(*m_jit.vm(), resultGPR, structure.get(), scratchGPR1, scratchGPR2, slowPath);
+ m_jit.emitAllocateDestructibleObject<ClassType>(vm(), resultGPR, structure.get(), scratchGPR1, scratchGPR2, slowPath);
}
void emitAllocateRawObject(GPRReg resultGPR, RegisteredStructure, GPRReg storageGPR, unsigned numElements, unsigned vectorLength);
diff --git a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp
index dc5a3b4..b665561 100644
--- a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp
+++ b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2011-2019 Apple Inc. All rights reserved.
* Copyright (C) 2011 Intel Corporation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -588,7 +588,7 @@
FunctionExecutable* functionExecutable = nullptr;
if (isDirect) {
executable = node->castOperand<ExecutableBase*>();
- functionExecutable = jsDynamicCast<FunctionExecutable*>(*m_jit.vm(), executable);
+ functionExecutable = jsDynamicCast<FunctionExecutable*>(vm(), executable);
}
unsigned numPassedArgs = 0;
@@ -622,7 +622,7 @@
else
inlineCallFrame = node->origin.semantic.inlineCallFrame();
// emitSetupVarargsFrameFastCase modifies the stack pointer if it succeeds.
- emitSetupVarargsFrameFastCase(*m_jit.vm(), m_jit, scratchGPR2, scratchGPR1, scratchGPR2, scratchGPR3, inlineCallFrame, data->firstVarArgOffset, slowCase);
+ emitSetupVarargsFrameFastCase(vm(), m_jit, scratchGPR2, scratchGPR1, scratchGPR2, scratchGPR3, inlineCallFrame, data->firstVarArgOffset, slowCase);
JITCompiler::Jump done = m_jit.jump();
slowCase.link(&m_jit);
callOperation(operationThrowStackOverflowForVarargs);
@@ -817,7 +817,7 @@
m_jit.addPtr(TrustedImm32(requiredBytes), JITCompiler::stackPointerRegister);
m_jit.load32(JITCompiler::calleeFrameSlot(CallFrameSlot::callee).withOffset(PayloadOffset), GPRInfo::regT0);
m_jit.load32(JITCompiler::calleeFrameSlot(CallFrameSlot::callee).withOffset(TagOffset), GPRInfo::regT1);
- m_jit.emitDumbVirtualCall(*m_jit.vm(), info);
+ m_jit.emitDumbVirtualCall(vm(), info);
done.link(&m_jit);
setResultAndResetStack();
@@ -1570,7 +1570,7 @@
bool shouldCheckMasqueradesAsUndefined = !masqueradesAsUndefinedWatchpointIsStillValid();
JSGlobalObject* globalObject = m_jit.graph().globalObjectFor(node->origin.semantic);
bool negateResult = true;
- m_jit.emitConvertValueToBoolean(*m_jit.vm(), arg1.jsValueRegs(), resultGPR, temp.gpr(), valueFPR.fpr(), tempFPR.fpr(), shouldCheckMasqueradesAsUndefined, globalObject, negateResult);
+ m_jit.emitConvertValueToBoolean(vm(), arg1.jsValueRegs(), resultGPR, temp.gpr(), valueFPR.fpr(), tempFPR.fpr(), shouldCheckMasqueradesAsUndefined, globalObject, negateResult);
booleanResult(resultGPR, node);
return;
}
@@ -1715,7 +1715,7 @@
bool shouldCheckMasqueradesAsUndefined = !masqueradesAsUndefinedWatchpointIsStillValid();
JSGlobalObject* globalObject = m_jit.graph().globalObjectFor(node->origin.semantic);
- auto falsey = m_jit.branchIfFalsey(*m_jit.vm(), valueRegs, resultGPR, temp.gpr(), valueFPR.fpr(), tempFPR.fpr(), shouldCheckMasqueradesAsUndefined, globalObject);
+ auto falsey = m_jit.branchIfFalsey(vm(), valueRegs, resultGPR, temp.gpr(), valueFPR.fpr(), tempFPR.fpr(), shouldCheckMasqueradesAsUndefined, globalObject);
addBranch(falsey, notTaken);
jump(taken, ForceJump);
@@ -3939,8 +3939,8 @@
m_jit.add32(structureIDGPR, hashGPR);
m_jit.and32(TrustedImm32(HasOwnPropertyCache::mask), hashGPR);
m_jit.mul32(TrustedImm32(sizeof(HasOwnPropertyCache::Entry)), hashGPR, hashGPR);
- ASSERT(m_jit.vm()->hasOwnPropertyCache());
- m_jit.move(TrustedImmPtr(m_jit.vm()->hasOwnPropertyCache()), tempGPR);
+ ASSERT(vm().hasOwnPropertyCache());
+ m_jit.move(TrustedImmPtr(vm().hasOwnPropertyCache()), tempGPR);
slowPath.append(m_jit.branchPtr(MacroAssembler::NotEqual,
MacroAssembler::BaseIndex(tempGPR, hashGPR, MacroAssembler::TimesOne, HasOwnPropertyCache::Entry::offsetOfImpl()), implGPR));
m_jit.load8(MacroAssembler::BaseIndex(tempGPR, hashGPR, MacroAssembler::TimesOne, HasOwnPropertyCache::Entry::offsetOfResult()), resultGPR);
diff --git a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp
index 794ad02..4948fe8 100644
--- a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp
+++ b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp
@@ -247,7 +247,7 @@
GPRReg localGlobalObjectGPR = localGlobalObject.gpr();
GPRReg remoteGlobalObjectGPR = remoteGlobalObject.gpr();
m_jit.move(TrustedImmPtr::weakPointer(m_jit.graph(), m_jit.graph().globalObjectFor(m_currentNode->origin.semantic)), localGlobalObjectGPR);
- m_jit.emitLoadStructure(*m_jit.vm(), argGPR, resultGPR, scratch.gpr());
+ m_jit.emitLoadStructure(vm(), argGPR, resultGPR, scratch.gpr());
m_jit.loadPtr(JITCompiler::Address(resultGPR, Structure::globalObjectOffset()), remoteGlobalObjectGPR);
m_jit.comparePtr(JITCompiler::Equal, localGlobalObjectGPR, remoteGlobalObjectGPR, resultGPR);
done.append(m_jit.jump());
@@ -300,7 +300,7 @@
GPRReg localGlobalObjectGPR = localGlobalObject.gpr();
GPRReg remoteGlobalObjectGPR = remoteGlobalObject.gpr();
m_jit.move(TrustedImmPtr::weakPointer(m_jit.graph(), m_jit.graph().globalObjectFor(m_currentNode->origin.semantic)), localGlobalObjectGPR);
- m_jit.emitLoadStructure(*m_jit.vm(), argGPR, resultGPR, scratch.gpr());
+ m_jit.emitLoadStructure(vm(), argGPR, resultGPR, scratch.gpr());
m_jit.loadPtr(JITCompiler::Address(resultGPR, Structure::globalObjectOffset()), remoteGlobalObjectGPR);
branchPtr(JITCompiler::Equal, localGlobalObjectGPR, remoteGlobalObjectGPR, taken);
@@ -547,7 +547,7 @@
FunctionExecutable* functionExecutable = nullptr;
if (isDirect) {
executable = node->castOperand<ExecutableBase*>();
- functionExecutable = jsDynamicCast<FunctionExecutable*>(*m_jit.vm(), executable);
+ functionExecutable = jsDynamicCast<FunctionExecutable*>(vm(), executable);
}
unsigned numPassedArgs = 0;
@@ -581,7 +581,7 @@
else
inlineCallFrame = node->origin.semantic.inlineCallFrame();
// emitSetupVarargsFrameFastCase modifies the stack pointer if it succeeds.
- emitSetupVarargsFrameFastCase(*m_jit.vm(), m_jit, scratchGPR2, scratchGPR1, scratchGPR2, scratchGPR3, inlineCallFrame, data->firstVarArgOffset, slowCase);
+ emitSetupVarargsFrameFastCase(vm(), m_jit, scratchGPR2, scratchGPR1, scratchGPR2, scratchGPR3, inlineCallFrame, data->firstVarArgOffset, slowCase);
JITCompiler::Jump done = m_jit.jump();
slowCase.link(&m_jit);
callOperation(operationThrowStackOverflowForVarargs);
@@ -767,7 +767,7 @@
// This is the part where we meant to make a normal call. Oops.
m_jit.addPtr(TrustedImm32(requiredBytes), JITCompiler::stackPointerRegister);
m_jit.load64(JITCompiler::calleeFrameSlot(CallFrameSlot::callee), GPRInfo::regT0);
- m_jit.emitDumbVirtualCall(*m_jit.vm(), callLinkInfo);
+ m_jit.emitDumbVirtualCall(vm(), callLinkInfo);
done.link(&m_jit);
setResultAndResetStack();
@@ -1603,7 +1603,7 @@
MacroAssembler::Address(valueGPR, JSCell::typeInfoFlagsOffset()),
MacroAssembler::TrustedImm32(MasqueradesAsUndefined));
- m_jit.emitLoadStructure(*m_jit.vm(), valueGPR, structureGPR, scratchGPR);
+ m_jit.emitLoadStructure(vm(), valueGPR, structureGPR, scratchGPR);
speculationCheck(BadType, JSValueRegs(valueGPR), nodeUse,
m_jit.branchPtr(
MacroAssembler::Equal,
@@ -1709,7 +1709,7 @@
scratchGPR = scratch->gpr();
}
bool negateResult = true;
- m_jit.emitConvertValueToBoolean(*m_jit.vm(), JSValueRegs(arg1GPR), resultGPR, scratchGPR, valueFPR.fpr(), tempFPR.fpr(), shouldCheckMasqueradesAsUndefined, globalObject, negateResult);
+ m_jit.emitConvertValueToBoolean(vm(), JSValueRegs(arg1GPR), resultGPR, scratchGPR, valueFPR.fpr(), tempFPR.fpr(), shouldCheckMasqueradesAsUndefined, globalObject, negateResult);
m_jit.or32(TrustedImm32(ValueFalse), resultGPR);
jsValueResult(resultGPR, node, DataFormatJSBoolean);
return;
@@ -1754,7 +1754,7 @@
MacroAssembler::Address(valueGPR, JSCell::typeInfoFlagsOffset()),
TrustedImm32(MasqueradesAsUndefined));
- m_jit.emitLoadStructure(*m_jit.vm(), valueGPR, structureGPR, scratchGPR);
+ m_jit.emitLoadStructure(vm(), valueGPR, structureGPR, scratchGPR);
speculationCheck(BadType, JSValueRegs(valueGPR), nodeUse,
m_jit.branchPtr(
MacroAssembler::Equal,
@@ -1882,7 +1882,7 @@
value.use();
JSGlobalObject* globalObject = m_jit.graph().globalObjectFor(node->origin.semantic);
- auto truthy = m_jit.branchIfTruthy(*m_jit.vm(), JSValueRegs(valueGPR), resultGPR, scratchGPR, valueFPR, tempFPR, shouldCheckMasqueradesAsUndefined, globalObject);
+ auto truthy = m_jit.branchIfTruthy(vm(), JSValueRegs(valueGPR), resultGPR, scratchGPR, valueFPR, tempFPR, shouldCheckMasqueradesAsUndefined, globalObject);
addBranch(truthy, taken);
jump(notTaken);
}
@@ -1902,7 +1902,7 @@
if (validateDFGDoesGC) {
bool expectDoesGC = doesGC(m_jit.graph(), node);
- m_jit.store8(TrustedImm32(expectDoesGC), m_jit.vm()->heap.addressOfExpectDoesGC());
+ m_jit.store8(TrustedImm32(expectDoesGC), vm().heap.addressOfExpectDoesGC());
}
#if ENABLE(DFG_REGISTER_ALLOCATION_VALIDATION)
@@ -3912,7 +3912,7 @@
GPRReg localGlobalObjectGPR = localGlobalObject.gpr();
GPRReg remoteGlobalObjectGPR = remoteGlobalObject.gpr();
m_jit.move(TrustedImmPtr::weakPointer(m_jit.graph(), m_jit.globalObjectFor(node->origin.semantic)), localGlobalObjectGPR);
- m_jit.emitLoadStructure(*m_jit.vm(), value.gpr(), result.gpr(), scratch.gpr());
+ m_jit.emitLoadStructure(vm(), value.gpr(), result.gpr(), scratch.gpr());
m_jit.loadPtr(JITCompiler::Address(result.gpr(), Structure::globalObjectOffset()), remoteGlobalObjectGPR);
m_jit.comparePtr(JITCompiler::Equal, localGlobalObjectGPR, remoteGlobalObjectGPR, result.gpr());
}
@@ -4234,9 +4234,9 @@
notPresentInTable.link(&m_jit);
if (node->child1().useKind() == MapObjectUse)
- m_jit.move(TrustedImmPtr::weakPointer(m_jit.graph(), m_jit.vm()->sentinelMapBucket()), resultGPR);
+ m_jit.move(TrustedImmPtr::weakPointer(m_jit.graph(), vm().sentinelMapBucket()), resultGPR);
else
- m_jit.move(TrustedImmPtr::weakPointer(m_jit.graph(), m_jit.vm()->sentinelSetBucket()), resultGPR);
+ m_jit.move(TrustedImmPtr::weakPointer(m_jit.graph(), vm().sentinelSetBucket()), resultGPR);
done.link(&m_jit);
cellResult(resultGPR, node);
break;
@@ -4509,8 +4509,8 @@
m_jit.lshift32(TrustedImm32(getLSBSet(sizeof(HasOwnPropertyCache::Entry))), hashGPR);
else
m_jit.mul32(TrustedImm32(sizeof(HasOwnPropertyCache::Entry)), hashGPR, hashGPR);
- ASSERT(m_jit.vm()->hasOwnPropertyCache());
- m_jit.move(TrustedImmPtr(m_jit.vm()->hasOwnPropertyCache()), tempGPR);
+ ASSERT(vm().hasOwnPropertyCache());
+ m_jit.move(TrustedImmPtr(vm().hasOwnPropertyCache()), tempGPR);
slowPath.append(m_jit.branchPtr(MacroAssembler::NotEqual,
MacroAssembler::BaseIndex(tempGPR, hashGPR, MacroAssembler::TimesOne, HasOwnPropertyCache::Entry::offsetOfImpl()), implGPR));
m_jit.load8(MacroAssembler::BaseIndex(tempGPR, hashGPR, MacroAssembler::TimesOne, HasOwnPropertyCache::Entry::offsetOfResult()), resultGPR);
diff --git a/Source/JavaScriptCore/dfg/DFGThunks.cpp b/Source/JavaScriptCore/dfg/DFGThunks.cpp
index 8ae66ee..8c96c7e 100644
--- a/Source/JavaScriptCore/dfg/DFGThunks.cpp
+++ b/Source/JavaScriptCore/dfg/DFGThunks.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2011-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
@@ -40,15 +40,15 @@
namespace JSC { namespace DFG {
-MacroAssemblerCodeRef<JITThunkPtrTag> osrExitThunkGenerator(VM* vm)
+MacroAssemblerCodeRef<JITThunkPtrTag> osrExitThunkGenerator(VM& vm)
{
MacroAssembler jit;
- jit.probe(OSRExit::executeOSRExit, vm);
+ jit.probe(OSRExit::executeOSRExit, &vm);
LinkBuffer patchBuffer(jit, GLOBAL_THUNK_ID);
return FINALIZE_CODE(patchBuffer, JITThunkPtrTag, "DFG OSR exit thunk");
}
-MacroAssemblerCodeRef<JITThunkPtrTag> osrExitGenerationThunkGenerator(VM* vm)
+MacroAssemblerCodeRef<JITThunkPtrTag> osrExitGenerationThunkGenerator(VM& vm)
{
MacroAssembler jit;
@@ -56,7 +56,7 @@
adjustFrameAndStackInOSRExitCompilerThunk<DFG::JITCode>(jit, vm, JITType::DFGJIT);
size_t scratchSize = sizeof(EncodedJSValue) * (GPRInfo::numberOfRegisters + FPRInfo::numberOfRegisters);
- ScratchBuffer* scratchBuffer = vm->scratchBufferForSize(scratchSize);
+ ScratchBuffer* scratchBuffer = vm.scratchBufferForSize(scratchSize);
EncodedJSValue* buffer = static_cast<EncodedJSValue*>(scratchBuffer->dataBuffer());
for (unsigned i = 0; i < GPRInfo::numberOfRegisters; ++i) {
@@ -99,7 +99,7 @@
#endif
}
- jit.farJump(MacroAssembler::AbsoluteAddress(&vm->osrExitJumpDestination), OSRExitPtrTag);
+ jit.farJump(MacroAssembler::AbsoluteAddress(&vm.osrExitJumpDestination), OSRExitPtrTag);
LinkBuffer patchBuffer(jit, GLOBAL_THUNK_ID);
@@ -108,7 +108,7 @@
return FINALIZE_CODE(patchBuffer, JITThunkPtrTag, "DFG OSR exit generation thunk");
}
-MacroAssemblerCodeRef<JITThunkPtrTag> osrEntryThunkGenerator(VM* vm)
+MacroAssemblerCodeRef<JITThunkPtrTag> osrEntryThunkGenerator(VM& vm)
{
AssemblyHelpers jit(nullptr);
@@ -141,7 +141,7 @@
jit.abortWithReason(DFGUnreasonableOSREntryJumpDestination);
ok.link(&jit);
- jit.restoreCalleeSavesFromEntryFrameCalleeSavesBuffer(vm->topEntryFrame);
+ jit.restoreCalleeSavesFromEntryFrameCalleeSavesBuffer(vm.topEntryFrame);
jit.emitMaterializeTagCheckRegisters();
jit.farJump(GPRInfo::regT1, GPRInfo::callFrameRegister);
diff --git a/Source/JavaScriptCore/dfg/DFGThunks.h b/Source/JavaScriptCore/dfg/DFGThunks.h
index a4d560e..05a50a5 100644
--- a/Source/JavaScriptCore/dfg/DFGThunks.h
+++ b/Source/JavaScriptCore/dfg/DFGThunks.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2011-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
@@ -35,9 +35,9 @@
namespace DFG {
-MacroAssemblerCodeRef<JITThunkPtrTag> osrExitThunkGenerator(VM*);
-MacroAssemblerCodeRef<JITThunkPtrTag> osrExitGenerationThunkGenerator(VM*);
-MacroAssemblerCodeRef<JITThunkPtrTag> osrEntryThunkGenerator(VM*);
+MacroAssemblerCodeRef<JITThunkPtrTag> osrExitThunkGenerator(VM&);
+MacroAssemblerCodeRef<JITThunkPtrTag> osrExitGenerationThunkGenerator(VM&);
+MacroAssemblerCodeRef<JITThunkPtrTag> osrEntryThunkGenerator(VM&);
} } // namespace JSC::DFG
diff --git a/Source/JavaScriptCore/dfg/DFGToFTLForOSREntryDeferredCompilationCallback.cpp b/Source/JavaScriptCore/dfg/DFGToFTLForOSREntryDeferredCompilationCallback.cpp
index ae81542..8db6dbe 100644
--- a/Source/JavaScriptCore/dfg/DFGToFTLForOSREntryDeferredCompilationCallback.cpp
+++ b/Source/JavaScriptCore/dfg/DFGToFTLForOSREntryDeferredCompilationCallback.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-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
@@ -74,7 +74,7 @@
switch (result) {
case CompilationSuccessful: {
- jitCode->setOSREntryBlock(*codeBlock->vm(), profiledDFGCodeBlock, codeBlock);
+ jitCode->setOSREntryBlock(codeBlock->vm(), profiledDFGCodeBlock, codeBlock);
unsigned osrEntryBytecode = codeBlock->jitCode()->ftlForOSREntry()->bytecodeIndex();
jitCode->tierUpEntryTriggers.set(osrEntryBytecode, JITCode::TriggerReason::CompilationDone);
break;
diff --git a/Source/JavaScriptCore/dfg/DFGWorklist.cpp b/Source/JavaScriptCore/dfg/DFGWorklist.cpp
index 8f93034..cd3845d 100644
--- a/Source/JavaScriptCore/dfg/DFGWorklist.cpp
+++ b/Source/JavaScriptCore/dfg/DFGWorklist.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-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
@@ -380,7 +380,7 @@
void Worklist::visitWeakReferences(SlotVisitor& visitor)
{
- VM* vm = visitor.heap()->vm();
+ VM* vm = &visitor.heap()->vm();
{
LockHolder locker(*m_lock);
for (PlanMap::iterator iter = m_plans.begin(); iter != m_plans.end(); ++iter) {
diff --git a/Source/JavaScriptCore/dynbench.cpp b/Source/JavaScriptCore/dynbench.cpp
index b790a17..f9eec48 100644
--- a/Source/JavaScriptCore/dynbench.cpp
+++ b/Source/JavaScriptCore/dynbench.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-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
@@ -90,22 +90,22 @@
WTF::initializeMainThread();
JSC::initializeThreading();
- VM* vm = &VM::create(LargeHeap).leakRef();
+ VM& vm = VM::create(LargeHeap).leakRef();
{
JSLockHolder locker(vm);
JSGlobalObject* globalObject =
- JSGlobalObject::create(*vm, JSGlobalObject::createStructure(*vm, jsNull()));
+ JSGlobalObject::create(vm, JSGlobalObject::createStructure(vm, jsNull()));
ExecState* exec = globalObject->globalExec();
- Identifier identF = Identifier::fromString(exec, "f");
- Identifier identG = Identifier::fromString(exec, "g");
+ Identifier identF = Identifier::fromString(vm, "f");
+ Identifier identG = Identifier::fromString(vm, "g");
Structure* objectStructure =
- JSFinalObject::createStructure(*vm, globalObject, globalObject->objectPrototype(), 2);
+ JSFinalObject::createStructure(vm, globalObject, globalObject->objectPrototype(), 2);
// Non-strict dynamic get by id:
- JSValue object = JSFinalObject::create(*vm, objectStructure);
+ JSValue object = JSFinalObject::create(vm, objectStructure);
{
PutPropertySlot slot(object, false, PutPropertySlot::PutById);
object.putInline(exec, identF, jsNumber(42), slot);
@@ -127,7 +127,7 @@
});
// Non-strict dynamic put by id replace:
- object = JSFinalObject::create(*vm, objectStructure);
+ object = JSFinalObject::create(vm, objectStructure);
{
PutPropertySlot slot(object, false, PutPropertySlot::PutById);
object.putInline(exec, identF, jsNumber(42), slot);
@@ -158,7 +158,7 @@
1000000,
[&] (unsigned iterationCount) {
for (unsigned i = iterationCount; i--;) {
- JSValue object = JSFinalObject::create(*vm, objectStructure);
+ JSValue object = JSFinalObject::create(vm, objectStructure);
{
PutPropertySlot slot(object, false, PutPropertySlot::PutById);
object.putInline(exec, identF, jsNumber(i), slot);
@@ -171,7 +171,7 @@
});
// Non-strict dynamic get by id with dynamic store context:
- object = JSFinalObject::create(*vm, objectStructure);
+ object = JSFinalObject::create(vm, objectStructure);
{
PutPropertySlot slot(object, false);
object.putInline(exec, identF, jsNumber(42), slot);
@@ -193,7 +193,7 @@
});
// Non-strict dynamic put by id replace with dynamic store context:
- object = JSFinalObject::create(*vm, objectStructure);
+ object = JSFinalObject::create(vm, objectStructure);
{
PutPropertySlot slot(object, false);
object.putInline(exec, identF, jsNumber(42), slot);
@@ -224,7 +224,7 @@
1000000,
[&] (unsigned iterationCount) {
for (unsigned i = iterationCount; i--;) {
- JSValue object = JSFinalObject::create(*vm, objectStructure);
+ JSValue object = JSFinalObject::create(vm, objectStructure);
{
PutPropertySlot slot(object, false);
object.putInline(exec, identF, jsNumber(i), slot);
diff --git a/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp b/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp
index 09b3427..749bc0f 100644
--- a/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp
+++ b/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp
@@ -6869,7 +6869,7 @@
m_out.branch(m_out.isZero32(flagsAndLength.length), rarely(emptyCase), usually(continuation));
LBasicBlock lastNext = m_out.appendTo(emptyCase, slowPath);
- ValueFromBlock emptyResult = m_out.anchor(weakPointer(jsEmptyString(&m_graph.m_vm)));
+ ValueFromBlock emptyResult = m_out.anchor(weakPointer(jsEmptyString(m_graph.m_vm)));
m_out.jump(continuation);
m_out.appendTo(slowPath, continuation);
@@ -12282,7 +12282,7 @@
Vector<ValueFromBlock, 5> results;
m_out.appendTo(emptyCase, notEmptyCase);
- results.append(m_out.anchor(weakPointer(jsEmptyString(&vm()))));
+ results.append(m_out.anchor(weakPointer(jsEmptyString(vm()))));
m_out.jump(continuation);
m_out.appendTo(notEmptyCase, oneCharCase);
@@ -13880,7 +13880,7 @@
edge, CellCaseSpeculatesObject, SpeculateNullOrUndefined,
ManualOperandSpeculation));
case StringUse:
- return m_out.notEqual(lowString(edge), weakPointer(jsEmptyString(&m_graph.m_vm)));
+ return m_out.notEqual(lowString(edge), weakPointer(jsEmptyString(m_graph.m_vm)));
case StringOrOtherUse: {
LValue value = lowJSValue(edge, ManualOperandSpeculation);
@@ -13892,7 +13892,7 @@
LBasicBlock lastNext = m_out.appendTo(cellCase, notCellCase);
FTL_TYPE_CHECK(jsValueValue(value), edge, (~SpecCellCheck) | SpecString, isNotString(value));
- ValueFromBlock stringResult = m_out.anchor(m_out.notEqual(value, weakPointer(jsEmptyString(&m_graph.m_vm))));
+ ValueFromBlock stringResult = m_out.anchor(m_out.notEqual(value, weakPointer(jsEmptyString(m_graph.m_vm))));
m_out.jump(continuation);
m_out.appendTo(notCellCase, continuation);
@@ -13949,7 +13949,7 @@
unsure(bigIntCase), unsure(notStringOrBigIntCase));
m_out.appendTo(stringCase, bigIntCase);
- results.append(m_out.anchor(m_out.notEqual(value, weakPointer(jsEmptyString(&m_graph.m_vm)))));
+ results.append(m_out.anchor(m_out.notEqual(value, weakPointer(jsEmptyString(m_graph.m_vm)))));
m_out.jump(continuation);
m_out.appendTo(bigIntCase, notStringOrBigIntCase);
diff --git a/Source/JavaScriptCore/ftl/FTLThunks.cpp b/Source/JavaScriptCore/ftl/FTLThunks.cpp
index 92b5bd3..fa9f850 100644
--- a/Source/JavaScriptCore/ftl/FTLThunks.cpp
+++ b/Source/JavaScriptCore/ftl/FTLThunks.cpp
@@ -47,7 +47,7 @@
};
static MacroAssemblerCodeRef<JITThunkPtrTag> genericGenerationThunkGenerator(
- VM* vm, FunctionPtr<CFunctionPtrTag> generationFunction, PtrTag resultTag, const char* name, unsigned extraPopsToRestore, FrameAndStackAdjustmentRequirement frameAndStackAdjustmentRequirement)
+ VM& vm, FunctionPtr<CFunctionPtrTag> generationFunction, PtrTag resultTag, const char* name, unsigned extraPopsToRestore, FrameAndStackAdjustmentRequirement frameAndStackAdjustmentRequirement)
{
AssemblyHelpers jit(nullptr);
@@ -73,7 +73,7 @@
numberOfRequiredPops++;
} while (stackMisalignment % stackAlignmentBytes());
- ScratchBuffer* scratchBuffer = vm->scratchBufferForSize(requiredScratchMemorySizeInBytes());
+ ScratchBuffer* scratchBuffer = vm.scratchBufferForSize(requiredScratchMemorySizeInBytes());
char* buffer = static_cast<char*>(scratchBuffer->dataBuffer());
saveAllRegisters(jit, buffer);
@@ -128,14 +128,14 @@
return FINALIZE_CODE(patchBuffer, JITThunkPtrTag, "%s", name);
}
-MacroAssemblerCodeRef<JITThunkPtrTag> osrExitGenerationThunkGenerator(VM* vm)
+MacroAssemblerCodeRef<JITThunkPtrTag> osrExitGenerationThunkGenerator(VM& vm)
{
unsigned extraPopsToRestore = 0;
return genericGenerationThunkGenerator(
vm, compileFTLOSRExit, OSRExitPtrTag, "FTL OSR exit generation thunk", extraPopsToRestore, FrameAndStackAdjustmentRequirement::Needed);
}
-MacroAssemblerCodeRef<JITThunkPtrTag> lazySlowPathGenerationThunkGenerator(VM* vm)
+MacroAssemblerCodeRef<JITThunkPtrTag> lazySlowPathGenerationThunkGenerator(VM& vm)
{
unsigned extraPopsToRestore = 1;
return genericGenerationThunkGenerator(
diff --git a/Source/JavaScriptCore/ftl/FTLThunks.h b/Source/JavaScriptCore/ftl/FTLThunks.h
index 95b9dfe..7184da1 100644
--- a/Source/JavaScriptCore/ftl/FTLThunks.h
+++ b/Source/JavaScriptCore/ftl/FTLThunks.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-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
@@ -38,8 +38,8 @@
namespace FTL {
-MacroAssemblerCodeRef<JITThunkPtrTag> osrExitGenerationThunkGenerator(VM*);
-MacroAssemblerCodeRef<JITThunkPtrTag> lazySlowPathGenerationThunkGenerator(VM*);
+MacroAssemblerCodeRef<JITThunkPtrTag> osrExitGenerationThunkGenerator(VM&);
+MacroAssemblerCodeRef<JITThunkPtrTag> lazySlowPathGenerationThunkGenerator(VM&);
MacroAssemblerCodeRef<JITThunkPtrTag> slowPathCallThunkGenerator(const SlowPathCallKey&);
template<typename KeyTypeArgument>
diff --git a/Source/JavaScriptCore/heap/CellContainer.h b/Source/JavaScriptCore/heap/CellContainer.h
index e4f2ff2..ef5b505 100644
--- a/Source/JavaScriptCore/heap/CellContainer.h
+++ b/Source/JavaScriptCore/heap/CellContainer.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-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
@@ -58,7 +58,7 @@
{
}
- VM* vm() const;
+ VM& vm() const;
Heap* heap() const;
explicit operator bool() const { return !!m_encodedPointer; }
diff --git a/Source/JavaScriptCore/heap/CellContainerInlines.h b/Source/JavaScriptCore/heap/CellContainerInlines.h
index 6e66572..2c09b24 100644
--- a/Source/JavaScriptCore/heap/CellContainerInlines.h
+++ b/Source/JavaScriptCore/heap/CellContainerInlines.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-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
@@ -33,7 +33,7 @@
namespace JSC {
-inline VM* CellContainer::vm() const
+inline VM& CellContainer::vm() const
{
if (isLargeAllocation())
return largeAllocation().vm();
@@ -42,7 +42,7 @@
inline Heap* CellContainer::heap() const
{
- return &vm()->heap;
+ return &vm().heap;
}
inline bool CellContainer::isMarked(HeapCell* cell) const
diff --git a/Source/JavaScriptCore/heap/CompleteSubspace.cpp b/Source/JavaScriptCore/heap/CompleteSubspace.cpp
index 021b0cd..1d62a8d 100644
--- a/Source/JavaScriptCore/heap/CompleteSubspace.cpp
+++ b/Source/JavaScriptCore/heap/CompleteSubspace.cpp
@@ -125,7 +125,7 @@
if (validateDFGDoesGC)
RELEASE_ASSERT(vm.heap.expectDoesGC());
- sanitizeStackForVM(&vm);
+ sanitizeStackForVM(vm);
if (Allocator allocator = allocatorFor(size, AllocatorForMode::EnsureAllocator))
return allocator.allocate(deferralContext, AllocationFailureMode::ReturnNull);
@@ -169,7 +169,7 @@
ASSERT(oldAllocation->attributes().cellKind == HeapCell::Auxiliary);
ASSERT(size > MarkedSpace::largeCutoff);
- sanitizeStackForVM(&vm);
+ sanitizeStackForVM(vm);
if (size <= Options::largeAllocationCutoff()
&& size <= MarkedSpace::largeCutoff) {
diff --git a/Source/JavaScriptCore/heap/GCActivityCallback.h b/Source/JavaScriptCore/heap/GCActivityCallback.h
index c371f77..05987f1 100644
--- a/Source/JavaScriptCore/heap/GCActivityCallback.h
+++ b/Source/JavaScriptCore/heap/GCActivityCallback.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010, 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2010-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
@@ -65,7 +65,7 @@
virtual double gcTimeSlice(size_t bytes) = 0;
virtual double deathRate(Heap&) = 0;
- GCActivityCallback(VM* vm)
+ GCActivityCallback(VM& vm)
: Base(vm)
, m_enabled(true)
, m_delay(s_decade)
diff --git a/Source/JavaScriptCore/heap/GCAssertions.h b/Source/JavaScriptCore/heap/GCAssertions.h
index b275233..3dac5cf 100644
--- a/Source/JavaScriptCore/heap/GCAssertions.h
+++ b/Source/JavaScriptCore/heap/GCAssertions.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-2019 Apple Inc. All rights reserved.
* Copyright (C) 2015 Igalia S.L.
*
* Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
#define ASSERT_GC_OBJECT_INHERITS(object, classInfo) do {\
ASSERT_GC_OBJECT_LOOKS_VALID(object); \
- RELEASE_ASSERT(object->inherits(*object->JSC::JSCell::vm(), classInfo)); \
+ RELEASE_ASSERT(object->inherits(object->JSC::JSCell::vm(), classInfo)); \
} while (0)
// Used to avoid triggering -Wundefined-bool-conversion.
diff --git a/Source/JavaScriptCore/heap/HandleSet.cpp b/Source/JavaScriptCore/heap/HandleSet.cpp
index 9d7d5c6..7fa06ae 100644
--- a/Source/JavaScriptCore/heap/HandleSet.cpp
+++ b/Source/JavaScriptCore/heap/HandleSet.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011-2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2011-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
@@ -34,7 +34,7 @@
namespace JSC {
-HandleSet::HandleSet(VM* vm)
+HandleSet::HandleSet(VM& vm)
: m_vm(vm)
{
grow();
diff --git a/Source/JavaScriptCore/heap/HandleSet.h b/Source/JavaScriptCore/heap/HandleSet.h
index 458daeb..656f4c4 100644
--- a/Source/JavaScriptCore/heap/HandleSet.h
+++ b/Source/JavaScriptCore/heap/HandleSet.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011, 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2011-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
@@ -65,10 +65,10 @@
public:
static HandleSet* heapFor(HandleSlot);
- HandleSet(VM*);
+ HandleSet(VM&);
~HandleSet();
- VM* vm();
+ VM& vm();
HandleSlot allocate();
void deallocate(HandleSlot);
@@ -92,7 +92,7 @@
bool isLiveNode(Node*);
#endif
- VM* m_vm;
+ VM& m_vm;
DoublyLinkedList<HandleBlock> m_blockList;
SentinelLinkedList<Node> m_strongList;
@@ -105,7 +105,7 @@
return toNode(handle)->handleSet();
}
-inline VM* HandleSet::vm()
+inline VM& HandleSet::vm()
{
return m_vm;
}
diff --git a/Source/JavaScriptCore/heap/Heap.cpp b/Source/JavaScriptCore/heap/Heap.cpp
index 46c2039..5f24de7 100644
--- a/Source/JavaScriptCore/heap/Heap.cpp
+++ b/Source/JavaScriptCore/heap/Heap.cpp
@@ -144,17 +144,17 @@
return Options::largeHeapGrowthFactor() * heapSize;
}
-bool isValidSharedInstanceThreadState(VM* vm)
+bool isValidSharedInstanceThreadState(VM& vm)
{
- return vm->currentThreadIsHoldingAPILock();
+ return vm.currentThreadIsHoldingAPILock();
}
-bool isValidThreadState(VM* vm)
+bool isValidThreadState(VM& vm)
{
- if (vm->atomStringTable() != Thread::current().atomStringTable())
+ if (vm.atomStringTable() != Thread::current().atomStringTable())
return false;
- if (vm->isSharedInstance() && !isValidSharedInstanceThreadState(vm))
+ if (vm.isSharedInstance() && !isValidSharedInstanceThreadState(vm))
return false;
return true;
@@ -282,7 +282,7 @@
Heap& m_heap;
};
-Heap::Heap(VM* vm, HeapType heapType)
+Heap::Heap(VM& vm, HeapType heapType)
: m_heapType(heapType)
, m_ramSize(Options::forceRAMSize() ? Options::forceRAMSize() : ramSize())
, m_minBytesPerCycle(minHeapSize(m_heapType, m_ramSize))
@@ -402,7 +402,7 @@
m_isShuttingDown = true;
- RELEASE_ASSERT(!m_vm->entryScope);
+ RELEASE_ASSERT(!m_vm.entryScope);
RELEASE_ASSERT(m_mutatorState == MutatorState::Running);
if (m_collectContinuouslyThread) {
@@ -498,7 +498,7 @@
// and use a temp Vector for the actual releasing.
if (!m_delayedReleaseRecursionCount++) {
while (!m_delayedReleaseObjects.isEmpty()) {
- ASSERT(m_vm->currentThreadIsHoldingAPILock());
+ ASSERT(m_vm.currentThreadIsHoldingAPILock());
auto objectsToRelease = WTFMove(m_delayedReleaseObjects);
@@ -571,7 +571,7 @@
void Heap::protect(JSValue k)
{
ASSERT(k);
- ASSERT(m_vm->currentThreadIsHoldingAPILock());
+ ASSERT(m_vm.currentThreadIsHoldingAPILock());
if (!k.isCell())
return;
@@ -582,7 +582,7 @@
bool Heap::unprotect(JSValue k)
{
ASSERT(k);
- ASSERT(m_vm->currentThreadIsHoldingAPILock());
+ ASSERT(m_vm.currentThreadIsHoldingAPILock());
if (!k.isCell())
return false;
@@ -603,34 +603,34 @@
{
cellSet.forEachMarkedCell(
[&] (HeapCell* cell, HeapCell::Kind) {
- static_cast<CellType*>(cell)->finalizeUnconditionally(*vm());
+ static_cast<CellType*>(cell)->finalizeUnconditionally(vm());
});
}
void Heap::finalizeUnconditionalFinalizers()
{
- vm()->builtinExecutables()->finalizeUnconditionally();
- finalizeMarkedUnconditionalFinalizers<FunctionExecutable>(vm()->functionExecutableSpace.space);
- finalizeMarkedUnconditionalFinalizers<SymbolTable>(vm()->symbolTableSpace);
- vm()->forEachCodeBlockSpace(
+ vm().builtinExecutables()->finalizeUnconditionally();
+ finalizeMarkedUnconditionalFinalizers<FunctionExecutable>(vm().functionExecutableSpace.space);
+ finalizeMarkedUnconditionalFinalizers<SymbolTable>(vm().symbolTableSpace);
+ vm().forEachCodeBlockSpace(
[&] (auto& space) {
this->finalizeMarkedUnconditionalFinalizers<CodeBlock>(space.set);
});
- finalizeMarkedUnconditionalFinalizers<ExecutableToCodeBlockEdge>(vm()->executableToCodeBlockEdgesWithFinalizers);
- finalizeMarkedUnconditionalFinalizers<StructureRareData>(vm()->structureRareDataSpace);
- finalizeMarkedUnconditionalFinalizers<UnlinkedFunctionExecutable>(vm()->unlinkedFunctionExecutableSpace.set);
- if (vm()->m_weakSetSpace)
- finalizeMarkedUnconditionalFinalizers<JSWeakSet>(*vm()->m_weakSetSpace);
- if (vm()->m_weakMapSpace)
- finalizeMarkedUnconditionalFinalizers<JSWeakMap>(*vm()->m_weakMapSpace);
- if (vm()->m_weakObjectRefSpace)
- finalizeMarkedUnconditionalFinalizers<JSWeakObjectRef>(*vm()->m_weakObjectRefSpace);
- if (vm()->m_errorInstanceSpace)
- finalizeMarkedUnconditionalFinalizers<ErrorInstance>(*vm()->m_errorInstanceSpace);
+ finalizeMarkedUnconditionalFinalizers<ExecutableToCodeBlockEdge>(vm().executableToCodeBlockEdgesWithFinalizers);
+ finalizeMarkedUnconditionalFinalizers<StructureRareData>(vm().structureRareDataSpace);
+ finalizeMarkedUnconditionalFinalizers<UnlinkedFunctionExecutable>(vm().unlinkedFunctionExecutableSpace.set);
+ if (vm().m_weakSetSpace)
+ finalizeMarkedUnconditionalFinalizers<JSWeakSet>(*vm().m_weakSetSpace);
+ if (vm().m_weakMapSpace)
+ finalizeMarkedUnconditionalFinalizers<JSWeakMap>(*vm().m_weakMapSpace);
+ if (vm().m_weakObjectRefSpace)
+ finalizeMarkedUnconditionalFinalizers<JSWeakObjectRef>(*vm().m_weakObjectRefSpace);
+ if (vm().m_errorInstanceSpace)
+ finalizeMarkedUnconditionalFinalizers<ErrorInstance>(*vm().m_errorInstanceSpace);
#if ENABLE(WEBASSEMBLY)
- if (vm()->m_webAssemblyCodeBlockSpace)
- finalizeMarkedUnconditionalFinalizers<JSWebAssemblyCodeBlock>(*vm()->m_webAssemblyCodeBlockSpace);
+ if (vm().m_webAssemblyCodeBlockSpace)
+ finalizeMarkedUnconditionalFinalizers<JSWebAssemblyCodeBlock>(*vm().m_webAssemblyCodeBlockSpace);
#endif
}
@@ -649,9 +649,9 @@
if (!VM::canUseJIT())
return;
#if ENABLE(JIT)
- JITWorklist::ensureGlobalWorklist().completeAllForVM(*m_vm);
+ JITWorklist::ensureGlobalWorklist().completeAllForVM(m_vm);
#endif // ENABLE(JIT)
- DFG::completeAllPlansForVM(*m_vm);
+ DFG::completeAllPlansForVM(m_vm);
}
template<typename Func>
@@ -659,7 +659,7 @@
{
m_codeBlocks->iterateCurrentlyExecuting(func);
if (VM::canUseJIT())
- DFG::iterateCodeBlocksForGC(*m_vm, func);
+ DFG::iterateCodeBlocksForGC(m_vm, func);
}
template<typename Func>
@@ -708,7 +708,7 @@
void Heap::gatherJSStackRoots(ConservativeRoots& roots)
{
#if ENABLE(C_LOOP)
- m_vm->interpreter->cloopStack().gatherConservativeRoots(roots, *m_jitStubRoutines, *m_codeBlocks);
+ m_vm.interpreter->cloopStack().gatherConservativeRoots(roots, *m_jitStubRoutines, *m_codeBlocks);
#else
UNUSED_PARAM(roots);
#endif
@@ -719,7 +719,7 @@
#if ENABLE(DFG_JIT)
if (!VM::canUseJIT())
return;
- m_vm->gatherScratchBufferRoots(roots);
+ m_vm.gatherScratchBufferRoots(roots);
#else
UNUSED_PARAM(roots);
#endif
@@ -739,13 +739,13 @@
if (!VM::canUseJIT())
return;
for (unsigned i = DFG::numberOfWorklists(); i--;)
- DFG::existingWorklistForIndex(i).removeDeadPlans(*m_vm);
+ DFG::existingWorklistForIndex(i).removeDeadPlans(m_vm);
#endif
}
bool Heap::isAnalyzingHeap() const
{
- HeapProfiler* heapProfiler = m_vm->heapProfiler();
+ HeapProfiler* heapProfiler = m_vm.heapProfiler();
if (UNLIKELY(heapProfiler))
return heapProfiler->activeHeapAnalyzer();
return false;
@@ -775,7 +775,7 @@
{
if (auto* analyzer = heapProfiler.activeHeapAnalyzer()) {
HeapIterationScope heapIterationScope(*this);
- GatherExtraHeapData functor(*m_vm, *analyzer);
+ GatherExtraHeapData functor(m_vm, *analyzer);
m_objectSpace.forEachLiveCell(heapIterationScope, functor);
}
}
@@ -902,7 +902,7 @@
std::unique_ptr<TypeCountSet> result = makeUnique<TypeCountSet>();
forEachProtectedCell(
[&] (JSCell* cell) {
- recordType(*vm(), *result, cell);
+ recordType(vm(), *result, cell);
});
return result;
}
@@ -915,7 +915,7 @@
iterationScope,
[&] (HeapCell* cell, HeapCell::Kind kind) -> IterationStatus {
if (isJSCellKind(kind))
- recordType(*vm(), *result, static_cast<JSCell*>(cell));
+ recordType(vm(), *result, static_cast<JSCell*>(cell));
return IterationStatus::Continue;
});
return result;
@@ -926,7 +926,7 @@
if (m_collectionScope && effort == DeleteAllCodeIfNotCollecting)
return;
- VM& vm = *m_vm;
+ VM& vm = m_vm;
PreventCollectionScope preventCollectionScope(*this);
// If JavaScript is running, it's not safe to delete all JavaScript code, since
@@ -971,7 +971,7 @@
if (m_collectionScope && effort == DeleteAllCodeIfNotCollecting)
return;
- VM& vm = *m_vm;
+ VM& vm = m_vm;
PreventCollectionScope preventCollectionScope(*this);
RELEASE_ASSERT(!m_collectionScope);
@@ -986,8 +986,8 @@
void Heap::deleteUnmarkedCompiledCode()
{
- vm()->forEachScriptExecutableSpace([] (auto& space) { space.space.sweep(); });
- vm()->forEachCodeBlockSpace([] (auto& space) { space.space.sweep(); }); // Sweeping must occur before deleting stubs, otherwise the stubs might still think they're alive as they get deleted.
+ vm().forEachScriptExecutableSpace([] (auto& space) { space.space.sweep(); });
+ vm().forEachCodeBlockSpace([] (auto& space) { space.space.sweep(); }); // Sweeping must occur before deleting stubs, otherwise the stubs might still think they're alive as they get deleted.
m_jitStubRoutines->deleteUnmarkedJettisonedStubRoutines();
}
@@ -1181,10 +1181,10 @@
unsigned worldState = m_worldState.load();
switch (conn) {
case GCConductor::Mutator:
- RELEASE_ASSERT(worldState & mutatorHasConnBit, worldState, asInt(m_lastPhase), asInt(m_currentPhase), asInt(m_nextPhase), vm()->id(), VM::numberOfIDs(), vm()->isEntered());
+ RELEASE_ASSERT(worldState & mutatorHasConnBit, worldState, asInt(m_lastPhase), asInt(m_currentPhase), asInt(m_nextPhase), vm().id(), VM::numberOfIDs(), vm().isEntered());
return;
case GCConductor::Collector:
- RELEASE_ASSERT(!(worldState & mutatorHasConnBit), worldState, asInt(m_lastPhase), asInt(m_currentPhase), asInt(m_nextPhase), vm()->id(), VM::numberOfIDs(), vm()->isEntered());
+ RELEASE_ASSERT(!(worldState & mutatorHasConnBit), worldState, asInt(m_lastPhase), asInt(m_currentPhase), asInt(m_nextPhase), vm().id(), VM::numberOfIDs(), vm().isEntered());
return;
}
RELEASE_ASSERT_NOT_REACHED();
@@ -1508,8 +1508,8 @@
m_verifier->verify(HeapVerifier::Phase::AfterMarking);
}
- if (vm()->typeProfiler())
- vm()->typeProfiler()->invalidateTypeSetCache(*vm());
+ if (vm().typeProfiler())
+ vm().typeProfiler()->invalidateTypeSetCache(vm());
reapWeakHandles();
pruneStaleEntriesFromWeakGCMaps();
@@ -1648,15 +1648,15 @@
#if ENABLE(JIT)
if (VM::canUseJIT()) {
DeferGCForAWhile awhile(*this);
- if (JITWorklist::ensureGlobalWorklist().completeAllForVM(*m_vm)
+ if (JITWorklist::ensureGlobalWorklist().completeAllForVM(m_vm)
&& conn == GCConductor::Collector)
setGCDidJIT();
}
#endif // ENABLE(JIT)
UNUSED_PARAM(conn);
- if (auto* shadowChicken = vm()->shadowChicken())
- shadowChicken->update(*vm(), vm()->topCallFrame);
+ if (auto* shadowChicken = vm().shadowChicken())
+ shadowChicken->update(vm(), vm().topCallFrame);
m_structureIDTable.flushOldTables();
m_objectSpace.stopAllocating();
@@ -2097,13 +2097,13 @@
sweepInFinalize();
}
- if (HasOwnPropertyCache* cache = vm()->hasOwnPropertyCache())
+ if (HasOwnPropertyCache* cache = vm().hasOwnPropertyCache())
cache->clear();
immutableButterflyToStringCache.clear();
for (const HeapFinalizerCallback& callback : m_heapFinalizerCallbacks)
- callback.run(*vm());
+ callback.run(vm());
if (shouldSweepSynchronously())
sweepSynchronously();
@@ -2118,8 +2118,8 @@
{
stopIfNecessary();
- ASSERT(vm()->currentThreadIsHoldingAPILock());
- RELEASE_ASSERT(vm()->atomStringTable() == Thread::current().atomStringTable());
+ ASSERT(vm().currentThreadIsHoldingAPILock());
+ RELEASE_ASSERT(vm().atomStringTable() == Thread::current().atomStringTable());
LockHolder locker(*m_threadLock);
// We may be able to steal the conn. That only works if the collector is definitely not running
@@ -2150,7 +2150,7 @@
void Heap::sweepInFinalize()
{
m_objectSpace.sweepLargeAllocations();
- vm()->eagerlySweptDestructibleObjectSpace.sweep();
+ vm().eagerlySweptDestructibleObjectSpace.sweep();
}
void Heap::suspendCompilerThreads()
@@ -2227,7 +2227,7 @@
void Heap::sweepArrayBuffers()
{
- m_arrayBuffers.sweep(*vm());
+ m_arrayBuffers.sweep(vm());
}
void Heap::snapshotUnswept()
@@ -2239,7 +2239,7 @@
void Heap::deleteSourceProviderCaches()
{
if (m_lastCollectionScope && m_lastCollectionScope.value() == CollectionScope::Full)
- m_vm->clearSourceProviderCaches();
+ m_vm.clearSourceProviderCaches();
}
void Heap::notifyIncrementalSweeper()
@@ -2359,7 +2359,7 @@
ASSERT(externalMemorySize() <= extraMemorySize());
#endif
- if (HeapProfiler* heapProfiler = m_vm->heapProfiler()) {
+ if (HeapProfiler* heapProfiler = m_vm.heapProfiler()) {
gatherExtraHeapData(*heapProfiler);
removeDeadHeapSnapshotNodes(*heapProfiler);
}
@@ -2729,11 +2729,11 @@
[this] (SlotVisitor& slotVisitor) {
#if JSC_OBJC_API_ENABLED
- scanExternalRememberedSet(*m_vm, slotVisitor);
+ scanExternalRememberedSet(m_vm, slotVisitor);
#endif
- if (m_vm->smallStrings.needsToBeVisited(*m_collectionScope)) {
+ if (m_vm.smallStrings.needsToBeVisited(*m_collectionScope)) {
SetRootMarkReasonScope rootScope(slotVisitor, SlotVisitor::RootMarkReason::StrongReferences);
- m_vm->smallStrings.visitStrongReferences(slotVisitor);
+ m_vm.smallStrings.visitStrongReferences(slotVisitor);
}
{
@@ -2749,8 +2749,8 @@
{
SetRootMarkReasonScope rootScope(slotVisitor, SlotVisitor::RootMarkReason::VMExceptions);
- slotVisitor.appendUnbarriered(m_vm->exception());
- slotVisitor.appendUnbarriered(m_vm->lastException());
+ slotVisitor.appendUnbarriered(m_vm.exception());
+ slotVisitor.appendUnbarriered(m_vm.lastException());
}
},
ConstraintVolatility::GreyedByExecution);
@@ -2769,7 +2769,7 @@
SetRootMarkReasonScope rootScope(slotVisitor, SlotVisitor::RootMarkReason::Debugger);
#if ENABLE(SAMPLING_PROFILER)
- if (SamplingProfiler* samplingProfiler = m_vm->samplingProfiler()) {
+ if (SamplingProfiler* samplingProfiler = m_vm.samplingProfiler()) {
LockHolder locker(samplingProfiler->getLock());
samplingProfiler->processUnverifiedStackTraces();
samplingProfiler->visit(slotVisitor);
@@ -2778,10 +2778,10 @@
}
#endif // ENABLE(SAMPLING_PROFILER)
- if (m_vm->typeProfiler())
- m_vm->typeProfilerLog()->visit(slotVisitor);
+ if (m_vm.typeProfiler())
+ m_vm.typeProfilerLog()->visit(slotVisitor);
- if (auto* shadowChicken = m_vm->shadowChicken())
+ if (auto* shadowChicken = m_vm.shadowChicken())
shadowChicken->visitChildren(slotVisitor);
},
ConstraintVolatility::GreyedByExecution);
@@ -2830,7 +2830,7 @@
// FIXME: This is almost certainly unnecessary.
// https://bugs.webkit.org/show_bug.cgi?id=166829
DFG::iterateCodeBlocksForGC(
- *m_vm,
+ m_vm,
[&] (CodeBlock* codeBlock) {
slotVisitor.appendUnbarriered(codeBlock);
});
diff --git a/Source/JavaScriptCore/heap/Heap.h b/Source/JavaScriptCore/heap/Heap.h
index 2a89941..3799eda 100644
--- a/Source/JavaScriptCore/heap/Heap.h
+++ b/Source/JavaScriptCore/heap/Heap.h
@@ -139,12 +139,12 @@
// Take this if you know that from->cellState() < barrierThreshold.
JS_EXPORT_PRIVATE void writeBarrierSlowPath(const JSCell* from);
- Heap(VM*, HeapType);
+ Heap(VM&, HeapType);
~Heap();
void lastChanceToFinalize();
void releaseDelayedReleasedObjects();
- VM* vm() const;
+ VM& vm() const;
MarkedSpace& objectSpace() { return m_objectSpace; }
MachineThreads& machineThreads() { return *m_machineThreads; }
@@ -642,7 +642,7 @@
unsigned m_barrierThreshold { Options::forceFencedBarrier() ? tautologicalThreshold : blackThreshold };
- VM* m_vm;
+ VM& m_vm;
Seconds m_lastFullGCLength { 10_ms };
Seconds m_lastEdenGCLength { 10_ms };
diff --git a/Source/JavaScriptCore/heap/HeapCell.h b/Source/JavaScriptCore/heap/HeapCell.h
index 4c9940a..4bdce28 100644
--- a/Source/JavaScriptCore/heap/HeapCell.h
+++ b/Source/JavaScriptCore/heap/HeapCell.h
@@ -73,7 +73,7 @@
// recommended to use it for too many other things, since the large allocation cutoff is
// a runtime option and its default value is small (400 bytes).
Heap* heap() const;
- VM* vm() const;
+ VM& vm() const;
size_t cellSize() const;
CellAttributes cellAttributes() const;
diff --git a/Source/JavaScriptCore/heap/HeapCellInlines.h b/Source/JavaScriptCore/heap/HeapCellInlines.h
index 93fbf1b..6548f16 100644
--- a/Source/JavaScriptCore/heap/HeapCellInlines.h
+++ b/Source/JavaScriptCore/heap/HeapCellInlines.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-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
@@ -56,10 +56,10 @@
ALWAYS_INLINE Heap* HeapCell::heap() const
{
- return &vm()->heap;
+ return &vm().heap;
}
-ALWAYS_INLINE VM* HeapCell::vm() const
+ALWAYS_INLINE VM& HeapCell::vm() const
{
if (isLargeAllocation())
return largeAllocation().vm();
diff --git a/Source/JavaScriptCore/heap/HeapInlines.h b/Source/JavaScriptCore/heap/HeapInlines.h
index e1eb6c7..78be9da 100644
--- a/Source/JavaScriptCore/heap/HeapInlines.h
+++ b/Source/JavaScriptCore/heap/HeapInlines.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-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
@@ -38,9 +38,9 @@
namespace JSC {
-ALWAYS_INLINE VM* Heap::vm() const
+ALWAYS_INLINE VM& Heap::vm() const
{
- return bitwise_cast<VM*>(bitwise_cast<uintptr_t>(this) - OBJECT_OFFSETOF(VM, heap));
+ return *bitwise_cast<VM*>(bitwise_cast<uintptr_t>(this) - OBJECT_OFFSETOF(VM, heap));
}
ALWAYS_INLINE Heap* Heap::heap(const HeapCell* cell)
diff --git a/Source/JavaScriptCore/heap/IsoSubspacePerVM.cpp b/Source/JavaScriptCore/heap/IsoSubspacePerVM.cpp
index bbc499f..499db8d 100644
--- a/Source/JavaScriptCore/heap/IsoSubspacePerVM.cpp
+++ b/Source/JavaScriptCore/heap/IsoSubspacePerVM.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2018-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
@@ -41,7 +41,7 @@
~AutoremovingIsoSubspace()
{
auto locker = holdLock(m_perVM.m_lock);
- m_perVM.m_subspacePerVM.remove(space().heap()->vm());
+ m_perVM.m_subspacePerVM.remove(&space().heap()->vm());
}
private:
diff --git a/Source/JavaScriptCore/heap/LargeAllocation.cpp b/Source/JavaScriptCore/heap/LargeAllocation.cpp
index bda5808..eeb5f4b 100644
--- a/Source/JavaScriptCore/heap/LargeAllocation.cpp
+++ b/Source/JavaScriptCore/heap/LargeAllocation.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-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
@@ -177,7 +177,7 @@
if (m_hasValidCell && !isLive()) {
if (m_attributes.destruction == NeedsDestruction)
- m_subspace->destroy(*vm(), static_cast<JSCell*>(cell()));
+ m_subspace->destroy(vm(), static_cast<JSCell*>(cell()));
m_hasValidCell = false;
}
}
@@ -198,7 +198,7 @@
#if !ASSERT_DISABLED
void LargeAllocation::assertValidCell(VM& vm, HeapCell* cell) const
{
- ASSERT(&vm == this->vm());
+ ASSERT(&vm == &this->vm());
ASSERT(cell == this->cell());
ASSERT(m_hasValidCell);
}
diff --git a/Source/JavaScriptCore/heap/LargeAllocation.h b/Source/JavaScriptCore/heap/LargeAllocation.h
index 231cb21..d0beb95 100644
--- a/Source/JavaScriptCore/heap/LargeAllocation.h
+++ b/Source/JavaScriptCore/heap/LargeAllocation.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-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
@@ -65,7 +65,7 @@
void lastChanceToFinalize();
Heap* heap() const { return m_weakSet.heap(); }
- VM* vm() const { return m_weakSet.vm(); }
+ VM& vm() const { return m_weakSet.vm(); }
WeakSet& weakSet() { return m_weakSet; }
unsigned indexInSpace() { return m_indexInSpace; }
diff --git a/Source/JavaScriptCore/heap/LocalAllocator.cpp b/Source/JavaScriptCore/heap/LocalAllocator.cpp
index d63e2e4..04b19f2 100644
--- a/Source/JavaScriptCore/heap/LocalAllocator.cpp
+++ b/Source/JavaScriptCore/heap/LocalAllocator.cpp
@@ -114,7 +114,7 @@
{
SuperSamplerScope superSamplerScope(false);
Heap& heap = *m_directory->m_heap;
- ASSERT(heap.vm()->currentThreadIsHoldingAPILock());
+ ASSERT(heap.vm().currentThreadIsHoldingAPILock());
doTestCollectionsIfNeeded(deferralContext);
ASSERT(!m_directory->markedSpace().isIterating());
diff --git a/Source/JavaScriptCore/heap/MarkedBlock.cpp b/Source/JavaScriptCore/heap/MarkedBlock.cpp
index 68ca4c7..eb223b9 100644
--- a/Source/JavaScriptCore/heap/MarkedBlock.cpp
+++ b/Source/JavaScriptCore/heap/MarkedBlock.cpp
@@ -66,7 +66,7 @@
: m_alignedMemoryAllocator(alignedMemoryAllocator)
, m_weakSet(heap.vm(), CellContainer())
{
- m_block = new (NotNull, blockSpace) MarkedBlock(*heap.vm(), *this);
+ m_block = new (NotNull, blockSpace) MarkedBlock(heap.vm(), *this);
m_weakSet.setContainer(*m_block);
@@ -207,7 +207,7 @@
void MarkedBlock::aboutToMarkSlow(HeapVersion markingVersion)
{
- ASSERT(vm()->heap.objectSpace().isMarking());
+ ASSERT(vm().heap.objectSpace().isMarking());
auto locker = holdLock(footer().m_lock);
if (!areMarksStale(markingVersion))
@@ -275,13 +275,13 @@
#if !ASSERT_DISABLED
void MarkedBlock::assertMarksNotStale()
{
- ASSERT(footer().m_markingVersion == vm()->heap.objectSpace().markingVersion());
+ ASSERT(footer().m_markingVersion == vm().heap.objectSpace().markingVersion());
}
#endif // !ASSERT_DISABLED
bool MarkedBlock::areMarksStale()
{
- return areMarksStale(vm()->heap.objectSpace().markingVersion());
+ return areMarksStale(vm().heap.objectSpace().markingVersion());
}
bool MarkedBlock::Handle::areMarksStale()
@@ -291,7 +291,7 @@
bool MarkedBlock::isMarked(const void* p)
{
- return isMarked(vm()->heap.objectSpace().markingVersion(), p);
+ return isMarked(vm().heap.objectSpace().markingVersion(), p);
}
void MarkedBlock::Handle::didConsumeFreeList()
@@ -371,7 +371,7 @@
#if !ASSERT_DISABLED
void MarkedBlock::assertValidCell(VM& vm, HeapCell* cell) const
{
- RELEASE_ASSERT(&vm == this->vm());
+ RELEASE_ASSERT(&vm == &this->vm());
RELEASE_ASSERT(const_cast<MarkedBlock*>(this)->handle().cellAlign(cell) == cell);
}
#endif
diff --git a/Source/JavaScriptCore/heap/MarkedBlock.h b/Source/JavaScriptCore/heap/MarkedBlock.h
index 6527524..60d8246 100644
--- a/Source/JavaScriptCore/heap/MarkedBlock.h
+++ b/Source/JavaScriptCore/heap/MarkedBlock.h
@@ -124,7 +124,7 @@
AlignedMemoryAllocator* alignedMemoryAllocator() const;
Heap* heap() const;
inline MarkedSpace* space() const;
- VM* vm() const;
+ VM& vm() const;
WeakSet& weakSet();
enum SweepMode { SweepOnly, SweepToFreeList };
@@ -257,6 +257,8 @@
friend class MarkedBlock;
Handle& m_handle;
+ // m_vm must remain a pointer (instead of a reference) because JSCLLIntOffsetsExtractor
+ // will fail otherwise.
VM* m_vm;
Subspace* m_subspace;
@@ -315,7 +317,7 @@
Handle& handle();
const Handle& handle() const;
- VM* vm() const;
+ VM& vm() const;
inline Heap* heap() const;
inline MarkedSpace* space() const;
@@ -471,14 +473,14 @@
return m_weakSet.heap();
}
-inline VM* MarkedBlock::Handle::vm() const
+inline VM& MarkedBlock::Handle::vm() const
{
return m_weakSet.vm();
}
-inline VM* MarkedBlock::vm() const
+inline VM& MarkedBlock::vm() const
{
- return footer().m_vm;
+ return *footer().m_vm;
}
inline WeakSet& MarkedBlock::Handle::weakSet()
diff --git a/Source/JavaScriptCore/heap/MarkedBlockInlines.h b/Source/JavaScriptCore/heap/MarkedBlockInlines.h
index fad402b..f8bbcb4 100644
--- a/Source/JavaScriptCore/heap/MarkedBlockInlines.h
+++ b/Source/JavaScriptCore/heap/MarkedBlockInlines.h
@@ -52,7 +52,7 @@
inline Heap* MarkedBlock::heap() const
{
- return &vm()->heap;
+ return &vm().heap;
}
inline MarkedSpace* MarkedBlock::space() const
@@ -253,7 +253,7 @@
unsigned cellSize = this->cellSize();
- VM& vm = *this->vm();
+ VM& vm = this->vm();
auto destroy = [&] (void* cell) {
JSCell* jsCell = static_cast<JSCell*>(cell);
if (!jsCell->isZapped()) {
diff --git a/Source/JavaScriptCore/heap/SlotVisitor.cpp b/Source/JavaScriptCore/heap/SlotVisitor.cpp
index 7860708..4a8a01c 100644
--- a/Source/JavaScriptCore/heap/SlotVisitor.cpp
+++ b/Source/JavaScriptCore/heap/SlotVisitor.cpp
@@ -60,7 +60,7 @@
// Both the cell's structure, and the cell's structure's structure should be the Structure Structure.
// I hate this sentence.
- VM& vm = *cell->vm();
+ VM& vm = cell->vm();
if (cell->structure()->structure()->JSCell::classInfo(vm) != cell->structure()->JSCell::classInfo(vm)) {
const char* parentClassName = 0;
const char* ourClassName = 0;
diff --git a/Source/JavaScriptCore/heap/SlotVisitorInlines.h b/Source/JavaScriptCore/heap/SlotVisitorInlines.h
index b3ebbd6..2a29771 100644
--- a/Source/JavaScriptCore/heap/SlotVisitorInlines.h
+++ b/Source/JavaScriptCore/heap/SlotVisitorInlines.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-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
@@ -176,12 +176,12 @@
inline VM& SlotVisitor::vm()
{
- return *m_heap.vm();
+ return m_heap.vm();
}
inline const VM& SlotVisitor::vm() const
{
- return *m_heap.vm();
+ return m_heap.vm();
}
template<typename Func>
diff --git a/Source/JavaScriptCore/heap/StopIfNecessaryTimer.cpp b/Source/JavaScriptCore/heap/StopIfNecessaryTimer.cpp
index 450d8d8..1509c45 100644
--- a/Source/JavaScriptCore/heap/StopIfNecessaryTimer.cpp
+++ b/Source/JavaScriptCore/heap/StopIfNecessaryTimer.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-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
@@ -30,7 +30,7 @@
namespace JSC {
-StopIfNecessaryTimer::StopIfNecessaryTimer(VM* vm)
+StopIfNecessaryTimer::StopIfNecessaryTimer(VM& vm)
: Base(vm)
{
}
diff --git a/Source/JavaScriptCore/heap/StopIfNecessaryTimer.h b/Source/JavaScriptCore/heap/StopIfNecessaryTimer.h
index 1f13373..f6b9524 100644
--- a/Source/JavaScriptCore/heap/StopIfNecessaryTimer.h
+++ b/Source/JavaScriptCore/heap/StopIfNecessaryTimer.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-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
@@ -34,7 +34,7 @@
class StopIfNecessaryTimer : public JSRunLoopTimer {
public:
using Base = JSRunLoopTimer;
- explicit StopIfNecessaryTimer(VM*);
+ explicit StopIfNecessaryTimer(VM&);
void doWork(VM&) override;
diff --git a/Source/JavaScriptCore/heap/Strong.h b/Source/JavaScriptCore/heap/Strong.h
index 264c24e..3a5a59c 100644
--- a/Source/JavaScriptCore/heap/Strong.h
+++ b/Source/JavaScriptCore/heap/Strong.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2011-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
@@ -112,7 +112,7 @@
return *this;
}
- set(*HandleSet::heapFor(other.slot())->vm(), other.get());
+ set(HandleSet::heapFor(other.slot())->vm(), other.get());
return *this;
}
diff --git a/Source/JavaScriptCore/heap/WeakSet.h b/Source/JavaScriptCore/heap/WeakSet.h
index b080203..49c3344 100644
--- a/Source/JavaScriptCore/heap/WeakSet.h
+++ b/Source/JavaScriptCore/heap/WeakSet.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-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
@@ -41,7 +41,7 @@
static WeakImpl* allocate(JSValue, WeakHandleOwner* = 0, void* context = 0);
static void deallocate(WeakImpl*);
- WeakSet(VM*, CellContainer);
+ WeakSet(VM&, CellContainer);
~WeakSet();
void lastChanceToFinalize();
@@ -49,7 +49,7 @@
void setContainer(CellContainer container) { m_container = container; }
Heap* heap() const;
- VM* vm() const;
+ VM& vm() const;
bool isEmpty() const;
bool isTriviallyDestructible() const;
@@ -70,11 +70,11 @@
WeakBlock::FreeCell* m_allocator;
WeakBlock* m_nextAllocator;
DoublyLinkedList<WeakBlock> m_blocks;
- VM* m_vm;
+ VM& m_vm;
CellContainer m_container;
};
-inline WeakSet::WeakSet(VM* vm, CellContainer container)
+inline WeakSet::WeakSet(VM& vm, CellContainer container)
: m_allocator(0)
, m_nextAllocator(0)
, m_vm(vm)
@@ -82,7 +82,7 @@
{
}
-inline VM* WeakSet::vm() const
+inline VM& WeakSet::vm() const
{
return m_vm;
}
diff --git a/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp b/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp
index 9e90617..ce5e7bd 100644
--- a/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp
+++ b/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013, 2015-2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-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
@@ -120,7 +120,7 @@
auto savedResultAlias = impl().savedResultAlias();
if (!savedResultAlias)
return jsUndefined();
- return jsString(exec, savedResultAlias.value());
+ return jsString(exec->vm(), savedResultAlias.value());
}
JSValue JSInjectedScriptHost::evaluateWithScopeExtension(ExecState* exec)
@@ -149,8 +149,9 @@
if (exec->argumentCount() < 1)
return jsUndefined();
+ VM& vm = exec->vm();
JSObject* object = jsCast<JSObject*>(exec->uncheckedArgument(0).toThis(exec, NotStrictMode));
- return jsString(exec, JSObject::calculatedClassName(object));
+ return jsString(vm, JSObject::calculatedClassName(object));
}
JSValue JSInjectedScriptHost::isHTMLAllCollection(ExecState* exec)
@@ -196,41 +197,41 @@
if (auto* object = jsDynamicCast<JSObject*>(vm, value)) {
if (object->isErrorInstance())
- return jsNontrivialString(exec, "error"_s);
+ return jsNontrivialString(vm, "error"_s);
// Consider class constructor functions class objects.
JSFunction* function = jsDynamicCast<JSFunction*>(vm, value);
if (function && function->isClassConstructorFunction())
- return jsNontrivialString(exec, "class"_s);
+ return jsNontrivialString(vm, "class"_s);
if (object->inherits<JSArray>(vm))
- return jsNontrivialString(exec, "array"_s);
+ return jsNontrivialString(vm, "array"_s);
if (object->inherits<DirectArguments>(vm) || object->inherits<ScopedArguments>(vm))
- return jsNontrivialString(exec, "array"_s);
+ return jsNontrivialString(vm, "array"_s);
if (object->inherits<DateInstance>(vm))
- return jsNontrivialString(exec, "date"_s);
+ return jsNontrivialString(vm, "date"_s);
if (object->inherits<RegExpObject>(vm))
- return jsNontrivialString(exec, "regexp"_s);
+ return jsNontrivialString(vm, "regexp"_s);
if (object->inherits<ProxyObject>(vm))
- return jsNontrivialString(exec, "proxy"_s);
+ return jsNontrivialString(vm, "proxy"_s);
if (object->inherits<JSMap>(vm))
- return jsNontrivialString(exec, "map"_s);
+ return jsNontrivialString(vm, "map"_s);
if (object->inherits<JSSet>(vm))
- return jsNontrivialString(exec, "set"_s);
+ return jsNontrivialString(vm, "set"_s);
if (object->inherits<JSWeakMap>(vm))
- return jsNontrivialString(exec, "weakmap"_s);
+ return jsNontrivialString(vm, "weakmap"_s);
if (object->inherits<JSWeakSet>(vm))
- return jsNontrivialString(exec, "weakset"_s);
+ return jsNontrivialString(vm, "weakset"_s);
if (object->inherits<JSStringIterator>(vm))
- return jsNontrivialString(exec, "iterator"_s);
+ return jsNontrivialString(vm, "iterator"_s);
if (object->getDirect(vm, vm.propertyNames->builtinNames().arrayIteratorNextIndexPrivateName())
|| object->getDirect(vm, vm.propertyNames->builtinNames().mapBucketPrivateName())
|| object->getDirect(vm, vm.propertyNames->builtinNames().setBucketPrivateName()))
- return jsNontrivialString(exec, "iterator"_s);
+ return jsNontrivialString(vm, "iterator"_s);
if (object->inherits<JSInt8Array>(vm)
|| object->inherits<JSInt16Array>(vm)
@@ -241,7 +242,7 @@
|| object->inherits<JSUint32Array>(vm)
|| object->inherits<JSFloat32Array>(vm)
|| object->inherits<JSFloat64Array>(vm))
- return jsNontrivialString(exec, "array"_s);
+ return jsNontrivialString(vm, "array"_s);
}
return impl().subtype(exec, value);
@@ -276,20 +277,20 @@
String scriptID = String::number(sourceCode->provider()->asID());
JSObject* location = constructEmptyObject(exec);
- location->putDirect(vm, Identifier::fromString(exec, "scriptId"), jsString(exec, scriptID));
- location->putDirect(vm, Identifier::fromString(exec, "lineNumber"), jsNumber(lineNumber));
- location->putDirect(vm, Identifier::fromString(exec, "columnNumber"), jsNumber(columnNumber));
+ location->putDirect(vm, Identifier::fromString(vm, "scriptId"), jsString(vm, scriptID));
+ location->putDirect(vm, Identifier::fromString(vm, "lineNumber"), jsNumber(lineNumber));
+ location->putDirect(vm, Identifier::fromString(vm, "columnNumber"), jsNumber(columnNumber));
JSObject* result = constructEmptyObject(exec);
- result->putDirect(vm, Identifier::fromString(exec, "location"), location);
+ result->putDirect(vm, Identifier::fromString(vm, "location"), location);
String name = function->name(vm);
if (!name.isEmpty())
- result->putDirect(vm, Identifier::fromString(exec, "name"), jsString(exec, name));
+ result->putDirect(vm, Identifier::fromString(vm, "name"), jsString(vm, name));
String displayName = function->displayName(vm);
if (!displayName.isEmpty())
- result->putDirect(vm, Identifier::fromString(exec, "displayName"), jsString(exec, displayName));
+ result->putDirect(vm, Identifier::fromString(vm, "displayName"), jsString(vm, displayName));
return result;
}
@@ -298,8 +299,8 @@
{
VM& vm = exec->vm();
JSObject* result = constructEmptyObject(exec);
- result->putDirect(vm, Identifier::fromString(exec, "name"), jsString(exec, name));
- result->putDirect(vm, Identifier::fromString(exec, "value"), value);
+ result->putDirect(vm, Identifier::fromString(vm, "name"), jsString(vm, name));
+ result->putDirect(vm, Identifier::fromString(vm, "value"), value);
return result;
}
@@ -323,16 +324,16 @@
switch (promise->status(vm)) {
case JSPromise::Status::Pending:
scope.release();
- array->putDirectIndex(exec, index++, constructInternalProperty(exec, "status"_s, jsNontrivialString(exec, "pending"_s)));
+ array->putDirectIndex(exec, index++, constructInternalProperty(exec, "status"_s, jsNontrivialString(vm, "pending"_s)));
return array;
case JSPromise::Status::Fulfilled:
- array->putDirectIndex(exec, index++, constructInternalProperty(exec, "status"_s, jsNontrivialString(exec, "resolved"_s)));
+ array->putDirectIndex(exec, index++, constructInternalProperty(exec, "status"_s, jsNontrivialString(vm, "resolved"_s)));
RETURN_IF_EXCEPTION(scope, JSValue());
scope.release();
array->putDirectIndex(exec, index++, constructInternalProperty(exec, "result"_s, promise->result(vm)));
return array;
case JSPromise::Status::Rejected:
- array->putDirectIndex(exec, index++, constructInternalProperty(exec, "status"_s, jsNontrivialString(exec, "rejected"_s)));
+ array->putDirectIndex(exec, index++, constructInternalProperty(exec, "status"_s, jsNontrivialString(vm, "rejected"_s)));
RETURN_IF_EXCEPTION(scope, JSValue());
scope.release();
array->putDirectIndex(exec, index++, constructInternalProperty(exec, "result"_s, promise->result(vm)));
@@ -404,7 +405,7 @@
array->putDirectIndex(exec, index++, constructInternalProperty(exec, "map", iteratedValue));
RETURN_IF_EXCEPTION(scope, JSValue());
scope.release();
- array->putDirectIndex(exec, index++, constructInternalProperty(exec, "kind", jsNontrivialString(exec, kind)));
+ array->putDirectIndex(exec, index++, constructInternalProperty(exec, "kind", jsNontrivialString(vm, kind)));
return array;
}
@@ -428,7 +429,7 @@
array->putDirectIndex(exec, index++, constructInternalProperty(exec, "set", iteratedValue));
RETURN_IF_EXCEPTION(scope, JSValue());
scope.release();
- array->putDirectIndex(exec, index++, constructInternalProperty(exec, "kind", jsNontrivialString(exec, kind)));
+ array->putDirectIndex(exec, index++, constructInternalProperty(exec, "kind", jsNontrivialString(vm, kind)));
return array;
}
}
@@ -504,8 +505,8 @@
for (unsigned index = 0; index < buffer.size(); index += 2) {
JSObject* entry = constructEmptyObject(exec);
- entry->putDirect(vm, Identifier::fromString(exec, "key"), buffer.at(index));
- entry->putDirect(vm, Identifier::fromString(exec, "value"), buffer.at(index + 1));
+ entry->putDirect(vm, Identifier::fromString(vm, "key"), buffer.at(index));
+ entry->putDirect(vm, Identifier::fromString(vm, "value"), buffer.at(index + 1));
array->putDirectIndex(exec, index / 2, entry);
RETURN_IF_EXCEPTION(scope, JSValue());
}
@@ -554,7 +555,7 @@
for (unsigned index = 0; index < buffer.size(); ++index) {
JSObject* entry = constructEmptyObject(exec);
- entry->putDirect(vm, Identifier::fromString(exec, "value"), buffer.at(index));
+ entry->putDirect(vm, Identifier::fromString(vm, "value"), buffer.at(index));
array->putDirectIndex(exec, index, entry);
RETURN_IF_EXCEPTION(scope, JSValue());
}
@@ -653,7 +654,7 @@
RETURN_IF_EXCEPTION(scope, { });
JSObject* entry = constructEmptyObject(exec);
- entry->putDirect(vm, Identifier::fromString(exec, "value"), nextValue);
+ entry->putDirect(vm, Identifier::fromString(vm, "value"), nextValue);
array->putDirectIndex(exec, i, entry);
if (UNLIKELY(scope.exception())) {
scope.release();
@@ -722,7 +723,7 @@
if (checkForbiddenPrototype(exec, object, lexicalGlobalObject->promisePrototype()))
return throwTypeError(exec, scope, "queryInstances cannot be called with Promise."_s);
- sanitizeStackForVM(&vm);
+ sanitizeStackForVM(vm);
vm.heap.collectNow(Sync, CollectionScope::Full);
JSArray* array = constructEmptyArray(exec, nullptr);
@@ -800,7 +801,7 @@
void analyzeEdge(JSCell* from, JSCell* to, SlotVisitor::RootMarkReason reason)
{
ASSERT(to);
- ASSERT(to->vm()->heapProfiler()->activeHeapAnalyzer() == this);
+ ASSERT(to->vm().heapProfiler()->activeHeapAnalyzer() == this);
auto locker = holdLock(m_mutex);
@@ -900,7 +901,7 @@
{
DeferGC deferGC(vm.heap);
PreventCollectionScope preventCollectionScope(vm.heap);
- sanitizeStackForVM(&vm);
+ sanitizeStackForVM(vm);
HeapHolderFinder holderFinder(vm.ensureHeapProfiler(), target.asCell());
diff --git a/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.cpp b/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.cpp
index bf976a6..ebbb254 100644
--- a/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.cpp
+++ b/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-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
@@ -121,9 +121,9 @@
// Debugger.Location protocol object.
VM& vm = exec->vm();
JSObject* result = constructEmptyObject(exec);
- result->putDirect(vm, Identifier::fromString(exec, "scriptId"), jsString(exec, String::number(location.sourceID)));
- result->putDirect(vm, Identifier::fromString(exec, "lineNumber"), jsNumber(location.line));
- result->putDirect(vm, Identifier::fromString(exec, "columnNumber"), jsNumber(location.column));
+ result->putDirect(vm, Identifier::fromString(vm, "scriptId"), jsString(vm, String::number(location.sourceID)));
+ result->putDirect(vm, Identifier::fromString(vm, "lineNumber"), jsNumber(location.line));
+ result->putDirect(vm, Identifier::fromString(vm, "columnNumber"), jsNumber(location.column));
return result;
}
@@ -143,9 +143,9 @@
for (DebuggerScope::iterator iter = scopeChain->begin(); iter != end; ++iter) {
DebuggerScope* scope = iter.get();
JSObject* description = constructEmptyObject(exec);
- description->putDirect(vm, Identifier::fromString(exec, "type"), valueForScopeType(scope));
- description->putDirect(vm, Identifier::fromString(exec, "name"), jsString(exec, scope->name()));
- description->putDirect(vm, Identifier::fromString(exec, "location"), valueForScopeLocation(exec, scope->location()));
+ description->putDirect(vm, Identifier::fromString(vm, "type"), valueForScopeType(scope));
+ description->putDirect(vm, Identifier::fromString(vm, "name"), jsString(vm, scope->name()));
+ description->putDirect(vm, Identifier::fromString(vm, "location"), valueForScopeLocation(exec, scope->location()));
array->putDirectIndex(exec, index++, description);
RETURN_IF_EXCEPTION(throwScope, JSValue());
}
@@ -175,7 +175,7 @@
JSValue JSJavaScriptCallFrame::functionName(ExecState* exec) const
{
- return jsString(exec, impl().functionName());
+ return jsString(exec->vm(), impl().functionName());
}
JSValue JSJavaScriptCallFrame::scopeChain(ExecState* exec) const
@@ -218,11 +218,12 @@
JSValue JSJavaScriptCallFrame::type(ExecState* exec) const
{
+ VM& vm = exec->vm();
switch (impl().type()) {
case DebuggerCallFrame::FunctionType:
- return jsNontrivialString(exec, "function"_s);
+ return jsNontrivialString(vm, "function"_s);
case DebuggerCallFrame::ProgramType:
- return jsNontrivialString(exec, "program"_s);
+ return jsNontrivialString(vm, "program"_s);
}
ASSERT_NOT_REACHED();
diff --git a/Source/JavaScriptCore/inspector/ScriptCallStackFactory.cpp b/Source/JavaScriptCore/inspector/ScriptCallStackFactory.cpp
index 72e6efd..2cc6066 100644
--- a/Source/JavaScriptCore/inspector/ScriptCallStackFactory.cpp
+++ b/Source/JavaScriptCore/inspector/ScriptCallStackFactory.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014, 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-2019 Apple Inc. All rights reserved.
* Copyright (c) 2010 Google Inc. All rights reserved.
* Copyright (C) 2012 Research In Motion Limited. All rights reserved.
*
@@ -129,9 +129,9 @@
auto scope = DECLARE_CATCH_SCOPE(vm);
// FIXME: <http://webkit.org/b/115087> Web Inspector: Should not need to evaluate JavaScript handling exceptions
- JSValue lineValue = exceptionObject->getDirect(vm, Identifier::fromString(exec, "line"));
- JSValue columnValue = exceptionObject->getDirect(vm, Identifier::fromString(exec, "column"));
- JSValue sourceURLValue = exceptionObject->getDirect(vm, Identifier::fromString(exec, "sourceURL"));
+ JSValue lineValue = exceptionObject->getDirect(vm, Identifier::fromString(vm, "line"));
+ JSValue columnValue = exceptionObject->getDirect(vm, Identifier::fromString(vm, "column"));
+ JSValue sourceURLValue = exceptionObject->getDirect(vm, Identifier::fromString(vm, "sourceURL"));
bool result = false;
if (lineValue && lineValue.isNumber()
diff --git a/Source/JavaScriptCore/inspector/agents/InspectorAuditAgent.cpp b/Source/JavaScriptCore/inspector/agents/InspectorAuditAgent.cpp
index 5b6f386..9f13453 100644
--- a/Source/JavaScriptCore/inspector/agents/InspectorAuditAgent.cpp
+++ b/Source/JavaScriptCore/inspector/agents/InspectorAuditAgent.cpp
@@ -138,9 +138,10 @@
if (!execState)
return;
- JSC::JSLockHolder lock(execState);
+ JSC::VM& vm = execState->vm();
+ JSC::JSLockHolder lock(vm);
- auditObject->putDirect(execState->vm(), JSC::Identifier::fromString(execState, "Version"), JSC::JSValue(Inspector::Protocol::Audit::VERSION));
+ auditObject->putDirect(vm, JSC::Identifier::fromString(vm, "Version"), JSC::JSValue(Inspector::Protocol::Audit::VERSION));
}
} // namespace Inspector
diff --git a/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.cpp b/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.cpp
index 90c6934..3488b1a 100644
--- a/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.cpp
+++ b/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015-2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-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
@@ -92,7 +92,7 @@
{
VM& vm = m_environment.vm();
JSLockHolder lock(vm);
- sanitizeStackForVM(&vm);
+ sanitizeStackForVM(vm);
vm.heap.collectNow(Sync, CollectionScope::Full);
}
diff --git a/Source/JavaScriptCore/interpreter/FrameTracers.h b/Source/JavaScriptCore/interpreter/FrameTracers.h
index 2158de6..1de8e4a 100644
--- a/Source/JavaScriptCore/interpreter/FrameTracers.h
+++ b/Source/JavaScriptCore/interpreter/FrameTracers.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-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
@@ -83,13 +83,13 @@
class NativeCallFrameTracer {
public:
- ALWAYS_INLINE NativeCallFrameTracer(VM* vm, CallFrame* callFrame)
+ ALWAYS_INLINE NativeCallFrameTracer(VM& vm, CallFrame* callFrame)
{
- ASSERT(vm);
+ ASSERT(&vm);
ASSERT(callFrame);
- ASSERT(reinterpret_cast<void*>(callFrame) < reinterpret_cast<void*>(vm->topEntryFrame));
+ ASSERT(reinterpret_cast<void*>(callFrame) < reinterpret_cast<void*>(vm.topEntryFrame));
assertStackPointerIsAligned();
- vm->topCallFrame = callFrame;
+ vm.topCallFrame = callFrame;
}
};
diff --git a/Source/JavaScriptCore/interpreter/Interpreter.cpp b/Source/JavaScriptCore/interpreter/Interpreter.cpp
index c1f2f1f..5df048c 100644
--- a/Source/JavaScriptCore/interpreter/Interpreter.cpp
+++ b/Source/JavaScriptCore/interpreter/Interpreter.cpp
@@ -662,7 +662,7 @@
JSValue Interpreter::executeProgram(const SourceCode& source, CallFrame* callFrame, JSObject* thisObj)
{
JSScope* scope = thisObj->globalObject()->globalScope();
- VM& vm = *scope->vm();
+ VM& vm = scope->vm();
auto throwScope = DECLARE_THROW_SCOPE(vm);
ProgramExecutable* program = ProgramExecutable::create(callFrame, source);
@@ -987,7 +987,7 @@
CallFrameClosure Interpreter::prepareForRepeatCall(FunctionExecutable* functionExecutable, CallFrame* callFrame, ProtoCallFrame* protoCallFrame, JSFunction* function, int argumentCountIncludingThis, JSScope* scope, const ArgList& args)
{
- VM& vm = *scope->vm();
+ VM& vm = scope->vm();
auto throwScope = DECLARE_THROW_SCOPE(vm);
throwScope.assertNoException();
@@ -1012,7 +1012,7 @@
JSValue Interpreter::execute(EvalExecutable* eval, CallFrame* callFrame, JSValue thisValue, JSScope* scope)
{
- VM& vm = *scope->vm();
+ VM& vm = scope->vm();
auto throwScope = DECLARE_THROW_SCOPE(vm);
ASSERT(&vm == &callFrame->vm());
@@ -1161,7 +1161,7 @@
JSValue Interpreter::executeModuleProgram(ModuleProgramExecutable* executable, CallFrame* callFrame, JSModuleEnvironment* scope)
{
- VM& vm = *scope->vm();
+ VM& vm = scope->vm();
auto throwScope = DECLARE_THROW_SCOPE(vm);
ASSERT(&vm == &callFrame->vm());
diff --git a/Source/JavaScriptCore/interpreter/StackVisitor.cpp b/Source/JavaScriptCore/interpreter/StackVisitor.cpp
index de84be8..7e237fa 100644
--- a/Source/JavaScriptCore/interpreter/StackVisitor.cpp
+++ b/Source/JavaScriptCore/interpreter/StackVisitor.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-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
@@ -274,7 +274,7 @@
}
if (callee().isCell()) {
- if (auto* jsToWasmICCallee = jsDynamicCast<JSToWasmICCallee*>(*callee().asCell()->vm(), callee().asCell()))
+ if (auto* jsToWasmICCallee = jsDynamicCast<JSToWasmICCallee*>(callee().asCell()->vm(), callee().asCell()))
return jsToWasmICCallee->function()->usedCalleeSaveRegisters();
}
#endif // ENABLE(WEBASSEMBLY)
@@ -414,7 +414,7 @@
line = divotLine + codeBlock->ownerExecutable()->firstLine();
column = divotColumn + (divotLine ? 1 : codeBlock->firstLineColumnOffset());
- if (Optional<int> overrideLineNumber = codeBlock->ownerExecutable()->overrideLineNumber(*codeBlock->vm()))
+ if (Optional<int> overrideLineNumber = codeBlock->ownerExecutable()->overrideLineNumber(codeBlock->vm()))
line = overrideLineNumber.value();
}
diff --git a/Source/JavaScriptCore/jit/AssemblyHelpers.cpp b/Source/JavaScriptCore/jit/AssemblyHelpers.cpp
index c14252a..15f5f9f 100644
--- a/Source/JavaScriptCore/jit/AssemblyHelpers.cpp
+++ b/Source/JavaScriptCore/jit/AssemblyHelpers.cpp
@@ -634,7 +634,7 @@
Call call = nearCall();
addLinkTask(
[=, &vm] (LinkBuffer& linkBuffer) {
- MacroAssemblerCodeRef<JITStubRoutinePtrTag> virtualThunk = virtualThunkFor(&vm, *info);
+ MacroAssemblerCodeRef<JITStubRoutinePtrTag> virtualThunk = virtualThunkFor(vm, *info);
info->setSlowStub(createJITStubRoutine(virtualThunk, vm, nullptr, true));
linkBuffer.link(call, CodeLocationLabel<JITStubRoutinePtrTag>(virtualThunk.code()));
});
@@ -727,7 +727,7 @@
done.append(jump());
isString.link(this);
- move(TrustedImmPtr(jsEmptyString(&vm)), result);
+ move(TrustedImmPtr(jsEmptyString(vm)), result);
comparePtr(invert ? Equal : NotEqual, value.payloadGPR(), result, result);
done.append(jump());
@@ -817,7 +817,7 @@
}
isString.link(this);
- truthy.append(branchPtr(invert ? Equal : NotEqual, value.payloadGPR(), TrustedImmPtr(jsEmptyString(&vm))));
+ truthy.append(branchPtr(invert ? Equal : NotEqual, value.payloadGPR(), TrustedImmPtr(jsEmptyString(vm))));
done.append(jump());
isBigInt.link(this);
diff --git a/Source/JavaScriptCore/jit/AssemblyHelpers.h b/Source/JavaScriptCore/jit/AssemblyHelpers.h
index 07610a9..0d8bb23 100644
--- a/Source/JavaScriptCore/jit/AssemblyHelpers.h
+++ b/Source/JavaScriptCore/jit/AssemblyHelpers.h
@@ -62,7 +62,7 @@
}
CodeBlock* codeBlock() { return m_codeBlock; }
- VM& vm() { return *m_codeBlock->vm(); }
+ VM& vm() { return m_codeBlock->vm(); }
AssemblerType_T& assembler() { return m_assembler; }
void checkStackPointerAlignment()
diff --git a/Source/JavaScriptCore/jit/JIT.cpp b/Source/JavaScriptCore/jit/JIT.cpp
index ef90669..307f157 100644
--- a/Source/JavaScriptCore/jit/JIT.cpp
+++ b/Source/JavaScriptCore/jit/JIT.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2008-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
@@ -74,12 +74,12 @@
newCalleeFunction.retagged<OperationPtrTag>());
}
-JIT::JIT(VM* vm, CodeBlock* codeBlock, unsigned loopOSREntryBytecodeOffset)
- : JSInterfaceJIT(vm, codeBlock)
- , m_interpreter(vm->interpreter)
+JIT::JIT(VM& vm, CodeBlock* codeBlock, unsigned loopOSREntryBytecodeOffset)
+ : JSInterfaceJIT(&vm, codeBlock)
+ , m_interpreter(vm.interpreter)
, m_labels(codeBlock ? codeBlock->instructions().size() : 0)
, m_bytecodeOffset(std::numeric_limits<unsigned>::max())
- , m_pcToCodeOriginMapBuilder(*vm)
+ , m_pcToCodeOriginMapBuilder(vm)
, m_canBeOptimized(false)
, m_shouldEmitProfiling(false)
, m_shouldUseIndexMasking(Options::enableSpectreMitigations())
@@ -102,7 +102,7 @@
skipOptimize.append(branchAdd32(Signed, TrustedImm32(Options::executionCounterIncrementForEntry()), AbsoluteAddress(m_codeBlock->addressOfJITExecuteCounter())));
ASSERT(!m_bytecodeOffset);
- copyCalleeSavesFromFrameOrRegisterToEntryFrameCalleeSavesBuffer(vm()->topEntryFrame);
+ copyCalleeSavesFromFrameOrRegisterToEntryFrameCalleeSavesBuffer(vm().topEntryFrame);
callOperation(operationOptimize, m_bytecodeOffset);
skipOptimize.append(branchTestPtr(Zero, returnValueGPR));
@@ -191,7 +191,7 @@
m_callLinkInfoIndex = 0;
- VM& vm = *m_codeBlock->vm();
+ VM& vm = m_codeBlock->vm();
unsigned startBytecodeOffset = 0;
if (m_loopOSREntryBytecodeOffset && (m_codeBlock->inherits<ProgramCodeBlock>(vm) || m_codeBlock->inherits<ModuleProgramCodeBlock>(vm))) {
// We can only do this optimization because we execute ProgramCodeBlock's exactly once.
@@ -933,11 +933,11 @@
if (!m_exceptionChecksWithCallFrameRollback.empty()) {
m_exceptionChecksWithCallFrameRollback.link(this);
- copyCalleeSavesToEntryFrameCalleeSavesBuffer(vm()->topEntryFrame);
+ copyCalleeSavesToEntryFrameCalleeSavesBuffer(vm().topEntryFrame);
// lookupExceptionHandlerFromCallerFrame is passed two arguments, the VM and the exec (the CallFrame*).
- move(TrustedImmPtr(vm()), GPRInfo::argumentGPR0);
+ move(TrustedImmPtr(&vm()), GPRInfo::argumentGPR0);
move(GPRInfo::callFrameRegister, GPRInfo::argumentGPR1);
#if CPU(X86)
@@ -946,17 +946,17 @@
poke(GPRInfo::argumentGPR1, 1);
#endif
m_calls.append(CallRecord(call(OperationPtrTag), std::numeric_limits<unsigned>::max(), FunctionPtr<OperationPtrTag>(lookupExceptionHandlerFromCallerFrame)));
- jumpToExceptionHandler(*vm());
+ jumpToExceptionHandler(vm());
}
if (!m_exceptionChecks.empty() || m_byValCompilationInfo.size()) {
m_exceptionHandler = label();
m_exceptionChecks.link(this);
- copyCalleeSavesToEntryFrameCalleeSavesBuffer(vm()->topEntryFrame);
+ copyCalleeSavesToEntryFrameCalleeSavesBuffer(vm().topEntryFrame);
// lookupExceptionHandler is passed two arguments, the VM and the exec (the CallFrame*).
- move(TrustedImmPtr(vm()), GPRInfo::argumentGPR0);
+ move(TrustedImmPtr(&vm()), GPRInfo::argumentGPR0);
move(GPRInfo::callFrameRegister, GPRInfo::argumentGPR1);
#if CPU(X86)
@@ -965,7 +965,7 @@
poke(GPRInfo::argumentGPR1, 1);
#endif
m_calls.append(CallRecord(call(OperationPtrTag), std::numeric_limits<unsigned>::max(), FunctionPtr<OperationPtrTag>(lookupExceptionHandler)));
- jumpToExceptionHandler(*vm());
+ jumpToExceptionHandler(vm());
}
}
diff --git a/Source/JavaScriptCore/jit/JIT.h b/Source/JavaScriptCore/jit/JIT.h
index 91fe59a..0baf243 100644
--- a/Source/JavaScriptCore/jit/JIT.h
+++ b/Source/JavaScriptCore/jit/JIT.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2008-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
@@ -192,41 +192,43 @@
static const int patchPutByIdDefaultOffset = 256;
public:
- JIT(VM*, CodeBlock* = 0, unsigned loopOSREntryBytecodeOffset = 0);
+ JIT(VM&, CodeBlock* = 0, unsigned loopOSREntryBytecodeOffset = 0);
~JIT();
+ VM& vm() { return *JSInterfaceJIT::vm(); }
+
void compileWithoutLinking(JITCompilationEffort);
CompilationResult link();
void doMainThreadPreparationBeforeCompile();
- static CompilationResult compile(VM* vm, CodeBlock* codeBlock, JITCompilationEffort effort, unsigned bytecodeOffset = 0)
+ static CompilationResult compile(VM& vm, CodeBlock* codeBlock, JITCompilationEffort effort, unsigned bytecodeOffset = 0)
{
return JIT(vm, codeBlock, bytecodeOffset).privateCompile(effort);
}
- static void compileGetByVal(const ConcurrentJSLocker& locker, VM* vm, CodeBlock* codeBlock, ByValInfo* byValInfo, ReturnAddressPtr returnAddress, JITArrayMode arrayMode)
+ static void compileGetByVal(const ConcurrentJSLocker& locker, VM& vm, CodeBlock* codeBlock, ByValInfo* byValInfo, ReturnAddressPtr returnAddress, JITArrayMode arrayMode)
{
JIT jit(vm, codeBlock);
jit.m_bytecodeOffset = byValInfo->bytecodeIndex;
jit.privateCompileGetByVal(locker, byValInfo, returnAddress, arrayMode);
}
- static void compileGetByValWithCachedId(VM* vm, CodeBlock* codeBlock, ByValInfo* byValInfo, ReturnAddressPtr returnAddress, const Identifier& propertyName)
+ static void compileGetByValWithCachedId(VM& vm, CodeBlock* codeBlock, ByValInfo* byValInfo, ReturnAddressPtr returnAddress, const Identifier& propertyName)
{
JIT jit(vm, codeBlock);
jit.m_bytecodeOffset = byValInfo->bytecodeIndex;
jit.privateCompileGetByValWithCachedId(byValInfo, returnAddress, propertyName);
}
- static void compilePutByVal(const ConcurrentJSLocker& locker, VM* vm, CodeBlock* codeBlock, ByValInfo* byValInfo, ReturnAddressPtr returnAddress, JITArrayMode arrayMode)
+ static void compilePutByVal(const ConcurrentJSLocker& locker, VM& vm, CodeBlock* codeBlock, ByValInfo* byValInfo, ReturnAddressPtr returnAddress, JITArrayMode arrayMode)
{
JIT jit(vm, codeBlock);
jit.m_bytecodeOffset = byValInfo->bytecodeIndex;
jit.privateCompilePutByVal<OpPutByVal>(locker, byValInfo, returnAddress, arrayMode);
}
- static void compileDirectPutByVal(const ConcurrentJSLocker& locker, VM* vm, CodeBlock* codeBlock, ByValInfo* byValInfo, ReturnAddressPtr returnAddress, JITArrayMode arrayMode)
+ static void compileDirectPutByVal(const ConcurrentJSLocker& locker, VM& vm, CodeBlock* codeBlock, ByValInfo* byValInfo, ReturnAddressPtr returnAddress, JITArrayMode arrayMode)
{
JIT jit(vm, codeBlock);
jit.m_bytecodeOffset = byValInfo->bytecodeIndex;
@@ -234,14 +236,14 @@
}
template<typename Op>
- static void compilePutByValWithCachedId(VM* vm, CodeBlock* codeBlock, ByValInfo* byValInfo, ReturnAddressPtr returnAddress, PutKind putKind, const Identifier& propertyName)
+ static void compilePutByValWithCachedId(VM& vm, CodeBlock* codeBlock, ByValInfo* byValInfo, ReturnAddressPtr returnAddress, PutKind putKind, const Identifier& propertyName)
{
JIT jit(vm, codeBlock);
jit.m_bytecodeOffset = byValInfo->bytecodeIndex;
jit.privateCompilePutByValWithCachedId<Op>(byValInfo, returnAddress, putKind, propertyName);
}
- static void compileHasIndexedProperty(VM* vm, CodeBlock* codeBlock, ByValInfo* byValInfo, ReturnAddressPtr returnAddress, JITArrayMode arrayMode)
+ static void compileHasIndexedProperty(VM& vm, CodeBlock* codeBlock, ByValInfo* byValInfo, ReturnAddressPtr returnAddress, JITArrayMode arrayMode)
{
JIT jit(vm, codeBlock);
jit.m_bytecodeOffset = byValInfo->bytecodeIndex;
@@ -295,12 +297,12 @@
void exceptionCheck()
{
- m_exceptionChecks.append(emitExceptionCheck(*vm()));
+ m_exceptionChecks.append(emitExceptionCheck(vm()));
}
void exceptionCheckWithCallFrameRollback()
{
- m_exceptionChecksWithCallFrameRollback.append(emitExceptionCheck(*vm()));
+ m_exceptionChecksWithCallFrameRollback.append(emitExceptionCheck(vm()));
}
void privateCompileExceptionHandlers();
diff --git a/Source/JavaScriptCore/jit/JITCall.cpp b/Source/JavaScriptCore/jit/JITCall.cpp
index c064387..1ca8817 100644
--- a/Source/JavaScriptCore/jit/JITCall.cpp
+++ b/Source/JavaScriptCore/jit/JITCall.cpp
@@ -162,7 +162,7 @@
addPtr(TrustedImm32(registerOffset * sizeof(Register) + sizeof(CallerFrameAndPC)), callFrameRegister, stackPointerRegister);
load64(Address(stackPointerRegister, sizeof(Register) * CallFrameSlot::callee - sizeof(CallerFrameAndPC)), regT0);
- emitDumbVirtualCall(*vm(), info);
+ emitDumbVirtualCall(vm(), info);
addPtr(TrustedImm32(stackPointerOffsetFor(m_codeBlock) * sizeof(Register)), callFrameRegister, stackPointerRegister);
checkStackPointerAlignment();
diff --git a/Source/JavaScriptCore/jit/JITCall32_64.cpp b/Source/JavaScriptCore/jit/JITCall32_64.cpp
index af608f0..ac77a64 100644
--- a/Source/JavaScriptCore/jit/JITCall32_64.cpp
+++ b/Source/JavaScriptCore/jit/JITCall32_64.cpp
@@ -254,7 +254,7 @@
addPtr(TrustedImm32(registerOffset * sizeof(Register) + sizeof(CallerFrameAndPC)), callFrameRegister, stackPointerRegister);
emitLoad(callee, regT1, regT0);
- emitDumbVirtualCall(*vm(), info);
+ emitDumbVirtualCall(vm(), info);
addPtr(TrustedImm32(stackPointerOffsetFor(m_codeBlock) * sizeof(Register)), callFrameRegister, stackPointerRegister);
checkStackPointerAlignment();
diff --git a/Source/JavaScriptCore/jit/JITExceptions.cpp b/Source/JavaScriptCore/jit/JITExceptions.cpp
index 95bbe50..6916fb1 100644
--- a/Source/JavaScriptCore/jit/JITExceptions.cpp
+++ b/Source/JavaScriptCore/jit/JITExceptions.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-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
@@ -43,22 +43,22 @@
namespace JSC {
-void genericUnwind(VM* vm, ExecState* callFrame)
+void genericUnwind(VM& vm, ExecState* callFrame)
{
- auto scope = DECLARE_CATCH_SCOPE(*vm);
- CallFrame* topJSCallFrame = vm->topJSCallFrame();
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+ CallFrame* topJSCallFrame = vm.topJSCallFrame();
if (Options::breakOnThrow()) {
CodeBlock* codeBlock = topJSCallFrame->codeBlock();
dataLog("In call frame ", RawPointer(topJSCallFrame), " for code block ", codeBlock, "\n");
CRASH();
}
- if (auto* shadowChicken = vm->shadowChicken())
- shadowChicken->log(*vm, topJSCallFrame, ShadowChicken::Packet::throwPacket());
+ if (auto* shadowChicken = vm.shadowChicken())
+ shadowChicken->log(vm, topJSCallFrame, ShadowChicken::Packet::throwPacket());
Exception* exception = scope.exception();
RELEASE_ASSERT(exception);
- HandlerInfo* handler = vm->interpreter->unwind(*vm, callFrame, exception); // This may update callFrame.
+ HandlerInfo* handler = vm.interpreter->unwind(vm, callFrame, exception); // This may update callFrame.
void* catchRoutine;
const Instruction* catchPCForInterpreter = nullptr;
@@ -84,12 +84,12 @@
} else
catchRoutine = LLInt::getCodePtr<ExceptionHandlerPtrTag>(handleUncaughtException).executableAddress();
- ASSERT(bitwise_cast<uintptr_t>(callFrame) < bitwise_cast<uintptr_t>(vm->topEntryFrame));
+ ASSERT(bitwise_cast<uintptr_t>(callFrame) < bitwise_cast<uintptr_t>(vm.topEntryFrame));
assertIsTaggedWith(catchRoutine, ExceptionHandlerPtrTag);
- vm->callFrameForCatch = callFrame;
- vm->targetMachinePCForThrow = catchRoutine;
- vm->targetInterpreterPCForThrow = catchPCForInterpreter;
+ vm.callFrameForCatch = callFrame;
+ vm.targetMachinePCForThrow = catchRoutine;
+ vm.targetInterpreterPCForThrow = catchPCForInterpreter;
RELEASE_ASSERT(catchRoutine);
}
diff --git a/Source/JavaScriptCore/jit/JITExceptions.h b/Source/JavaScriptCore/jit/JITExceptions.h
index bec5955..e5d29f9 100644
--- a/Source/JavaScriptCore/jit/JITExceptions.h
+++ b/Source/JavaScriptCore/jit/JITExceptions.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-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
@@ -30,6 +30,6 @@
class ExecState;
class VM;
-void genericUnwind(VM*, ExecState*);
+void genericUnwind(VM&, ExecState*);
} // namespace JSC
diff --git a/Source/JavaScriptCore/jit/JITInlineCacheGenerator.cpp b/Source/JavaScriptCore/jit/JITInlineCacheGenerator.cpp
index 064f618..68fe2bf 100644
--- a/Source/JavaScriptCore/jit/JITInlineCacheGenerator.cpp
+++ b/Source/JavaScriptCore/jit/JITInlineCacheGenerator.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-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
@@ -105,7 +105,7 @@
CodeBlock* codeBlock, CodeOrigin codeOrigin, CallSiteIndex callSite, const RegisterSet& usedRegisters,
UniquedStringImpl* propertyName, JSValueRegs base, JSValueRegs value, AccessType accessType)
: JITByIdGenerator(codeBlock, codeOrigin, callSite, accessType, usedRegisters, base, value)
- , m_isLengthAccess(propertyName == codeBlock->vm()->propertyNames->length.impl())
+ , m_isLengthAccess(propertyName == codeBlock->vm().propertyNames->length.impl())
{
RELEASE_ASSERT(base.payloadGPR() != value.tagGPR());
}
diff --git a/Source/JavaScriptCore/jit/JITOpcodes.cpp b/Source/JavaScriptCore/jit/JITOpcodes.cpp
index 1c9a954..7260668 100644
--- a/Source/JavaScriptCore/jit/JITOpcodes.cpp
+++ b/Source/JavaScriptCore/jit/JITOpcodes.cpp
@@ -232,7 +232,7 @@
Jump notMasqueradesAsUndefined = jump();
isMasqueradesAsUndefined.link(this);
- emitLoadStructure(*vm(), regT0, regT1, regT2);
+ emitLoadStructure(vm(), regT0, regT1, regT2);
move(TrustedImmPtr(m_codeBlock->globalObject()), regT0);
loadPtr(Address(regT1, Structure::globalObjectOffset()), regT1);
comparePtr(Equal, regT0, regT1, regT0);
@@ -391,7 +391,7 @@
bool shouldCheckMasqueradesAsUndefined = true;
emitGetVirtualRegister(bytecode.m_condition.offset(), value);
- addJump(branchIfFalsey(*vm(), JSValueRegs(value), scratch1, scratch2, fpRegT0, fpRegT1, shouldCheckMasqueradesAsUndefined, m_codeBlock->globalObject()), target);
+ addJump(branchIfFalsey(vm(), JSValueRegs(value), scratch1, scratch2, fpRegT0, fpRegT1, shouldCheckMasqueradesAsUndefined, m_codeBlock->globalObject()), target);
}
void JIT::emit_op_jeq_null(const Instruction* currentInstruction)
@@ -405,7 +405,7 @@
// First, handle JSCell cases - check MasqueradesAsUndefined bit on the structure.
Jump isNotMasqueradesAsUndefined = branchTest8(Zero, Address(regT0, JSCell::typeInfoFlagsOffset()), TrustedImm32(MasqueradesAsUndefined));
- emitLoadStructure(*vm(), regT0, regT2, regT1);
+ emitLoadStructure(vm(), regT0, regT2, regT1);
move(TrustedImmPtr(m_codeBlock->globalObject()), regT0);
addJump(branchPtr(Equal, Address(regT2, Structure::globalObjectOffset()), regT0), target);
Jump masqueradesGlobalObjectIsForeign = jump();
@@ -429,7 +429,7 @@
// First, handle JSCell cases - check MasqueradesAsUndefined bit on the structure.
addJump(branchTest8(Zero, Address(regT0, JSCell::typeInfoFlagsOffset()), TrustedImm32(MasqueradesAsUndefined)), target);
- emitLoadStructure(*vm(), regT0, regT2, regT1);
+ emitLoadStructure(vm(), regT0, regT2, regT1);
move(TrustedImmPtr(m_codeBlock->globalObject()), regT0);
addJump(branchPtr(NotEqual, Address(regT2, Structure::globalObjectOffset()), regT0), target);
Jump wasNotImmediate = jump();
@@ -510,7 +510,7 @@
GPRReg scratch2 = regT2;
bool shouldCheckMasqueradesAsUndefined = true;
emitGetVirtualRegister(bytecode.m_condition.offset(), value);
- addJump(branchIfTruthy(*vm(), JSValueRegs(value), scratch1, scratch2, fpRegT0, fpRegT1, shouldCheckMasqueradesAsUndefined, m_codeBlock->globalObject()), target);
+ addJump(branchIfTruthy(vm(), JSValueRegs(value), scratch1, scratch2, fpRegT0, fpRegT1, shouldCheckMasqueradesAsUndefined, m_codeBlock->globalObject()), target);
}
void JIT::emit_op_neq(const Instruction* currentInstruction)
@@ -537,10 +537,10 @@
{
auto bytecode = currentInstruction->as<OpThrow>();
ASSERT(regT0 == returnValueGPR);
- copyCalleeSavesToEntryFrameCalleeSavesBuffer(vm()->topEntryFrame);
+ copyCalleeSavesToEntryFrameCalleeSavesBuffer(vm().topEntryFrame);
emitGetVirtualRegister(bytecode.m_value.offset(), regT0);
callOperationNoExceptionCheck(operationThrow, regT0);
- jumpToExceptionHandler(*vm());
+ jumpToExceptionHandler(vm());
}
template<typename Op>
@@ -691,7 +691,7 @@
{
auto bytecode = currentInstruction->as<OpCatch>();
- restoreCalleeSavesFromEntryFrameCalleeSavesBuffer(vm()->topEntryFrame);
+ restoreCalleeSavesFromEntryFrameCalleeSavesBuffer(vm().topEntryFrame);
move(TrustedImmPtr(m_vm), regT3);
load64(Address(regT3, VM::callFrameForCatchOffset()), callFrameRegister);
@@ -701,7 +701,7 @@
callOperationNoExceptionCheck(operationCheckIfExceptionIsUncatchableAndNotifyProfiler);
Jump isCatchableException = branchTest32(Zero, returnValueGPR);
- jumpToExceptionHandler(*vm());
+ jumpToExceptionHandler(vm());
isCatchableException.link(this);
move(TrustedImmPtr(m_vm), regT3);
@@ -824,7 +824,7 @@
Jump wasNotMasqueradesAsUndefined = jump();
isMasqueradesAsUndefined.link(this);
- emitLoadStructure(*vm(), regT0, regT2, regT1);
+ emitLoadStructure(vm(), regT0, regT2, regT1);
move(TrustedImmPtr(m_codeBlock->globalObject()), regT0);
loadPtr(Address(regT2, Structure::globalObjectOffset()), regT2);
comparePtr(Equal, regT0, regT2, regT0);
@@ -857,7 +857,7 @@
Jump wasNotMasqueradesAsUndefined = jump();
isMasqueradesAsUndefined.link(this);
- emitLoadStructure(*vm(), regT0, regT2, regT1);
+ emitLoadStructure(vm(), regT0, regT2, regT1);
move(TrustedImmPtr(m_codeBlock->globalObject()), regT0);
loadPtr(Address(regT2, Structure::globalObjectOffset()), regT2);
comparePtr(NotEqual, regT0, regT2, regT0);
@@ -1034,7 +1034,7 @@
if (canBeOptimized()) {
linkAllSlowCases(iter);
- copyCalleeSavesFromFrameOrRegisterToEntryFrameCalleeSavesBuffer(vm()->topEntryFrame);
+ copyCalleeSavesFromFrameOrRegisterToEntryFrameCalleeSavesBuffer(vm().topEntryFrame);
callOperation(operationOptimize, m_bytecodeOffset);
Jump noOptimizedEntry = branchTestPtr(Zero, returnValueGPR);
@@ -1480,28 +1480,28 @@
void JIT::emit_op_log_shadow_chicken_prologue(const Instruction* currentInstruction)
{
- RELEASE_ASSERT(vm()->shadowChicken());
+ RELEASE_ASSERT(vm().shadowChicken());
updateTopCallFrame();
static_assert(nonArgGPR0 != regT0 && nonArgGPR0 != regT2, "we will have problems if this is true.");
auto bytecode = currentInstruction->as<OpLogShadowChickenPrologue>();
GPRReg shadowPacketReg = regT0;
GPRReg scratch1Reg = nonArgGPR0; // This must be a non-argument register.
GPRReg scratch2Reg = regT2;
- ensureShadowChickenPacket(*vm(), shadowPacketReg, scratch1Reg, scratch2Reg);
+ ensureShadowChickenPacket(vm(), shadowPacketReg, scratch1Reg, scratch2Reg);
emitGetVirtualRegister(bytecode.m_scope.offset(), regT3);
logShadowChickenProloguePacket(shadowPacketReg, scratch1Reg, regT3);
}
void JIT::emit_op_log_shadow_chicken_tail(const Instruction* currentInstruction)
{
- RELEASE_ASSERT(vm()->shadowChicken());
+ RELEASE_ASSERT(vm().shadowChicken());
updateTopCallFrame();
static_assert(nonArgGPR0 != regT0 && nonArgGPR0 != regT2, "we will have problems if this is true.");
auto bytecode = currentInstruction->as<OpLogShadowChickenTail>();
GPRReg shadowPacketReg = regT0;
GPRReg scratch1Reg = nonArgGPR0; // This must be a non-argument register.
GPRReg scratch2Reg = regT2;
- ensureShadowChickenPacket(*vm(), shadowPacketReg, scratch1Reg, scratch2Reg);
+ ensureShadowChickenPacket(vm(), shadowPacketReg, scratch1Reg, scratch2Reg);
emitGetVirtualRegister(bytecode.m_thisValue.offset(), regT2);
emitGetVirtualRegister(bytecode.m_scope.offset(), regT3);
logShadowChickenTailPacket(shadowPacketReg, JSValueRegs(regT2), regT3, m_codeBlock, CallSiteIndex(m_bytecodeOffset));
diff --git a/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp b/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp
index 5d8a13b..c7ad3b0 100644
--- a/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp
+++ b/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp
@@ -380,7 +380,7 @@
GPRReg scratch1 = regT2;
GPRReg scratch2 = regT3;
bool shouldCheckMasqueradesAsUndefined = true;
- addJump(branchIfFalsey(*vm(), value, scratch1, scratch2, fpRegT0, fpRegT1, shouldCheckMasqueradesAsUndefined, m_codeBlock->globalObject()), target);
+ addJump(branchIfFalsey(vm(), value, scratch1, scratch2, fpRegT0, fpRegT1, shouldCheckMasqueradesAsUndefined, m_codeBlock->globalObject()), target);
}
void JIT::emit_op_jtrue(const Instruction* currentInstruction)
@@ -394,7 +394,7 @@
JSValueRegs value(regT1, regT0);
GPRReg scratch1 = regT2;
GPRReg scratch2 = regT3;
- addJump(branchIfTruthy(*vm(), value, scratch1, scratch2, fpRegT0, fpRegT1, shouldCheckMasqueradesAsUndefined, m_codeBlock->globalObject()), target);
+ addJump(branchIfTruthy(vm(), value, scratch1, scratch2, fpRegT0, fpRegT1, shouldCheckMasqueradesAsUndefined, m_codeBlock->globalObject()), target);
}
void JIT::emit_op_jeq_null(const Instruction* currentInstruction)
@@ -815,10 +815,10 @@
{
auto bytecode = currentInstruction->as<OpThrow>();
ASSERT(regT0 == returnValueGPR);
- copyCalleeSavesToEntryFrameCalleeSavesBuffer(vm()->topEntryFrame);
+ copyCalleeSavesToEntryFrameCalleeSavesBuffer(vm().topEntryFrame);
emitLoad(bytecode.m_value.offset(), regT1, regT0);
callOperationNoExceptionCheck(operationThrow, JSValueRegs(regT1, regT0));
- jumpToExceptionHandler(*vm());
+ jumpToExceptionHandler(vm());
}
void JIT::emit_op_to_number(const Instruction* currentInstruction)
@@ -873,7 +873,7 @@
{
auto bytecode = currentInstruction->as<OpCatch>();
- restoreCalleeSavesFromEntryFrameCalleeSavesBuffer(vm()->topEntryFrame);
+ restoreCalleeSavesFromEntryFrameCalleeSavesBuffer(vm().topEntryFrame);
move(TrustedImmPtr(m_vm), regT3);
// operationThrow returns the callFrame for the handler.
@@ -884,7 +884,7 @@
callOperationNoExceptionCheck(operationCheckIfExceptionIsUncatchableAndNotifyProfiler);
Jump isCatchableException = branchTest32(Zero, returnValueGPR);
- jumpToExceptionHandler(*vm());
+ jumpToExceptionHandler(vm());
isCatchableException.link(this);
move(TrustedImmPtr(m_vm), regT3);
@@ -1358,14 +1358,14 @@
void JIT::emit_op_log_shadow_chicken_prologue(const Instruction* currentInstruction)
{
- RELEASE_ASSERT(vm()->shadowChicken());
+ RELEASE_ASSERT(vm().shadowChicken());
updateTopCallFrame();
static_assert(nonArgGPR0 != regT0 && nonArgGPR0 != regT2, "we will have problems if this is true.");
auto bytecode = currentInstruction->as<OpLogShadowChickenPrologue>();
GPRReg shadowPacketReg = regT0;
GPRReg scratch1Reg = nonArgGPR0; // This must be a non-argument register.
GPRReg scratch2Reg = regT2;
- ensureShadowChickenPacket(*vm(), shadowPacketReg, scratch1Reg, scratch2Reg);
+ ensureShadowChickenPacket(vm(), shadowPacketReg, scratch1Reg, scratch2Reg);
scratch1Reg = regT4;
emitLoadPayload(bytecode.m_scope.offset(), regT3);
@@ -1374,14 +1374,14 @@
void JIT::emit_op_log_shadow_chicken_tail(const Instruction* currentInstruction)
{
- RELEASE_ASSERT(vm()->shadowChicken());
+ RELEASE_ASSERT(vm().shadowChicken());
updateTopCallFrame();
static_assert(nonArgGPR0 != regT0 && nonArgGPR0 != regT2, "we will have problems if this is true.");
auto bytecode = currentInstruction->as<OpLogShadowChickenTail>();
GPRReg shadowPacketReg = regT0;
GPRReg scratch1Reg = nonArgGPR0; // This must be a non-argument register.
GPRReg scratch2Reg = regT2;
- ensureShadowChickenPacket(*vm(), shadowPacketReg, scratch1Reg, scratch2Reg);
+ ensureShadowChickenPacket(vm(), shadowPacketReg, scratch1Reg, scratch2Reg);
emitLoadPayload(bytecode.m_thisValue.offset(), regT2);
emitLoadTag(bytecode.m_thisValue.offset(), regT1);
JSValueRegs thisRegs(regT1, regT2);
diff --git a/Source/JavaScriptCore/jit/JITOperations.cpp b/Source/JavaScriptCore/jit/JITOperations.cpp
index e011a1b..595aa0c 100644
--- a/Source/JavaScriptCore/jit/JITOperations.cpp
+++ b/Source/JavaScriptCore/jit/JITOperations.cpp
@@ -93,7 +93,7 @@
#endif
#if ENABLE(OPCODE_SAMPLING)
-#define CTI_SAMPLER vm->interpreter->sampler()
+#define CTI_SAMPLER vm.interpreter->sampler()
#else
#define CTI_SAMPLER 0
#endif
@@ -102,33 +102,34 @@
void JIT_OPERATION operationThrowStackOverflowError(ExecState* exec, CodeBlock* codeBlock)
{
// We pass in our own code block, because the callframe hasn't been populated.
- VM* vm = codeBlock->vm();
- auto scope = DECLARE_THROW_SCOPE(*vm);
- exec->convertToStackOverflowFrame(*vm, codeBlock);
+ VM& vm = codeBlock->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+ exec->convertToStackOverflowFrame(vm, codeBlock);
NativeCallFrameTracer tracer(vm, exec);
throwStackOverflowError(exec, scope);
}
-void JIT_OPERATION throwStackOverflowErrorFromThunk(VM* vm, ExecState* exec)
+void JIT_OPERATION throwStackOverflowErrorFromThunk(VM* vmPointer, ExecState* exec)
{
- auto scope = DECLARE_THROW_SCOPE(*vm);
+ VM& vm = *vmPointer;
+ auto scope = DECLARE_THROW_SCOPE(vm);
NativeCallFrameTracer tracer(vm, exec);
throwStackOverflowError(exec, scope);
genericUnwind(vm, exec);
- ASSERT(vm->targetMachinePCForThrow);
+ ASSERT(vm.targetMachinePCForThrow);
}
int32_t JIT_OPERATION operationCallArityCheck(ExecState* exec)
{
- VM* vm = &exec->vm();
- auto scope = DECLARE_THROW_SCOPE(*vm);
+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
- int32_t missingArgCount = CommonSlowPaths::arityCheckFor(exec, *vm, CodeForCall);
+ int32_t missingArgCount = CommonSlowPaths::arityCheckFor(exec, vm, CodeForCall);
if (UNLIKELY(missingArgCount < 0)) {
CodeBlock* codeBlock = CommonSlowPaths::codeBlockFromCallFrameCallee(exec, CodeForCall);
- exec->convertToStackOverflowFrame(*vm, codeBlock);
+ exec->convertToStackOverflowFrame(vm, codeBlock);
NativeCallFrameTracer tracer(vm, exec);
- throwStackOverflowError(vm->topCallFrame, scope);
+ throwStackOverflowError(vm.topCallFrame, scope);
}
return missingArgCount;
@@ -136,15 +137,15 @@
int32_t JIT_OPERATION operationConstructArityCheck(ExecState* exec)
{
- VM* vm = &exec->vm();
- auto scope = DECLARE_THROW_SCOPE(*vm);
+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
- int32_t missingArgCount = CommonSlowPaths::arityCheckFor(exec, *vm, CodeForConstruct);
+ int32_t missingArgCount = CommonSlowPaths::arityCheckFor(exec, vm, CodeForConstruct);
if (UNLIKELY(missingArgCount < 0)) {
CodeBlock* codeBlock = CommonSlowPaths::codeBlockFromCallFrameCallee(exec, CodeForConstruct);
- exec->convertToStackOverflowFrame(*vm, codeBlock);
+ exec->convertToStackOverflowFrame(vm, codeBlock);
NativeCallFrameTracer tracer(vm, exec);
- throwStackOverflowError(vm->topCallFrame, scope);
+ throwStackOverflowError(vm.topCallFrame, scope);
}
return missingArgCount;
@@ -152,7 +153,7 @@
EncodedJSValue JIT_OPERATION operationTryGetById(ExecState* exec, StructureStubInfo* stubInfo, EncodedJSValue base, UniquedStringImpl* uid)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
Identifier ident = Identifier::fromUid(vm, uid);
stubInfo->tookSlowPath = true;
@@ -167,7 +168,7 @@
EncodedJSValue JIT_OPERATION operationTryGetByIdGeneric(ExecState* exec, EncodedJSValue base, UniquedStringImpl* uid)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
Identifier ident = Identifier::fromUid(vm, uid);
@@ -180,9 +181,9 @@
EncodedJSValue JIT_OPERATION operationTryGetByIdOptimize(ExecState* exec, StructureStubInfo* stubInfo, EncodedJSValue base, UniquedStringImpl* uid)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
- auto scope = DECLARE_THROW_SCOPE(*vm);
+ auto scope = DECLARE_THROW_SCOPE(vm);
Identifier ident = Identifier::fromUid(vm, uid);
JSValue baseValue = JSValue::decode(base);
@@ -191,7 +192,7 @@
baseValue.getPropertySlot(exec, ident, slot);
RETURN_IF_EXCEPTION(scope, encodedJSValue());
- if (stubInfo->considerCaching(*vm, exec->codeBlock(), baseValue.structureOrNull()) && !slot.isTaintedByOpaqueObject() && (slot.isCacheableValue() || slot.isCacheableGetter() || slot.isUnset()))
+ if (stubInfo->considerCaching(vm, exec->codeBlock(), baseValue.structureOrNull()) && !slot.isTaintedByOpaqueObject() && (slot.isCacheableValue() || slot.isCacheableGetter() || slot.isUnset()))
repatchGetByID(exec, baseValue, ident, slot, *stubInfo, GetByIDKind::Try);
return JSValue::encode(slot.getPureResult());
@@ -200,9 +201,9 @@
EncodedJSValue JIT_OPERATION operationGetByIdDirect(ExecState* exec, StructureStubInfo* stubInfo, EncodedJSValue base, UniquedStringImpl* uid)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
- Identifier ident = Identifier::fromUid(&vm, uid);
+ Identifier ident = Identifier::fromUid(vm, uid);
stubInfo->tookSlowPath = true;
JSValue baseValue = JSValue::decode(base);
@@ -217,9 +218,9 @@
EncodedJSValue JIT_OPERATION operationGetByIdDirectGeneric(ExecState* exec, EncodedJSValue base, UniquedStringImpl* uid)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
- Identifier ident = Identifier::fromUid(&vm, uid);
+ Identifier ident = Identifier::fromUid(vm, uid);
JSValue baseValue = JSValue::decode(base);
PropertySlot slot(baseValue, PropertySlot::InternalMethodType::GetOwnProperty);
@@ -233,9 +234,9 @@
EncodedJSValue JIT_OPERATION operationGetByIdDirectOptimize(ExecState* exec, StructureStubInfo* stubInfo, EncodedJSValue base, UniquedStringImpl* uid)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
- Identifier ident = Identifier::fromUid(&vm, uid);
+ Identifier ident = Identifier::fromUid(vm, uid);
JSValue baseValue = JSValue::decode(base);
PropertySlot slot(baseValue, PropertySlot::InternalMethodType::GetOwnProperty);
@@ -253,7 +254,7 @@
{
SuperSamplerScope superSamplerScope(false);
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
stubInfo->tookSlowPath = true;
@@ -263,7 +264,7 @@
Identifier ident = Identifier::fromUid(vm, uid);
JSValue result = baseValue.get(exec, ident, slot);
- LOG_IC((ICEvent::OperationGetById, baseValue.classInfoOrNull(*vm), ident, baseValue == slot.slotBase()));
+ LOG_IC((ICEvent::OperationGetById, baseValue.classInfoOrNull(vm), ident, baseValue == slot.slotBase()));
return JSValue::encode(result);
}
@@ -272,7 +273,7 @@
{
SuperSamplerScope superSamplerScope(false);
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
JSValue baseValue = JSValue::decode(base);
@@ -280,7 +281,7 @@
Identifier ident = Identifier::fromUid(vm, uid);
JSValue result = baseValue.get(exec, ident, slot);
- LOG_IC((ICEvent::OperationGetByIdGeneric, baseValue.classInfoOrNull(*vm), ident, baseValue == slot.slotBase()));
+ LOG_IC((ICEvent::OperationGetByIdGeneric, baseValue.classInfoOrNull(vm), ident, baseValue == slot.slotBase()));
return JSValue::encode(result);
}
@@ -289,7 +290,7 @@
{
SuperSamplerScope superSamplerScope(false);
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
Identifier ident = Identifier::fromUid(vm, uid);
@@ -297,9 +298,9 @@
return JSValue::encode(baseValue.getPropertySlot(exec, ident, [&] (bool found, PropertySlot& slot) -> JSValue {
- LOG_IC((ICEvent::OperationGetByIdOptimize, baseValue.classInfoOrNull(*vm), ident, baseValue == slot.slotBase()));
+ LOG_IC((ICEvent::OperationGetByIdOptimize, baseValue.classInfoOrNull(vm), ident, baseValue == slot.slotBase()));
- if (stubInfo->considerCaching(*vm, exec->codeBlock(), baseValue.structureOrNull()))
+ if (stubInfo->considerCaching(vm, exec->codeBlock(), baseValue.structureOrNull()))
repatchGetByID(exec, baseValue, ident, slot, *stubInfo, GetByIDKind::Normal);
return found ? slot.getValue(exec, ident) : jsUndefined();
}));
@@ -309,7 +310,7 @@
{
SuperSamplerScope superSamplerScope(false);
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
Identifier ident = Identifier::fromUid(vm, uid);
@@ -326,7 +327,7 @@
{
SuperSamplerScope superSamplerScope(false);
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
Identifier ident = Identifier::fromUid(vm, uid);
@@ -341,7 +342,7 @@
{
SuperSamplerScope superSamplerScope(false);
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
Identifier ident = Identifier::fromUid(vm, uid);
@@ -350,9 +351,9 @@
PropertySlot slot(thisValue, PropertySlot::InternalMethodType::Get);
return JSValue::encode(baseValue.getPropertySlot(exec, ident, slot, [&] (bool found, PropertySlot& slot) -> JSValue {
- LOG_IC((ICEvent::OperationGetByIdWithThisOptimize, baseValue.classInfoOrNull(*vm), ident, baseValue == slot.slotBase()));
+ LOG_IC((ICEvent::OperationGetByIdWithThisOptimize, baseValue.classInfoOrNull(vm), ident, baseValue == slot.slotBase()));
- if (stubInfo->considerCaching(*vm, exec->codeBlock(), baseValue.structureOrNull()))
+ if (stubInfo->considerCaching(vm, exec->codeBlock(), baseValue.structureOrNull()))
repatchGetByID(exec, baseValue, ident, slot, *stubInfo, GetByIDKind::WithThis);
return found ? slot.getValue(exec, ident) : jsUndefined();
}));
@@ -363,12 +364,12 @@
SuperSamplerScope superSamplerScope(false);
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
stubInfo->tookSlowPath = true;
- Identifier ident = Identifier::fromUid(&vm, uid);
+ Identifier ident = Identifier::fromUid(vm, uid);
JSValue baseValue = JSValue::decode(base);
if (!baseValue.isObject()) {
@@ -389,10 +390,10 @@
SuperSamplerScope superSamplerScope(false);
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
- Identifier ident = Identifier::fromUid(&vm, uid);
+ Identifier ident = Identifier::fromUid(vm, uid);
JSValue baseValue = JSValue::decode(base);
if (!baseValue.isObject()) {
@@ -413,10 +414,10 @@
SuperSamplerScope superSamplerScope(false);
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
- Identifier ident = Identifier::fromUid(&vm, uid);
+ Identifier ident = Identifier::fromUid(vm, uid);
JSValue baseValue = JSValue::decode(base);
if (!baseValue.isObject()) {
@@ -439,7 +440,7 @@
{
SuperSamplerScope superSamplerScope(false);
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
return JSValue::encode(jsBoolean(CommonSlowPaths::opInByVal(exec, base, JSValue::decode(key))));
@@ -449,7 +450,7 @@
{
SuperSamplerScope superSamplerScope(false);
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
stubInfo->tookSlowPath = true;
@@ -459,14 +460,14 @@
PutPropertySlot slot(baseValue, true, exec->codeBlock()->putByIdContext());
baseValue.putInline(exec, ident, JSValue::decode(encodedValue), slot);
- LOG_IC((ICEvent::OperationPutByIdStrict, baseValue.classInfoOrNull(*vm), ident, slot.base() == baseValue));
+ LOG_IC((ICEvent::OperationPutByIdStrict, baseValue.classInfoOrNull(vm), ident, slot.base() == baseValue));
}
void JIT_OPERATION operationPutByIdNonStrict(ExecState* exec, StructureStubInfo* stubInfo, EncodedJSValue encodedValue, EncodedJSValue encodedBase, UniquedStringImpl* uid)
{
SuperSamplerScope superSamplerScope(false);
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
stubInfo->tookSlowPath = true;
@@ -476,7 +477,7 @@
PutPropertySlot slot(baseValue, false, exec->codeBlock()->putByIdContext());
baseValue.putInline(exec, ident, JSValue::decode(encodedValue), slot);
- LOG_IC((ICEvent::OperationPutByIdNonStrict, baseValue.classInfoOrNull(*vm), ident, slot.base() == baseValue));
+ LOG_IC((ICEvent::OperationPutByIdNonStrict, baseValue.classInfoOrNull(vm), ident, slot.base() == baseValue));
}
void JIT_OPERATION operationPutByIdDirectStrict(ExecState* exec, StructureStubInfo* stubInfo, EncodedJSValue encodedValue, EncodedJSValue encodedBase, UniquedStringImpl* uid)
@@ -484,12 +485,12 @@
SuperSamplerScope superSamplerScope(false);
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
stubInfo->tookSlowPath = true;
JSValue baseValue = JSValue::decode(encodedBase);
- Identifier ident = Identifier::fromUid(&vm, uid);
+ Identifier ident = Identifier::fromUid(vm, uid);
PutPropertySlot slot(baseValue, true, exec->codeBlock()->putByIdContext());
CommonSlowPaths::putDirectWithReify(vm, exec, asObject(baseValue), ident, JSValue::decode(encodedValue), slot);
@@ -501,12 +502,12 @@
SuperSamplerScope superSamplerScope(false);
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
stubInfo->tookSlowPath = true;
JSValue baseValue = JSValue::decode(encodedBase);
- Identifier ident = Identifier::fromUid(&vm, uid);
+ Identifier ident = Identifier::fromUid(vm, uid);
PutPropertySlot slot(baseValue, false, exec->codeBlock()->putByIdContext());
CommonSlowPaths::putDirectWithReify(vm, exec, asObject(baseValue), ident, JSValue::decode(encodedValue), slot);
@@ -517,9 +518,9 @@
{
SuperSamplerScope superSamplerScope(false);
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
- auto scope = DECLARE_THROW_SCOPE(*vm);
+ auto scope = DECLARE_THROW_SCOPE(vm);
Identifier ident = Identifier::fromUid(vm, uid);
AccessType accessType = static_cast<AccessType>(stubInfo->accessType);
@@ -529,17 +530,17 @@
CodeBlock* codeBlock = exec->codeBlock();
PutPropertySlot slot(baseValue, true, codeBlock->putByIdContext());
- Structure* structure = baseValue.isCell() ? baseValue.asCell()->structure(*vm) : nullptr;
+ Structure* structure = baseValue.isCell() ? baseValue.asCell()->structure(vm) : nullptr;
baseValue.putInline(exec, ident, value, slot);
- LOG_IC((ICEvent::OperationPutByIdStrictOptimize, baseValue.classInfoOrNull(*vm), ident, slot.base() == baseValue));
+ LOG_IC((ICEvent::OperationPutByIdStrictOptimize, baseValue.classInfoOrNull(vm), ident, slot.base() == baseValue));
RETURN_IF_EXCEPTION(scope, void());
if (accessType != static_cast<AccessType>(stubInfo->accessType))
return;
- if (stubInfo->considerCaching(*vm, codeBlock, structure))
+ if (stubInfo->considerCaching(vm, codeBlock, structure))
repatchPutByID(exec, baseValue, structure, ident, slot, *stubInfo, NotDirect);
}
@@ -547,9 +548,9 @@
{
SuperSamplerScope superSamplerScope(false);
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
- auto scope = DECLARE_THROW_SCOPE(*vm);
+ auto scope = DECLARE_THROW_SCOPE(vm);
Identifier ident = Identifier::fromUid(vm, uid);
AccessType accessType = static_cast<AccessType>(stubInfo->accessType);
@@ -559,17 +560,17 @@
CodeBlock* codeBlock = exec->codeBlock();
PutPropertySlot slot(baseValue, false, codeBlock->putByIdContext());
- Structure* structure = baseValue.isCell() ? baseValue.asCell()->structure(*vm) : nullptr;
+ Structure* structure = baseValue.isCell() ? baseValue.asCell()->structure(vm) : nullptr;
baseValue.putInline(exec, ident, value, slot);
- LOG_IC((ICEvent::OperationPutByIdNonStrictOptimize, baseValue.classInfoOrNull(*vm), ident, slot.base() == baseValue));
+ LOG_IC((ICEvent::OperationPutByIdNonStrictOptimize, baseValue.classInfoOrNull(vm), ident, slot.base() == baseValue));
RETURN_IF_EXCEPTION(scope, void());
if (accessType != static_cast<AccessType>(stubInfo->accessType))
return;
- if (stubInfo->considerCaching(*vm, codeBlock, structure))
+ if (stubInfo->considerCaching(vm, codeBlock, structure))
repatchPutByID(exec, baseValue, structure, ident, slot, *stubInfo, NotDirect);
}
@@ -578,10 +579,10 @@
SuperSamplerScope superSamplerScope(false);
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
- Identifier ident = Identifier::fromUid(&vm, uid);
+ Identifier ident = Identifier::fromUid(vm, uid);
AccessType accessType = static_cast<AccessType>(stubInfo->accessType);
JSValue value = JSValue::decode(encodedValue);
@@ -607,10 +608,10 @@
SuperSamplerScope superSamplerScope(false);
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
- Identifier ident = Identifier::fromUid(&vm, uid);
+ Identifier ident = Identifier::fromUid(vm, uid);
AccessType accessType = static_cast<AccessType>(stubInfo->accessType);
JSValue value = JSValue::decode(encodedValue);
@@ -769,7 +770,7 @@
CodeBlock* codeBlock = exec->codeBlock();
ConcurrentJSLocker locker(codeBlock->m_lock);
byValInfo->arrayProfile->computeUpdatedPrediction(locker, codeBlock, structure);
- JIT::compilePutByVal(locker, &vm, codeBlock, byValInfo, returnAddress, arrayMode);
+ JIT::compilePutByVal(locker, vm, codeBlock, byValInfo, returnAddress, arrayMode);
optimizationResult = OptimizationResult::Optimized;
}
}
@@ -787,7 +788,7 @@
ASSERT(!byValInfo->stubRoutine);
if (byValInfo->seen) {
if (byValInfo->cachedId == propertyName) {
- JIT::compilePutByValWithCachedId<OpPutByVal>(&vm, exec->codeBlock(), byValInfo, returnAddress, NotDirect, propertyName);
+ JIT::compilePutByValWithCachedId<OpPutByVal>(vm, exec->codeBlock(), byValInfo, returnAddress, NotDirect, propertyName);
optimizationResult = OptimizationResult::Optimized;
} else {
// Seem like a generic property access site.
@@ -821,7 +822,7 @@
void JIT_OPERATION operationPutByValOptimize(ExecState* exec, EncodedJSValue encodedBaseValue, EncodedJSValue encodedSubscript, EncodedJSValue encodedValue, ByValInfo* byValInfo)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue baseValue = JSValue::decode(encodedBaseValue);
@@ -858,7 +859,7 @@
ConcurrentJSLocker locker(codeBlock->m_lock);
byValInfo->arrayProfile->computeUpdatedPrediction(locker, codeBlock, structure);
- JIT::compileDirectPutByVal(locker, &vm, codeBlock, byValInfo, returnAddress, arrayMode);
+ JIT::compileDirectPutByVal(locker, vm, codeBlock, byValInfo, returnAddress, arrayMode);
optimizationResult = OptimizationResult::Optimized;
}
}
@@ -874,7 +875,7 @@
ASSERT(!byValInfo->stubRoutine);
if (byValInfo->seen) {
if (byValInfo->cachedId == propertyName) {
- JIT::compilePutByValWithCachedId<OpPutByValDirect>(&vm, exec->codeBlock(), byValInfo, returnAddress, Direct, propertyName);
+ JIT::compilePutByValWithCachedId<OpPutByValDirect>(vm, exec->codeBlock(), byValInfo, returnAddress, Direct, propertyName);
optimizationResult = OptimizationResult::Optimized;
} else {
// Seem like a generic property access site.
@@ -908,7 +909,7 @@
void JIT_OPERATION operationDirectPutByValOptimize(ExecState* exec, EncodedJSValue encodedBaseValue, EncodedJSValue encodedSubscript, EncodedJSValue encodedValue, ByValInfo* byValInfo)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue baseValue = JSValue::decode(encodedBaseValue);
@@ -930,7 +931,7 @@
void JIT_OPERATION operationPutByValGeneric(ExecState* exec, EncodedJSValue encodedBaseValue, EncodedJSValue encodedSubscript, EncodedJSValue encodedValue, ByValInfo* byValInfo)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
JSValue baseValue = JSValue::decode(encodedBaseValue);
JSValue subscript = JSValue::decode(encodedSubscript);
@@ -943,7 +944,7 @@
void JIT_OPERATION operationDirectPutByValGeneric(ExecState* exec, EncodedJSValue encodedBaseValue, EncodedJSValue encodedSubscript, EncodedJSValue encodedValue, ByValInfo* byValInfo)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
JSValue baseValue = JSValue::decode(encodedBaseValue);
JSValue subscript = JSValue::decode(encodedSubscript);
@@ -954,8 +955,8 @@
EncodedJSValue JIT_OPERATION operationCallEval(ExecState* exec, ExecState* execCallee)
{
- VM* vm = &exec->vm();
- auto scope = DECLARE_THROW_SCOPE(*vm);
+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
execCallee->setCodeBlock(0);
@@ -971,24 +972,24 @@
static SlowPathReturnType handleHostCall(ExecState* execCallee, JSValue callee, CallLinkInfo* callLinkInfo)
{
ExecState* exec = execCallee->callerFrame();
- VM* vm = &exec->vm();
- auto scope = DECLARE_THROW_SCOPE(*vm);
+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
execCallee->setCodeBlock(0);
if (callLinkInfo->specializationKind() == CodeForCall) {
CallData callData;
- CallType callType = getCallData(*vm, callee, callData);
+ CallType callType = getCallData(vm, callee, callData);
ASSERT(callType != CallType::JS);
if (callType == CallType::Host) {
NativeCallFrameTracer tracer(vm, execCallee);
execCallee->setCallee(asObject(callee));
- vm->hostCallReturnValue = JSValue::decode(callData.native.function(execCallee));
+ vm.hostCallReturnValue = JSValue::decode(callData.native.function(execCallee));
if (UNLIKELY(scope.exception())) {
return encodeResult(
- vm->getCTIStub(throwExceptionFromCallSlowPathGenerator).retaggedCode<JSEntryPtrTag>().executableAddress(),
+ vm.getCTIStub(throwExceptionFromCallSlowPathGenerator).retaggedCode<JSEntryPtrTag>().executableAddress(),
reinterpret_cast<void*>(KeepTheFrame));
}
@@ -1000,24 +1001,24 @@
ASSERT(callType == CallType::None);
throwException(exec, scope, createNotAFunctionError(exec, callee));
return encodeResult(
- vm->getCTIStub(throwExceptionFromCallSlowPathGenerator).retaggedCode<JSEntryPtrTag>().executableAddress(),
+ vm.getCTIStub(throwExceptionFromCallSlowPathGenerator).retaggedCode<JSEntryPtrTag>().executableAddress(),
reinterpret_cast<void*>(KeepTheFrame));
}
ASSERT(callLinkInfo->specializationKind() == CodeForConstruct);
ConstructData constructData;
- ConstructType constructType = getConstructData(*vm, callee, constructData);
+ ConstructType constructType = getConstructData(vm, callee, constructData);
ASSERT(constructType != ConstructType::JS);
if (constructType == ConstructType::Host) {
NativeCallFrameTracer tracer(vm, execCallee);
execCallee->setCallee(asObject(callee));
- vm->hostCallReturnValue = JSValue::decode(constructData.native.function(execCallee));
+ vm.hostCallReturnValue = JSValue::decode(constructData.native.function(execCallee));
if (UNLIKELY(scope.exception())) {
return encodeResult(
- vm->getCTIStub(throwExceptionFromCallSlowPathGenerator).retaggedCode<JSEntryPtrTag>().executableAddress(),
+ vm.getCTIStub(throwExceptionFromCallSlowPathGenerator).retaggedCode<JSEntryPtrTag>().executableAddress(),
reinterpret_cast<void*>(KeepTheFrame));
}
@@ -1027,15 +1028,15 @@
ASSERT(constructType == ConstructType::None);
throwException(exec, scope, createNotAConstructorError(exec, callee));
return encodeResult(
- vm->getCTIStub(throwExceptionFromCallSlowPathGenerator).retaggedCode<JSEntryPtrTag>().executableAddress(),
+ vm.getCTIStub(throwExceptionFromCallSlowPathGenerator).retaggedCode<JSEntryPtrTag>().executableAddress(),
reinterpret_cast<void*>(KeepTheFrame));
}
SlowPathReturnType JIT_OPERATION operationLinkCall(ExecState* execCallee, CallLinkInfo* callLinkInfo)
{
ExecState* exec = execCallee->callerFrame();
- VM* vm = &exec->vm();
- auto throwScope = DECLARE_THROW_SCOPE(*vm);
+ VM& vm = exec->vm();
+ auto throwScope = DECLARE_THROW_SCOPE(vm);
CodeSpecializationKind kind = callLinkInfo->specializationKind();
NativeCallFrameTracer tracer(vm, exec);
@@ -1045,8 +1046,8 @@
JSValue calleeAsValue = execCallee->guaranteedJSValueCallee();
JSCell* calleeAsFunctionCell = getJSFunction(calleeAsValue);
if (!calleeAsFunctionCell) {
- if (auto* internalFunction = jsDynamicCast<InternalFunction*>(*vm, calleeAsValue)) {
- MacroAssemblerCodePtr<JSEntryPtrTag> codePtr = vm->getCTIInternalFunctionTrampolineFor(kind);
+ if (auto* internalFunction = jsDynamicCast<InternalFunction*>(vm, calleeAsValue)) {
+ MacroAssemblerCodePtr<JSEntryPtrTag> codePtr = vm.getCTIInternalFunctionTrampolineFor(kind);
RELEASE_ASSERT(!!codePtr);
if (!callLinkInfo->seenOnce())
@@ -1067,14 +1068,14 @@
MacroAssemblerCodePtr<JSEntryPtrTag> codePtr;
CodeBlock* codeBlock = nullptr;
if (executable->isHostFunction()) {
- codePtr = jsToWasmICCodePtr(*vm, kind, callee);
+ codePtr = jsToWasmICCodePtr(vm, kind, callee);
if (!codePtr)
codePtr = executable->entrypointFor(kind, MustCheckArity);
} else {
FunctionExecutable* functionExecutable = static_cast<FunctionExecutable*>(executable);
auto handleThrowException = [&] () {
- void* throwTarget = vm->getCTIStub(throwExceptionFromCallSlowPathGenerator).retaggedCode<JSEntryPtrTag>().executableAddress();
+ void* throwTarget = vm.getCTIStub(throwExceptionFromCallSlowPathGenerator).retaggedCode<JSEntryPtrTag>().executableAddress();
return encodeResult(throwTarget, reinterpret_cast<void*>(KeepTheFrame));
};
@@ -1084,7 +1085,7 @@
}
CodeBlock** codeBlockSlot = execCallee->addressOfCodeBlock();
- Exception* error = functionExecutable->prepareForExecution<FunctionExecutable>(*vm, callee, scope, kind, *codeBlockSlot);
+ Exception* error = functionExecutable->prepareForExecution<FunctionExecutable>(vm, callee, scope, kind, *codeBlockSlot);
EXCEPTION_ASSERT(throwScope.exception() == error);
if (UNLIKELY(error))
return handleThrowException();
@@ -1107,8 +1108,8 @@
void JIT_OPERATION operationLinkDirectCall(ExecState* exec, CallLinkInfo* callLinkInfo, JSFunction* callee)
{
- VM* vm = &exec->vm();
- auto throwScope = DECLARE_THROW_SCOPE(*vm);
+ VM& vm = exec->vm();
+ auto throwScope = DECLARE_THROW_SCOPE(vm);
CodeSpecializationKind kind = callLinkInfo->specializationKind();
NativeCallFrameTracer tracer(vm, exec);
@@ -1141,7 +1142,7 @@
RELEASE_ASSERT(isCall(kind) || functionExecutable->constructAbility() != ConstructAbility::CannotConstruct);
- Exception* error = functionExecutable->prepareForExecution<FunctionExecutable>(*vm, callee, scope, kind, codeBlock);
+ Exception* error = functionExecutable->prepareForExecution<FunctionExecutable>(vm, callee, scope, kind, codeBlock);
EXCEPTION_ASSERT_UNUSED(throwScope, throwScope.exception() == error);
if (UNLIKELY(error))
return;
@@ -1159,8 +1160,8 @@
ExecState* execCallee, CallLinkInfo* callLinkInfo, JSCell*& calleeAsFunctionCell)
{
ExecState* exec = execCallee->callerFrame();
- VM* vm = &exec->vm();
- auto throwScope = DECLARE_THROW_SCOPE(*vm);
+ VM& vm = exec->vm();
+ auto throwScope = DECLARE_THROW_SCOPE(vm);
CodeSpecializationKind kind = callLinkInfo->specializationKind();
NativeCallFrameTracer tracer(vm, exec);
@@ -1168,8 +1169,8 @@
JSValue calleeAsValue = execCallee->guaranteedJSValueCallee();
calleeAsFunctionCell = getJSFunction(calleeAsValue);
if (UNLIKELY(!calleeAsFunctionCell)) {
- if (jsDynamicCast<InternalFunction*>(*vm, calleeAsValue)) {
- MacroAssemblerCodePtr<JSEntryPtrTag> codePtr = vm->getCTIInternalFunctionTrampolineFor(kind);
+ if (jsDynamicCast<InternalFunction*>(vm, calleeAsValue)) {
+ MacroAssemblerCodePtr<JSEntryPtrTag> codePtr = vm.getCTIInternalFunctionTrampolineFor(kind);
ASSERT(!!codePtr);
return encodeResult(codePtr.executableAddress(), reinterpret_cast<void*>(callLinkInfo->callMode() == CallMode::Tail ? ReuseTheFrame : KeepTheFrame));
}
@@ -1185,16 +1186,16 @@
if (!isCall(kind) && functionExecutable->constructAbility() == ConstructAbility::CannotConstruct) {
throwException(exec, throwScope, createNotAConstructorError(exec, function));
return encodeResult(
- vm->getCTIStub(throwExceptionFromCallSlowPathGenerator).retaggedCode<JSEntryPtrTag>().executableAddress(),
+ vm.getCTIStub(throwExceptionFromCallSlowPathGenerator).retaggedCode<JSEntryPtrTag>().executableAddress(),
reinterpret_cast<void*>(KeepTheFrame));
}
CodeBlock** codeBlockSlot = execCallee->addressOfCodeBlock();
- Exception* error = functionExecutable->prepareForExecution<FunctionExecutable>(*vm, function, scope, kind, *codeBlockSlot);
+ Exception* error = functionExecutable->prepareForExecution<FunctionExecutable>(vm, function, scope, kind, *codeBlockSlot);
EXCEPTION_ASSERT(throwScope.exception() == error);
if (UNLIKELY(error)) {
return encodeResult(
- vm->getCTIStub(throwExceptionFromCallSlowPathGenerator).retaggedCode<JSEntryPtrTag>().executableAddress(),
+ vm.getCTIStub(throwExceptionFromCallSlowPathGenerator).retaggedCode<JSEntryPtrTag>().executableAddress(),
reinterpret_cast<void*>(KeepTheFrame));
}
}
@@ -1222,7 +1223,7 @@
size_t JIT_OPERATION operationCompareLess(ExecState* exec, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
return jsLess<true>(exec, JSValue::decode(encodedOp1), JSValue::decode(encodedOp2));
@@ -1230,7 +1231,7 @@
size_t JIT_OPERATION operationCompareLessEq(ExecState* exec, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
return jsLessEq<true>(exec, JSValue::decode(encodedOp1), JSValue::decode(encodedOp2));
@@ -1238,7 +1239,7 @@
size_t JIT_OPERATION operationCompareGreater(ExecState* exec, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
return jsLess<false>(exec, JSValue::decode(encodedOp2), JSValue::decode(encodedOp1));
@@ -1246,7 +1247,7 @@
size_t JIT_OPERATION operationCompareGreaterEq(ExecState* exec, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
return jsLessEq<false>(exec, JSValue::decode(encodedOp2), JSValue::decode(encodedOp1));
@@ -1254,7 +1255,7 @@
size_t JIT_OPERATION operationCompareEq(ExecState* exec, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
return JSValue::equalSlowCaseInline(exec, JSValue::decode(encodedOp1), JSValue::decode(encodedOp2));
@@ -1266,7 +1267,7 @@
size_t JIT_OPERATION operationCompareStringEq(ExecState* exec, JSCell* left, JSCell* right)
#endif
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
bool result = asString(left)->equal(exec, asString(right));
@@ -1279,7 +1280,7 @@
size_t JIT_OPERATION operationCompareStrictEq(ExecState* exec, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
JSValue src1 = JSValue::decode(encodedOp1);
@@ -1290,14 +1291,14 @@
EncodedJSValue JIT_OPERATION operationNewArrayWithProfile(ExecState* exec, ArrayAllocationProfile* profile, const JSValue* values, int size)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
return JSValue::encode(constructArrayNegativeIndexed(exec, profile, values, size));
}
EncodedJSValue JIT_OPERATION operationNewArrayWithSizeAndProfile(ExecState* exec, ArrayAllocationProfile* profile, EncodedJSValue size)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
JSValue sizeValue = JSValue::decode(size);
return JSValue::encode(constructArrayWithSizeQuirk(exec, profile, exec->lexicalGlobalObject(), sizeValue));
@@ -1310,7 +1311,7 @@
{
VM& vm = exec->vm();
ASSERT(functionExecutable->inherits<FunctionExecutable>(vm));
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
if (isInvalidated)
return JSValue::encode(FunctionType::createWithInvalidatedReallocationWatchpoint(vm, static_cast<FunctionExecutable*>(functionExecutable), scope));
return JSValue::encode(FunctionType::create(vm, static_cast<FunctionExecutable*>(functionExecutable), scope));
@@ -1360,7 +1361,7 @@
void JIT_OPERATION operationSetFunctionName(ExecState* exec, JSCell* funcCell, EncodedJSValue encodedName)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
JSFunction* func = jsCast<JSFunction*>(funcCell);
@@ -1370,7 +1371,7 @@
JSCell* JIT_OPERATION operationNewObject(ExecState* exec, Structure* structure)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
return constructEmptyObject(exec, structure);
@@ -1380,7 +1381,7 @@
{
SuperSamplerScope superSamplerScope(false);
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
RegExp* regexp = static_cast<RegExp*>(regexpPtr);
ASSERT(regexp->isValid());
@@ -1394,7 +1395,7 @@
UnusedPtr JIT_OPERATION operationHandleTraps(ExecState* exec)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
ASSERT(vm.needTrapHandling());
vm.handleTraps(exec);
return nullptr;
@@ -1403,7 +1404,7 @@
void JIT_OPERATION operationDebug(ExecState* exec, int32_t debugHookType)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
vm.interpreter->debug(exec, static_cast<DebugHookType>(debugHookType));
}
@@ -1418,7 +1419,7 @@
SlowPathReturnType JIT_OPERATION operationOptimize(ExecState* exec, uint32_t bytecodeIndex)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
// Defer GC for a while so that it doesn't run between when we enter into this
// slow path and when we figure out the state of our code block. This prevents
@@ -1663,7 +1664,7 @@
char* JIT_OPERATION operationTryOSREnterAtCatch(ExecState* exec, uint32_t bytecodeIndex)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
CodeBlock* optimizedReplacement = exec->codeBlock()->replacement();
if (UNLIKELY(!optimizedReplacement))
@@ -1684,7 +1685,7 @@
char* JIT_OPERATION operationTryOSREnterAtCatchAndValueProfile(ExecState* exec, uint32_t bytecodeIndex)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
CodeBlock* codeBlock = exec->codeBlock();
CodeBlock* optimizedReplacement = codeBlock->replacement();
@@ -1716,7 +1717,7 @@
void JIT_OPERATION operationPutByIndex(ExecState* exec, EncodedJSValue encodedArrayValue, int32_t index, EncodedJSValue encodedValue)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
JSValue arrayValue = JSValue::decode(encodedArrayValue);
ASSERT(isJSArray(arrayValue));
@@ -1745,7 +1746,7 @@
void JIT_OPERATION operationPutGetterById(ExecState* exec, JSCell* object, UniquedStringImpl* uid, int32_t options, JSCell* getter)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
ASSERT(object && object->isObject());
JSObject* baseObj = object->getObject();
@@ -1757,7 +1758,7 @@
void JIT_OPERATION operationPutSetterById(ExecState* exec, JSCell* object, UniquedStringImpl* uid, int32_t options, JSCell* setter)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
ASSERT(object && object->isObject());
JSObject* baseObj = object->getObject();
@@ -1769,7 +1770,7 @@
void JIT_OPERATION operationPutGetterByVal(ExecState* exec, JSCell* base, EncodedJSValue encodedSubscript, int32_t attribute, JSCell* getter)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
putAccessorByVal(exec, asObject(base), JSValue::decode(encodedSubscript), attribute, asObject(getter), AccessorType::Getter);
}
@@ -1777,7 +1778,7 @@
void JIT_OPERATION operationPutSetterByVal(ExecState* exec, JSCell* base, EncodedJSValue encodedSubscript, int32_t attribute, JSCell* setter)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
putAccessorByVal(exec, asObject(base), JSValue::decode(encodedSubscript), attribute, asObject(setter), AccessorType::Setter);
}
@@ -1786,7 +1787,7 @@
void JIT_OPERATION operationPutGetterSetter(ExecState* exec, JSCell* object, UniquedStringImpl* uid, int32_t attribute, EncodedJSValue encodedGetterValue, EncodedJSValue encodedSetterValue)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
ASSERT(object && object->isObject());
JSObject* baseObject = asObject(object);
@@ -1802,7 +1803,7 @@
void JIT_OPERATION operationPutGetterSetter(ExecState* exec, JSCell* object, UniquedStringImpl* uid, int32_t attribute, JSCell* getterCell, JSCell* setterCell)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
ASSERT(object && object->isObject());
JSObject* baseObject = asObject(object);
@@ -1818,7 +1819,7 @@
void JIT_OPERATION operationPopScope(ExecState* exec, int32_t scopeReg)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
JSScope* scope = exec->uncheckedR(scopeReg).Register::scope();
exec->uncheckedR(scopeReg) = scope->next();
@@ -1827,7 +1828,7 @@
int32_t JIT_OPERATION operationInstanceOfCustom(ExecState* exec, EncodedJSValue encodedValue, JSObject* constructor, EncodedJSValue encodedHasInstance)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
JSValue value = JSValue::decode(encodedValue);
JSValue hasInstanceValue = JSValue::decode(encodedHasInstance);
@@ -1934,7 +1935,7 @@
ConcurrentJSLocker locker(codeBlock->m_lock);
byValInfo->arrayProfile->computeUpdatedPrediction(locker, codeBlock, structure);
- JIT::compileGetByVal(locker, &vm, codeBlock, byValInfo, returnAddress, arrayMode);
+ JIT::compileGetByVal(locker, vm, codeBlock, byValInfo, returnAddress, arrayMode);
optimizationResult = OptimizationResult::Optimized;
}
}
@@ -1952,7 +1953,7 @@
ASSERT(!byValInfo->stubRoutine);
if (byValInfo->seen) {
if (byValInfo->cachedId == propertyName) {
- JIT::compileGetByValWithCachedId(&vm, exec->codeBlock(), byValInfo, returnAddress, propertyName);
+ JIT::compileGetByValWithCachedId(vm, exec->codeBlock(), byValInfo, returnAddress, propertyName);
optimizationResult = OptimizationResult::Optimized;
} else {
// Seem like a generic property access site.
@@ -1988,7 +1989,7 @@
EncodedJSValue JIT_OPERATION operationGetByValGeneric(ExecState* exec, EncodedJSValue encodedBase, EncodedJSValue encodedSubscript, ByValInfo* byValInfo)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
JSValue baseValue = JSValue::decode(encodedBase);
JSValue subscript = JSValue::decode(encodedSubscript);
@@ -1999,7 +2000,7 @@
EncodedJSValue JIT_OPERATION operationGetByValOptimize(ExecState* exec, EncodedJSValue encodedBase, EncodedJSValue encodedSubscript, ByValInfo* byValInfo)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue baseValue = JSValue::decode(encodedBase);
@@ -2019,7 +2020,7 @@
EncodedJSValue JIT_OPERATION operationHasIndexedPropertyDefault(ExecState* exec, EncodedJSValue encodedBase, EncodedJSValue encodedSubscript, ByValInfo* byValInfo)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
JSValue baseValue = JSValue::decode(encodedBase);
JSValue subscript = JSValue::decode(encodedSubscript);
@@ -2036,7 +2037,7 @@
// Attempt to optimize.
JITArrayMode arrayMode = jitArrayModeForStructure(object->structure(vm));
if (arrayMode != byValInfo->arrayMode) {
- JIT::compileHasIndexedProperty(&vm, exec->codeBlock(), byValInfo, ReturnAddressPtr(OUR_RETURN_ADDRESS), arrayMode);
+ JIT::compileHasIndexedProperty(vm, exec->codeBlock(), byValInfo, ReturnAddressPtr(OUR_RETURN_ADDRESS), arrayMode);
didOptimize = true;
}
}
@@ -2066,7 +2067,7 @@
EncodedJSValue JIT_OPERATION operationHasIndexedPropertyGeneric(ExecState* exec, EncodedJSValue encodedBase, EncodedJSValue encodedSubscript, ByValInfo* byValInfo)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
JSValue baseValue = JSValue::decode(encodedBase);
JSValue subscript = JSValue::decode(encodedSubscript);
@@ -2086,7 +2087,7 @@
EncodedJSValue JIT_OPERATION operationGetByValString(ExecState* exec, EncodedJSValue encodedBase, EncodedJSValue encodedSubscript, ByValInfo* byValInfo)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue baseValue = JSValue::decode(encodedBase);
JSValue subscript = JSValue::decode(encodedSubscript);
@@ -2124,14 +2125,14 @@
size_t JIT_OPERATION operationDeleteById(ExecState* exec, EncodedJSValue encodedBase, UniquedStringImpl* uid)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
JSObject* baseObj = JSValue::decode(encodedBase).toObject(exec);
RETURN_IF_EXCEPTION(scope, false);
if (!baseObj)
return false;
- bool couldDelete = baseObj->methodTable(vm)->deleteProperty(baseObj, exec, Identifier::fromUid(&vm, uid));
+ bool couldDelete = baseObj->methodTable(vm)->deleteProperty(baseObj, exec, Identifier::fromUid(vm, uid));
RETURN_IF_EXCEPTION(scope, false);
if (!couldDelete && exec->codeBlock()->isStrictMode())
throwTypeError(exec, scope, UnableToDeletePropertyError);
@@ -2146,7 +2147,7 @@
size_t JIT_OPERATION operationDeleteByVal(ExecState* exec, EncodedJSValue encodedBase, EncodedJSValue encodedKey)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
JSObject* baseObj = JSValue::decode(encodedBase).toObject(exec);
@@ -2173,7 +2174,7 @@
JSCell* JIT_OPERATION operationPushWithScope(ExecState* exec, JSCell* currentScopeCell, EncodedJSValue objectValue)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
JSObject* object = JSValue::decode(objectValue).toObject(exec);
@@ -2187,7 +2188,7 @@
JSCell* JIT_OPERATION operationPushWithScopeObject(ExecState* exec, JSCell* currentScopeCell, JSObject* object)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
JSScope* currentScope = jsCast<JSScope*>(currentScopeCell);
return JSWithScope::create(vm, exec->lexicalGlobalObject(), currentScope, object);
}
@@ -2195,7 +2196,7 @@
EncodedJSValue JIT_OPERATION operationInstanceOf(ExecState* exec, EncodedJSValue encodedValue, EncodedJSValue encodedProto)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
JSValue value = JSValue::decode(encodedValue);
JSValue proto = JSValue::decode(encodedProto);
@@ -2206,7 +2207,7 @@
EncodedJSValue JIT_OPERATION operationInstanceOfGeneric(ExecState* exec, StructureStubInfo* stubInfo, EncodedJSValue encodedValue, EncodedJSValue encodedProto)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
JSValue value = JSValue::decode(encodedValue);
JSValue proto = JSValue::decode(encodedProto);
@@ -2219,7 +2220,7 @@
EncodedJSValue JIT_OPERATION operationInstanceOfOptimize(ExecState* exec, StructureStubInfo* stubInfo, EncodedJSValue encodedValue, EncodedJSValue encodedProto)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue value = JSValue::decode(encodedValue);
JSValue proto = JSValue::decode(encodedProto);
@@ -2236,14 +2237,14 @@
int32_t JIT_OPERATION operationSizeFrameForForwardArguments(ExecState* exec, EncodedJSValue, int32_t numUsedStackSlots, int32_t)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return sizeFrameForForwardArguments(exec, vm, numUsedStackSlots);
}
int32_t JIT_OPERATION operationSizeFrameForVarargs(ExecState* exec, EncodedJSValue encodedArguments, int32_t numUsedStackSlots, int32_t firstVarArgOffset)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
JSValue arguments = JSValue::decode(encodedArguments);
return sizeFrameForVarargs(exec, vm, arguments, numUsedStackSlots, firstVarArgOffset);
}
@@ -2251,7 +2252,7 @@
CallFrame* JIT_OPERATION operationSetupForwardArgumentsFrame(ExecState* exec, CallFrame* newCallFrame, EncodedJSValue, int32_t, int32_t length)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
setupForwardArgumentsFrame(exec, newCallFrame, length);
return newCallFrame;
}
@@ -2259,7 +2260,7 @@
CallFrame* JIT_OPERATION operationSetupVarargsFrame(ExecState* exec, CallFrame* newCallFrame, EncodedJSValue encodedArguments, int32_t firstVarArgOffset, int32_t length)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
JSValue arguments = JSValue::decode(encodedArguments);
setupVarargsFrame(exec, newCallFrame, arguments, firstVarArgOffset, length);
return newCallFrame;
@@ -2268,7 +2269,7 @@
char* JIT_OPERATION operationSwitchCharWithUnknownKeyType(ExecState* exec, EncodedJSValue encodedKey, size_t tableIndex)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
JSValue key = JSValue::decode(encodedKey);
CodeBlock* codeBlock = exec->codeBlock();
@@ -2288,7 +2289,7 @@
char* JIT_OPERATION operationSwitchImmWithUnknownKeyType(ExecState* exec, EncodedJSValue encodedKey, size_t tableIndex)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
JSValue key = JSValue::decode(encodedKey);
CodeBlock* codeBlock = exec->codeBlock();
@@ -2307,7 +2308,7 @@
char* JIT_OPERATION operationSwitchStringWithUnknownKeyType(ExecState* exec, EncodedJSValue encodedKey, size_t tableIndex)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
JSValue key = JSValue::decode(encodedKey);
CodeBlock* codeBlock = exec->codeBlock();
auto throwScope = DECLARE_THROW_SCOPE(vm);
@@ -2331,7 +2332,7 @@
EncodedJSValue JIT_OPERATION operationGetFromScope(ExecState* exec, const Instruction* pc)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto throwScope = DECLARE_THROW_SCOPE(vm);
CodeBlock* codeBlock = exec->codeBlock();
@@ -2372,7 +2373,7 @@
void JIT_OPERATION operationPutToScope(ExecState* exec, const Instruction* pc)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto throwScope = DECLARE_THROW_SCOPE(vm);
CodeBlock* codeBlock = exec->codeBlock();
@@ -2424,9 +2425,9 @@
void JIT_OPERATION operationThrow(ExecState* exec, EncodedJSValue encodedExceptionValue)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
- auto scope = DECLARE_THROW_SCOPE(*vm);
+ auto scope = DECLARE_THROW_SCOPE(vm);
JSValue exceptionValue = JSValue::decode(encodedExceptionValue);
throwException(exec, scope, exceptionValue);
@@ -2438,7 +2439,7 @@
char* JIT_OPERATION operationReallocateButterflyToHavePropertyStorageWithInitialCapacity(ExecState* exec, JSObject* object)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
ASSERT(!object->structure(vm)->outOfLineCapacity());
Butterfly* result = object->allocateMoreOutOfLineStorage(vm, 0, initialOutOfLineCapacity);
@@ -2449,7 +2450,7 @@
char* JIT_OPERATION operationReallocateButterflyToGrowPropertyStorage(ExecState* exec, JSObject* object, size_t newSize)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
Butterfly* result = object->allocateMoreOutOfLineStorage(vm, object->structure(vm)->outOfLineCapacity(), newSize);
object->nukeStructureAndSetButterfly(vm, object->structureID(), result);
@@ -2458,23 +2459,24 @@
void JIT_OPERATION operationOSRWriteBarrier(ExecState* exec, JSCell* cell)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
- vm->heap.writeBarrier(cell);
+ vm.heap.writeBarrier(cell);
}
void JIT_OPERATION operationWriteBarrierSlowPath(ExecState* exec, JSCell* cell)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
- vm->heap.writeBarrierSlowPath(cell);
+ vm.heap.writeBarrierSlowPath(cell);
}
-void JIT_OPERATION lookupExceptionHandler(VM* vm, ExecState* exec)
+void JIT_OPERATION lookupExceptionHandler(VM* vmPointer, ExecState* exec)
{
+ VM& vm = *vmPointer;
NativeCallFrameTracer tracer(vm, exec);
genericUnwind(vm, exec);
- ASSERT(vm->targetMachinePCForThrow);
+ ASSERT(vm.targetMachinePCForThrow);
}
void JIT_OPERATION lookupExceptionHandlerFromCallerFrame(VM* vm, ExecState* exec)
@@ -2486,7 +2488,7 @@
void JIT_OPERATION operationVMHandleException(ExecState* exec)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
genericUnwind(vm, exec);
}
@@ -2498,9 +2500,9 @@
// testing.
void JIT_OPERATION operationExceptionFuzz(ExecState* exec)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
- auto scope = DECLARE_THROW_SCOPE(*vm);
+ auto scope = DECLARE_THROW_SCOPE(vm);
UNUSED_PARAM(scope);
#if COMPILER(GCC_COMPATIBLE)
void* returnPC = __builtin_return_address(0);
@@ -2510,7 +2512,7 @@
ALWAYS_INLINE static EncodedJSValue unprofiledAdd(ExecState* exec, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
JSValue op1 = JSValue::decode(encodedOp1);
@@ -2521,7 +2523,7 @@
ALWAYS_INLINE static EncodedJSValue profiledAdd(ExecState* exec, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2, ArithProfile& arithProfile)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
JSValue op1 = JSValue::decode(encodedOp1);
@@ -2547,7 +2549,7 @@
EncodedJSValue JIT_OPERATION operationValueAddProfiledOptimize(ExecState* exec, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2, JITAddIC* addIC)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
JSValue op1 = JSValue::decode(encodedOp1);
@@ -2571,7 +2573,7 @@
EncodedJSValue JIT_OPERATION operationValueAddProfiledNoOptimize(ExecState* exec, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2, JITAddIC* addIC)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
ArithProfile* arithProfile = addIC->arithProfile();
@@ -2581,7 +2583,7 @@
EncodedJSValue JIT_OPERATION operationValueAddOptimize(ExecState* exec, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2, JITAddIC* addIC)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
JSValue op1 = JSValue::decode(encodedOp1);
@@ -2601,7 +2603,7 @@
EncodedJSValue JIT_OPERATION operationValueAddNoOptimize(ExecState* exec, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2, JITAddIC*)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
JSValue op1 = JSValue::decode(encodedOp1);
@@ -2638,7 +2640,7 @@
EncodedJSValue JIT_OPERATION operationValueMul(ExecState* exec, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
return unprofiledMul(exec, encodedOp1, encodedOp2);
@@ -2646,7 +2648,7 @@
EncodedJSValue JIT_OPERATION operationValueMulNoOptimize(ExecState* exec, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2, JITMulIC*)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
return unprofiledMul(exec, encodedOp1, encodedOp2);
@@ -2654,7 +2656,7 @@
EncodedJSValue JIT_OPERATION operationValueMulOptimize(ExecState* exec, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2, JITMulIC* mulIC)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
auto nonOptimizeVariant = operationValueMulNoOptimize;
@@ -2671,7 +2673,7 @@
EncodedJSValue JIT_OPERATION operationValueMulProfiled(ExecState* exec, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2, ArithProfile* arithProfile)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
ASSERT(arithProfile);
@@ -2680,7 +2682,7 @@
EncodedJSValue JIT_OPERATION operationValueMulProfiledOptimize(ExecState* exec, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2, JITMulIC* mulIC)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
ArithProfile* arithProfile = mulIC->arithProfile();
@@ -2698,7 +2700,7 @@
EncodedJSValue JIT_OPERATION operationValueMulProfiledNoOptimize(ExecState* exec, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2, JITMulIC* mulIC)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
ArithProfile* arithProfile = mulIC->arithProfile();
@@ -2710,7 +2712,7 @@
{
VM& vm = exec->vm();
auto scope = DECLARE_THROW_SCOPE(vm);
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
JSValue operand = JSValue::decode(encodedOperand);
@@ -2729,7 +2731,7 @@
{
VM& vm = exec->vm();
auto scope = DECLARE_THROW_SCOPE(vm);
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
JSValue operand = JSValue::decode(encodedOperand);
arithProfile.observeLHS(operand);
@@ -2766,7 +2768,7 @@
{
VM& vm = exec->vm();
auto scope = DECLARE_THROW_SCOPE(vm);
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
JSValue operand = JSValue::decode(encodedOperand);
@@ -2799,7 +2801,7 @@
{
VM& vm = exec->vm();
auto scope = DECLARE_THROW_SCOPE(vm);
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
JSValue operand = JSValue::decode(encodedOperand);
@@ -2848,7 +2850,7 @@
EncodedJSValue JIT_OPERATION operationValueSub(ExecState* exec, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
return unprofiledSub(exec, encodedOp1, encodedOp2);
}
@@ -2857,15 +2859,15 @@
{
ASSERT(arithProfile);
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
- return profiledSub(*vm, exec, encodedOp1, encodedOp2, *arithProfile);
+ return profiledSub(vm, exec, encodedOp1, encodedOp2, *arithProfile);
}
EncodedJSValue JIT_OPERATION operationValueSubOptimize(ExecState* exec, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2, JITSubIC* subIC)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
auto nonOptimizeVariant = operationValueSubNoOptimize;
@@ -2882,7 +2884,7 @@
EncodedJSValue JIT_OPERATION operationValueSubNoOptimize(ExecState* exec, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2, JITSubIC*)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
return unprofiledSub(exec, encodedOp1, encodedOp2);
@@ -2890,7 +2892,7 @@
EncodedJSValue JIT_OPERATION operationValueSubProfiledOptimize(ExecState* exec, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2, JITSubIC* subIC)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
ArithProfile* arithProfile = subIC->arithProfile();
@@ -2903,30 +2905,30 @@
exec->codeBlock()->dumpMathICStats();
#endif
- return profiledSub(*vm, exec, encodedOp1, encodedOp2, *arithProfile, false);
+ return profiledSub(vm, exec, encodedOp1, encodedOp2, *arithProfile, false);
}
EncodedJSValue JIT_OPERATION operationValueSubProfiledNoOptimize(ExecState* exec, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2, JITSubIC* subIC)
{
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
ArithProfile* arithProfile = subIC->arithProfile();
ASSERT(arithProfile);
- return profiledSub(*vm, exec, encodedOp1, encodedOp2, *arithProfile);
+ return profiledSub(vm, exec, encodedOp1, encodedOp2, *arithProfile);
}
void JIT_OPERATION operationProcessTypeProfilerLog(ExecState* exec)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
vm.typeProfilerLog()->processLogEntries(vm, "Log Full, called from inside baseline JIT"_s);
}
void JIT_OPERATION operationProcessShadowChickenLog(ExecState* exec)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
RELEASE_ASSERT(vm.shadowChicken());
vm.shadowChicken()->update(vm, exec);
}
@@ -2934,12 +2936,12 @@
int32_t JIT_OPERATION operationCheckIfExceptionIsUncatchableAndNotifyProfiler(ExecState* exec)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
RELEASE_ASSERT(!!scope.exception());
if (isTerminatedExecutionException(vm, scope.exception())) {
- genericUnwind(&vm, exec);
+ genericUnwind(vm, exec);
return 1;
}
return 0;
diff --git a/Source/JavaScriptCore/jit/JITPropertyAccess.cpp b/Source/JavaScriptCore/jit/JITPropertyAccess.cpp
index cbb78d5..54e4ac7 100644
--- a/Source/JavaScriptCore/jit/JITPropertyAccess.cpp
+++ b/Source/JavaScriptCore/jit/JITPropertyAccess.cpp
@@ -1212,7 +1212,7 @@
if (mode == ShouldFilterBaseAndValue || mode == ShouldFilterBase)
ownerNotCell = branchIfNotCell(regT0);
- Jump ownerIsRememberedOrInEden = barrierBranch(*vm(), regT0, regT1);
+ Jump ownerIsRememberedOrInEden = barrierBranch(vm(), regT0, regT1);
callOperation(operationWriteBarrierSlowPath, regT0);
ownerIsRememberedOrInEden.link(this);
@@ -1250,7 +1250,7 @@
if (mode == ShouldFilterBase || mode == ShouldFilterBaseAndValue)
ownerNotCell = branchIfNotCell(regT0);
- Jump ownerIsRememberedOrInEden = barrierBranch(*vm(), regT1, regT2);
+ Jump ownerIsRememberedOrInEden = barrierBranch(vm(), regT1, regT2);
callOperation(operationWriteBarrierSlowPath, regT1);
ownerIsRememberedOrInEden.link(this);
@@ -1278,7 +1278,7 @@
void JIT::emitWriteBarrier(JSCell* owner)
{
- Jump ownerIsRememberedOrInEden = barrierBranch(*vm(), owner, regT0);
+ Jump ownerIsRememberedOrInEden = barrierBranch(vm(), owner, regT0);
callOperation(operationWriteBarrierSlowPath, owner);
ownerIsRememberedOrInEden.link(this);
}
diff --git a/Source/JavaScriptCore/jit/JITThunks.cpp b/Source/JavaScriptCore/jit/JITThunks.cpp
index 5bdf830..7fb9884 100644
--- a/Source/JavaScriptCore/jit/JITThunks.cpp
+++ b/Source/JavaScriptCore/jit/JITThunks.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-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
@@ -45,43 +45,43 @@
{
}
-MacroAssemblerCodePtr<JITThunkPtrTag> JITThunks::ctiNativeCall(VM* vm)
+MacroAssemblerCodePtr<JITThunkPtrTag> JITThunks::ctiNativeCall(VM& vm)
{
ASSERT(VM::canUseJIT());
return ctiStub(vm, nativeCallGenerator).code();
}
-MacroAssemblerCodePtr<JITThunkPtrTag> JITThunks::ctiNativeConstruct(VM* vm)
+MacroAssemblerCodePtr<JITThunkPtrTag> JITThunks::ctiNativeConstruct(VM& vm)
{
ASSERT(VM::canUseJIT());
return ctiStub(vm, nativeConstructGenerator).code();
}
-MacroAssemblerCodePtr<JITThunkPtrTag> JITThunks::ctiNativeTailCall(VM* vm)
+MacroAssemblerCodePtr<JITThunkPtrTag> JITThunks::ctiNativeTailCall(VM& vm)
{
ASSERT(VM::canUseJIT());
return ctiStub(vm, nativeTailCallGenerator).code();
}
-MacroAssemblerCodePtr<JITThunkPtrTag> JITThunks::ctiNativeTailCallWithoutSavedTags(VM* vm)
+MacroAssemblerCodePtr<JITThunkPtrTag> JITThunks::ctiNativeTailCallWithoutSavedTags(VM& vm)
{
ASSERT(VM::canUseJIT());
return ctiStub(vm, nativeTailCallWithoutSavedTagsGenerator).code();
}
-MacroAssemblerCodePtr<JITThunkPtrTag> JITThunks::ctiInternalFunctionCall(VM* vm)
+MacroAssemblerCodePtr<JITThunkPtrTag> JITThunks::ctiInternalFunctionCall(VM& vm)
{
ASSERT(VM::canUseJIT());
return ctiStub(vm, internalFunctionCallGenerator).code();
}
-MacroAssemblerCodePtr<JITThunkPtrTag> JITThunks::ctiInternalFunctionConstruct(VM* vm)
+MacroAssemblerCodePtr<JITThunkPtrTag> JITThunks::ctiInternalFunctionConstruct(VM& vm)
{
ASSERT(VM::canUseJIT());
return ctiStub(vm, internalFunctionConstructGenerator).code();
}
-MacroAssemblerCodeRef<JITThunkPtrTag> JITThunks::ctiStub(VM* vm, ThunkGenerator generator)
+MacroAssemblerCodeRef<JITThunkPtrTag> JITThunks::ctiStub(VM& vm, ThunkGenerator generator)
{
LockHolder locker(m_lock);
CTIStubMap::AddResult entry = m_ctiStubMap.add(generator, MacroAssemblerCodeRef<JITThunkPtrTag>());
@@ -108,12 +108,12 @@
weakRemove(*m_hostFunctionStubMap, std::make_tuple(nativeExecutable->function(), nativeExecutable->constructor(), nativeExecutable->name()), nativeExecutable);
}
-NativeExecutable* JITThunks::hostFunctionStub(VM* vm, TaggedNativeFunction function, TaggedNativeFunction constructor, const String& name)
+NativeExecutable* JITThunks::hostFunctionStub(VM& vm, TaggedNativeFunction function, TaggedNativeFunction constructor, const String& name)
{
return hostFunctionStub(vm, function, constructor, nullptr, NoIntrinsic, nullptr, name);
}
-NativeExecutable* JITThunks::hostFunctionStub(VM* vm, TaggedNativeFunction function, TaggedNativeFunction constructor, ThunkGenerator generator, Intrinsic intrinsic, const DOMJIT::Signature* signature, const String& name)
+NativeExecutable* JITThunks::hostFunctionStub(VM& vm, TaggedNativeFunction function, TaggedNativeFunction constructor, ThunkGenerator generator, Intrinsic intrinsic, const DOMJIT::Signature* signature, const String& name)
{
ASSERT(!isCompilationThread());
ASSERT(VM::canUseJIT());
@@ -132,12 +132,12 @@
Ref<JITCode> forConstruct = adoptRef(*new NativeJITCode(MacroAssemblerCodeRef<JSEntryPtrTag>::createSelfManagedCodeRef(ctiNativeConstruct(vm).retagged<JSEntryPtrTag>()), JITType::HostCallThunk, NoIntrinsic));
- NativeExecutable* nativeExecutable = NativeExecutable::create(*vm, forCall.releaseNonNull(), function, WTFMove(forConstruct), constructor, name);
+ NativeExecutable* nativeExecutable = NativeExecutable::create(vm, forCall.releaseNonNull(), function, WTFMove(forConstruct), constructor, name);
weakAdd(*m_hostFunctionStubMap, std::make_tuple(function, constructor, name), Weak<NativeExecutable>(nativeExecutable, this));
return nativeExecutable;
}
-NativeExecutable* JITThunks::hostFunctionStub(VM* vm, TaggedNativeFunction function, ThunkGenerator generator, Intrinsic intrinsic, const String& name)
+NativeExecutable* JITThunks::hostFunctionStub(VM& vm, TaggedNativeFunction function, ThunkGenerator generator, Intrinsic intrinsic, const String& name)
{
return hostFunctionStub(vm, function, callHostFunctionAsConstructor, generator, intrinsic, nullptr, name);
}
diff --git a/Source/JavaScriptCore/jit/JITThunks.h b/Source/JavaScriptCore/jit/JITThunks.h
index bd72208..e9ab529 100644
--- a/Source/JavaScriptCore/jit/JITThunks.h
+++ b/Source/JavaScriptCore/jit/JITThunks.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-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
@@ -51,19 +51,19 @@
JITThunks();
virtual ~JITThunks();
- MacroAssemblerCodePtr<JITThunkPtrTag> ctiNativeCall(VM*);
- MacroAssemblerCodePtr<JITThunkPtrTag> ctiNativeConstruct(VM*);
- MacroAssemblerCodePtr<JITThunkPtrTag> ctiNativeTailCall(VM*);
- MacroAssemblerCodePtr<JITThunkPtrTag> ctiNativeTailCallWithoutSavedTags(VM*);
- MacroAssemblerCodePtr<JITThunkPtrTag> ctiInternalFunctionCall(VM*);
- MacroAssemblerCodePtr<JITThunkPtrTag> ctiInternalFunctionConstruct(VM*);
+ MacroAssemblerCodePtr<JITThunkPtrTag> ctiNativeCall(VM&);
+ MacroAssemblerCodePtr<JITThunkPtrTag> ctiNativeConstruct(VM&);
+ MacroAssemblerCodePtr<JITThunkPtrTag> ctiNativeTailCall(VM&);
+ MacroAssemblerCodePtr<JITThunkPtrTag> ctiNativeTailCallWithoutSavedTags(VM&);
+ MacroAssemblerCodePtr<JITThunkPtrTag> ctiInternalFunctionCall(VM&);
+ MacroAssemblerCodePtr<JITThunkPtrTag> ctiInternalFunctionConstruct(VM&);
- MacroAssemblerCodeRef<JITThunkPtrTag> ctiStub(VM*, ThunkGenerator);
+ MacroAssemblerCodeRef<JITThunkPtrTag> ctiStub(VM&, ThunkGenerator);
MacroAssemblerCodeRef<JITThunkPtrTag> existingCTIStub(ThunkGenerator);
- NativeExecutable* hostFunctionStub(VM*, TaggedNativeFunction, TaggedNativeFunction constructor, const String& name);
- NativeExecutable* hostFunctionStub(VM*, TaggedNativeFunction, TaggedNativeFunction constructor, ThunkGenerator, Intrinsic, const DOMJIT::Signature*, const String& name);
- NativeExecutable* hostFunctionStub(VM*, TaggedNativeFunction, ThunkGenerator, Intrinsic, const String& name);
+ NativeExecutable* hostFunctionStub(VM&, TaggedNativeFunction, TaggedNativeFunction constructor, const String& name);
+ NativeExecutable* hostFunctionStub(VM&, TaggedNativeFunction, TaggedNativeFunction constructor, ThunkGenerator, Intrinsic, const DOMJIT::Signature*, const String& name);
+ NativeExecutable* hostFunctionStub(VM&, TaggedNativeFunction, ThunkGenerator, Intrinsic, const String& name);
void clearHostFunctionStubs();
diff --git a/Source/JavaScriptCore/jit/JITWorklist.cpp b/Source/JavaScriptCore/jit/JITWorklist.cpp
index b6b04b1..e9b472a 100644
--- a/Source/JavaScriptCore/jit/JITWorklist.cpp
+++ b/Source/JavaScriptCore/jit/JITWorklist.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-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
@@ -75,7 +75,7 @@
}
CodeBlock* codeBlock() { return m_codeBlock; }
- VM* vm() { return m_codeBlock->vm(); }
+ VM& vm() { return m_codeBlock->vm(); }
bool isFinishedCompiling()
{
@@ -179,7 +179,7 @@
bool didFindUnfinishedPlan = false;
m_plans.removeAllMatching(
[&] (RefPtr<Plan>& plan) {
- if (plan->vm() != &vm)
+ if (&plan->vm() != &vm)
return false;
if (!plan->isFinishedCompiling()) {
didFindUnfinishedPlan = true;
@@ -216,7 +216,7 @@
LockHolder locker(*m_lock);
m_plans.removeAllMatching(
[&] (RefPtr<Plan>& plan) {
- if (plan->vm() != &vm)
+ if (&plan->vm() != &vm)
return false;
if (!plan->isFinishedCompiling())
return false;
@@ -230,7 +230,7 @@
void JITWorklist::compileLater(CodeBlock* codeBlock, unsigned loopOSREntryBytecodeOffset)
{
- DeferGC deferGC(codeBlock->vm()->heap);
+ DeferGC deferGC(codeBlock->vm().heap);
RELEASE_ASSERT(codeBlock->jitType() == JITType::InterpreterThunk);
if (codeBlock->m_didFailJITCompilation) {
@@ -282,8 +282,8 @@
void JITWorklist::compileNow(CodeBlock* codeBlock, unsigned loopOSREntryBytecodeOffset)
{
- VM* vm = codeBlock->vm();
- DeferGC deferGC(vm->heap);
+ VM& vm = codeBlock->vm();
+ DeferGC deferGC(vm.heap);
if (codeBlock->jitType() != JITType::InterpreterThunk)
return;
@@ -296,7 +296,7 @@
if (isPlanned) {
RELEASE_ASSERT(Options::useConcurrentJIT());
// This is expensive, but probably good enough.
- completeAllForVM(*vm);
+ completeAllForVM(vm);
}
// Now it might be compiled!
diff --git a/Source/JavaScriptCore/jit/Repatch.cpp b/Source/JavaScriptCore/jit/Repatch.cpp
index 8f9a864..a5175ca 100644
--- a/Source/JavaScriptCore/jit/Repatch.cpp
+++ b/Source/JavaScriptCore/jit/Repatch.cpp
@@ -77,7 +77,7 @@
#if ENABLE(FTL_JIT)
if (codeBlock->jitType() == JITType::FTLJIT) {
MacroAssemblerCodePtr<JITThunkPtrTag> thunk = MacroAssemblerCodePtr<OperationPtrTag>::createFromExecutableAddress(target.executableAddress()).retagged<JITThunkPtrTag>();
- return codeBlock->vm()->ftlThunks->keyForSlowPathCallThunk(thunk).callTarget().retagged<CFunctionPtrTag>();
+ return codeBlock->vm().ftlThunks->keyForSlowPathCallThunk(thunk).callTarget().retagged<CFunctionPtrTag>();
}
#else
UNUSED_PARAM(codeBlock);
@@ -89,7 +89,7 @@
{
#if ENABLE(FTL_JIT)
if (codeBlock->jitType() == JITType::FTLJIT) {
- VM& vm = *codeBlock->vm();
+ VM& vm = codeBlock->vm();
FTL::Thunks& thunks = *vm.ftlThunks;
FunctionPtr<OperationPtrTag> target = MacroAssembler::readCallTarget<OperationPtrTag>(call);
auto slowPathThunk = MacroAssemblerCodePtr<JITThunkPtrTag>::createFromExecutableAddress(target.retaggedExecutableAddress<JITThunkPtrTag>());
@@ -799,21 +799,21 @@
ftlThunkAwareRepatchCall(exec->codeBlock(), stubInfo.slowPathCallLocation(), operationInstanceOfGeneric);
}
-static void linkSlowFor(VM*, CallLinkInfo& callLinkInfo, MacroAssemblerCodeRef<JITStubRoutinePtrTag> codeRef)
+static void linkSlowFor(VM&, CallLinkInfo& callLinkInfo, MacroAssemblerCodeRef<JITStubRoutinePtrTag> codeRef)
{
MacroAssembler::repatchNearCall(callLinkInfo.callReturnLocation(), CodeLocationLabel<JITStubRoutinePtrTag>(codeRef.code()));
}
-static void linkSlowFor(VM* vm, CallLinkInfo& callLinkInfo, ThunkGenerator generator)
+static void linkSlowFor(VM& vm, CallLinkInfo& callLinkInfo, ThunkGenerator generator)
{
- linkSlowFor(vm, callLinkInfo, vm->getCTIStub(generator).retagged<JITStubRoutinePtrTag>());
+ linkSlowFor(vm, callLinkInfo, vm.getCTIStub(generator).retagged<JITStubRoutinePtrTag>());
}
-static void linkSlowFor(VM* vm, CallLinkInfo& callLinkInfo)
+static void linkSlowFor(VM& vm, CallLinkInfo& callLinkInfo)
{
MacroAssemblerCodeRef<JITStubRoutinePtrTag> virtualThunk = virtualThunkFor(vm, callLinkInfo);
linkSlowFor(vm, callLinkInfo, virtualThunk);
- callLinkInfo.setSlowStub(createJITStubRoutine(virtualThunk, *vm, nullptr, true));
+ callLinkInfo.setSlowStub(createJITStubRoutine(virtualThunk, vm, nullptr, true));
}
static JSCell* webAssemblyOwner(JSCell* callee)
@@ -859,11 +859,11 @@
calleeCodeBlock->linkIncomingCall(callerFrame, &callLinkInfo);
if (callLinkInfo.specializationKind() == CodeForCall && callLinkInfo.allowStubs()) {
- linkSlowFor(&vm, callLinkInfo, linkPolymorphicCallThunkGenerator);
+ linkSlowFor(vm, callLinkInfo, linkPolymorphicCallThunkGenerator);
return;
}
- linkSlowFor(&vm, callLinkInfo);
+ linkSlowFor(vm, callLinkInfo);
}
void linkDirectFor(
@@ -874,10 +874,10 @@
CodeBlock* callerCodeBlock = exec->codeBlock();
- VM* vm = callerCodeBlock->vm();
+ VM& vm = callerCodeBlock->vm();
ASSERT(!callLinkInfo.isLinked());
- callLinkInfo.setCodeBlock(*vm, callerCodeBlock, jsCast<FunctionCodeBlock*>(calleeCodeBlock));
+ callLinkInfo.setCodeBlock(vm, callerCodeBlock, jsCast<FunctionCodeBlock*>(calleeCodeBlock));
if (shouldDumpDisassemblyFor(callerCodeBlock))
dataLog("Linking call in ", FullCodeOrigin(callerCodeBlock, callLinkInfo.codeOrigin()), " to ", pointerDump(calleeCodeBlock), ", entrypoint at ", codePtr, "\n");
@@ -893,12 +893,12 @@
ExecState* exec, CallLinkInfo& callLinkInfo)
{
CodeBlock* callerCodeBlock = exec->callerFrame()->codeBlock();
- VM* vm = callerCodeBlock->vm();
+ VM& vm = callerCodeBlock->vm();
linkSlowFor(vm, callLinkInfo);
}
-static void revertCall(VM* vm, CallLinkInfo& callLinkInfo, MacroAssemblerCodeRef<JITStubRoutinePtrTag> codeRef)
+static void revertCall(VM& vm, CallLinkInfo& callLinkInfo, MacroAssemblerCodeRef<JITStubRoutinePtrTag> codeRef)
{
if (callLinkInfo.isDirect()) {
callLinkInfo.clearCodeBlock();
@@ -930,7 +930,7 @@
if (Options::dumpDisassembly())
dataLog("Unlinking call at ", callLinkInfo.hotPathOther(), "\n");
- revertCall(&vm, callLinkInfo, vm.getCTIStub(linkCallThunkGenerator).retagged<JITStubRoutinePtrTag>());
+ revertCall(vm, callLinkInfo, vm.getCTIStub(linkCallThunkGenerator).retagged<JITStubRoutinePtrTag>());
}
static void linkVirtualFor(ExecState* exec, CallLinkInfo& callLinkInfo)
@@ -942,8 +942,8 @@
if (shouldDumpDisassemblyFor(callerCodeBlock))
dataLog("Linking virtual call at ", FullCodeOrigin(callerCodeBlock, callerFrame->codeOrigin()), "\n");
- MacroAssemblerCodeRef<JITStubRoutinePtrTag> virtualThunk = virtualThunkFor(&vm, callLinkInfo);
- revertCall(&vm, callLinkInfo, virtualThunk);
+ MacroAssemblerCodeRef<JITStubRoutinePtrTag> virtualThunk = virtualThunkFor(vm, callLinkInfo);
+ revertCall(vm, callLinkInfo, virtualThunk);
callLinkInfo.setSlowStub(createJITStubRoutine(virtualThunk, vm, nullptr, true));
callLinkInfo.setClearedByVirtual();
}
@@ -1244,7 +1244,7 @@
// The original slow path is unreachable on 64-bits, but still
// reachable on 32-bits since a non-cell callee will always
// trigger the slow path
- linkSlowFor(&vm, callLinkInfo);
+ linkSlowFor(vm, callLinkInfo);
// If there had been a previous stub routine, that one will die as soon as the GC runs and sees
// that it's no longer on stack.
diff --git a/Source/JavaScriptCore/jit/SpecializedThunkJIT.h b/Source/JavaScriptCore/jit/SpecializedThunkJIT.h
index 102a43a..32b2fce 100644
--- a/Source/JavaScriptCore/jit/SpecializedThunkJIT.h
+++ b/Source/JavaScriptCore/jit/SpecializedThunkJIT.h
@@ -37,8 +37,8 @@
class SpecializedThunkJIT : public JSInterfaceJIT {
public:
static const int ThisArgument = -1;
- SpecializedThunkJIT(VM* vm, int expectedArgCount)
- : JSInterfaceJIT(vm)
+ SpecializedThunkJIT(VM& vm, int expectedArgCount)
+ : JSInterfaceJIT(&vm)
{
emitFunctionPrologue();
emitSaveThenMaterializeTagRegisters();
@@ -46,8 +46,8 @@
m_failures.append(branch32(NotEqual, payloadFor(CallFrameSlot::argumentCount), TrustedImm32(expectedArgCount + 1)));
}
- explicit SpecializedThunkJIT(VM* vm)
- : JSInterfaceJIT(vm)
+ explicit SpecializedThunkJIT(VM& vm)
+ : JSInterfaceJIT(&vm)
{
emitFunctionPrologue();
emitSaveThenMaterializeTagRegisters();
diff --git a/Source/JavaScriptCore/jit/ThunkGenerator.h b/Source/JavaScriptCore/jit/ThunkGenerator.h
index e1c489a..7cff818 100644
--- a/Source/JavaScriptCore/jit/ThunkGenerator.h
+++ b/Source/JavaScriptCore/jit/ThunkGenerator.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-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
@@ -33,7 +33,7 @@
class VM;
template<PtrTag> class MacroAssemblerCodeRef;
-using ThunkGenerator = MacroAssemblerCodeRef<JITThunkPtrTag> (*)(VM*);
+using ThunkGenerator = MacroAssemblerCodeRef<JITThunkPtrTag> (*)(VM&);
} // namespace JSC
diff --git a/Source/JavaScriptCore/jit/ThunkGenerators.cpp b/Source/JavaScriptCore/jit/ThunkGenerators.cpp
index 09ead43..055e324 100644
--- a/Source/JavaScriptCore/jit/ThunkGenerators.cpp
+++ b/Source/JavaScriptCore/jit/ThunkGenerators.cpp
@@ -60,7 +60,7 @@
// We will jump here if the JIT code tries to make a call, but the
// linking helper (C++ code) decides to throw an exception instead.
-MacroAssemblerCodeRef<JITThunkPtrTag> throwExceptionFromCallSlowPathGenerator(VM* vm)
+MacroAssemblerCodeRef<JITThunkPtrTag> throwExceptionFromCallSlowPathGenerator(VM& vm)
{
CCallHelpers jit;
@@ -68,23 +68,23 @@
// even though we won't use it.
jit.preserveReturnAddressAfterCall(GPRInfo::nonPreservedNonReturnGPR);
- jit.copyCalleeSavesToEntryFrameCalleeSavesBuffer(vm->topEntryFrame);
+ jit.copyCalleeSavesToEntryFrameCalleeSavesBuffer(vm.topEntryFrame);
- jit.setupArguments<decltype(lookupExceptionHandler)>(CCallHelpers::TrustedImmPtr(vm), GPRInfo::callFrameRegister);
+ jit.setupArguments<decltype(lookupExceptionHandler)>(CCallHelpers::TrustedImmPtr(&vm), GPRInfo::callFrameRegister);
jit.move(CCallHelpers::TrustedImmPtr(tagCFunctionPtr<OperationPtrTag>(lookupExceptionHandler)), GPRInfo::nonArgGPR0);
emitPointerValidation(jit, GPRInfo::nonArgGPR0, OperationPtrTag);
jit.call(GPRInfo::nonArgGPR0, OperationPtrTag);
- jit.jumpToExceptionHandler(*vm);
+ jit.jumpToExceptionHandler(vm);
LinkBuffer patchBuffer(jit, GLOBAL_THUNK_ID);
return FINALIZE_CODE(patchBuffer, JITThunkPtrTag, "Throw exception from call slow path thunk");
}
-static void slowPathFor(CCallHelpers& jit, VM* vm, Sprt_JITOperation_ECli slowPathFunction)
+static void slowPathFor(CCallHelpers& jit, VM& vm, Sprt_JITOperation_ECli slowPathFunction)
{
- jit.sanitizeStackInline(*vm, GPRInfo::nonArgGPR0);
+ jit.sanitizeStackInline(vm, GPRInfo::nonArgGPR0);
jit.emitFunctionPrologue();
- jit.storePtr(GPRInfo::callFrameRegister, &vm->topCallFrame);
+ jit.storePtr(GPRInfo::callFrameRegister, &vm.topCallFrame);
#if OS(WINDOWS) && CPU(X86_64)
// Windows X86_64 needs some space pointed to by arg0 for return types larger than 64 bits.
// Other argument values are shift by 1. Use space on the stack for our two return values.
@@ -131,7 +131,7 @@
jit.farJump(GPRInfo::returnValueGPR, JSEntryPtrTag);
}
-MacroAssemblerCodeRef<JITThunkPtrTag> linkCallThunkGenerator(VM* vm)
+MacroAssemblerCodeRef<JITThunkPtrTag> linkCallThunkGenerator(VM& vm)
{
// The return address is on the stack or in the link register. We will hence
// save the return address to the call frame while we make a C++ function call
@@ -148,7 +148,7 @@
// For closure optimizations, we only include calls, since if you're using closures for
// object construction then you're going to lose big time anyway.
-MacroAssemblerCodeRef<JITThunkPtrTag> linkPolymorphicCallThunkGenerator(VM* vm)
+MacroAssemblerCodeRef<JITThunkPtrTag> linkPolymorphicCallThunkGenerator(VM& vm)
{
CCallHelpers jit;
@@ -162,7 +162,7 @@
// path virtual call so that we can enable fast tail calls for megamorphic
// virtual calls by using the shuffler.
// https://bugs.webkit.org/show_bug.cgi?id=148831
-MacroAssemblerCodeRef<JITStubRoutinePtrTag> virtualThunkFor(VM* vm, CallLinkInfo& callLinkInfo)
+MacroAssemblerCodeRef<JITStubRoutinePtrTag> virtualThunkFor(VM& vm, CallLinkInfo& callLinkInfo)
{
// The callee is in regT0 (for JSVALUE32_64, the tag is in regT1).
// The return address is on the stack, or in the link register. We will hence
@@ -221,7 +221,7 @@
notJSFunction.link(&jit);
slowCase.append(jit.branchIfNotType(GPRInfo::regT0, InternalFunctionType));
- void* executableAddress = vm->getCTIInternalFunctionTrampolineFor(callLinkInfo.specializationKind()).executableAddress();
+ void* executableAddress = vm.getCTIInternalFunctionTrampolineFor(callLinkInfo.specializationKind()).executableAddress();
jit.move(CCallHelpers::TrustedImmPtr(executableAddress), GPRInfo::regT4);
jit.jump().linkTo(callCode, &jit);
@@ -240,14 +240,14 @@
enum ThunkEntryType { EnterViaCall, EnterViaJumpWithSavedTags, EnterViaJumpWithoutSavedTags };
enum class ThunkFunctionType { JSFunction, InternalFunction };
-static MacroAssemblerCodeRef<JITThunkPtrTag> nativeForGenerator(VM* vm, ThunkFunctionType thunkFunctionType, CodeSpecializationKind kind, ThunkEntryType entryType = EnterViaCall)
+static MacroAssemblerCodeRef<JITThunkPtrTag> nativeForGenerator(VM& vm, ThunkFunctionType thunkFunctionType, CodeSpecializationKind kind, ThunkEntryType entryType = EnterViaCall)
{
// FIXME: This should be able to log ShadowChicken prologue packets.
// https://bugs.webkit.org/show_bug.cgi?id=155689
int executableOffsetToFunction = NativeExecutable::offsetOfNativeFunctionFor(kind);
- JSInterfaceJIT jit(vm);
+ JSInterfaceJIT jit(&vm);
switch (entryType) {
case EnterViaCall:
@@ -266,7 +266,7 @@
}
jit.emitPutToCallFrameHeader(0, CallFrameSlot::codeBlock);
- jit.storePtr(JSInterfaceJIT::callFrameRegister, &vm->topCallFrame);
+ jit.storePtr(JSInterfaceJIT::callFrameRegister, &vm.topCallFrame);
#if CPU(X86)
// Calling convention: f(ecx, edx, ...);
@@ -363,12 +363,12 @@
// Check for an exception
#if USE(JSVALUE64)
- jit.load64(vm->addressOfException(), JSInterfaceJIT::regT2);
+ jit.load64(vm.addressOfException(), JSInterfaceJIT::regT2);
JSInterfaceJIT::Jump exceptionHandler = jit.branchTest64(JSInterfaceJIT::NonZero, JSInterfaceJIT::regT2);
#else
JSInterfaceJIT::Jump exceptionHandler = jit.branch32(
JSInterfaceJIT::NotEqual,
- JSInterfaceJIT::AbsoluteAddress(vm->addressOfException()),
+ JSInterfaceJIT::AbsoluteAddress(vm.addressOfException()),
JSInterfaceJIT::TrustedImm32(0));
#endif
@@ -379,8 +379,8 @@
// Handle an exception
exceptionHandler.link(&jit);
- jit.copyCalleeSavesToEntryFrameCalleeSavesBuffer(vm->topEntryFrame);
- jit.storePtr(JSInterfaceJIT::callFrameRegister, &vm->topCallFrame);
+ jit.copyCalleeSavesToEntryFrameCalleeSavesBuffer(vm.topEntryFrame);
+ jit.storePtr(JSInterfaceJIT::callFrameRegister, &vm.topCallFrame);
#if CPU(X86) && USE(JSVALUE32_64)
jit.subPtr(JSInterfaceJIT::TrustedImm32(4), JSInterfaceJIT::stackPointerRegister);
@@ -401,45 +401,45 @@
jit.addPtr(JSInterfaceJIT::TrustedImm32(4 * sizeof(int64_t)), JSInterfaceJIT::stackPointerRegister);
#endif
- jit.jumpToExceptionHandler(*vm);
+ jit.jumpToExceptionHandler(vm);
LinkBuffer patchBuffer(jit, GLOBAL_THUNK_ID);
return FINALIZE_CODE(patchBuffer, JITThunkPtrTag, "%s %s%s trampoline", thunkFunctionType == ThunkFunctionType::JSFunction ? "native" : "internal", entryType == EnterViaJumpWithSavedTags ? "Tail With Saved Tags " : entryType == EnterViaJumpWithoutSavedTags ? "Tail Without Saved Tags " : "", toCString(kind).data());
}
-MacroAssemblerCodeRef<JITThunkPtrTag> nativeCallGenerator(VM* vm)
+MacroAssemblerCodeRef<JITThunkPtrTag> nativeCallGenerator(VM& vm)
{
return nativeForGenerator(vm, ThunkFunctionType::JSFunction, CodeForCall);
}
-MacroAssemblerCodeRef<JITThunkPtrTag> nativeTailCallGenerator(VM* vm)
+MacroAssemblerCodeRef<JITThunkPtrTag> nativeTailCallGenerator(VM& vm)
{
return nativeForGenerator(vm, ThunkFunctionType::JSFunction, CodeForCall, EnterViaJumpWithSavedTags);
}
-MacroAssemblerCodeRef<JITThunkPtrTag> nativeTailCallWithoutSavedTagsGenerator(VM* vm)
+MacroAssemblerCodeRef<JITThunkPtrTag> nativeTailCallWithoutSavedTagsGenerator(VM& vm)
{
return nativeForGenerator(vm, ThunkFunctionType::JSFunction, CodeForCall, EnterViaJumpWithoutSavedTags);
}
-MacroAssemblerCodeRef<JITThunkPtrTag> nativeConstructGenerator(VM* vm)
+MacroAssemblerCodeRef<JITThunkPtrTag> nativeConstructGenerator(VM& vm)
{
return nativeForGenerator(vm, ThunkFunctionType::JSFunction, CodeForConstruct);
}
-MacroAssemblerCodeRef<JITThunkPtrTag> internalFunctionCallGenerator(VM* vm)
+MacroAssemblerCodeRef<JITThunkPtrTag> internalFunctionCallGenerator(VM& vm)
{
return nativeForGenerator(vm, ThunkFunctionType::InternalFunction, CodeForCall);
}
-MacroAssemblerCodeRef<JITThunkPtrTag> internalFunctionConstructGenerator(VM* vm)
+MacroAssemblerCodeRef<JITThunkPtrTag> internalFunctionConstructGenerator(VM& vm)
{
return nativeForGenerator(vm, ThunkFunctionType::InternalFunction, CodeForConstruct);
}
-MacroAssemblerCodeRef<JITThunkPtrTag> arityFixupGenerator(VM* vm)
+MacroAssemblerCodeRef<JITThunkPtrTag> arityFixupGenerator(VM& vm)
{
- JSInterfaceJIT jit(vm);
+ JSInterfaceJIT jit(&vm);
// We enter with fixup count in argumentGPR0
// We have the guarantee that a0, a1, a2, t3, t4 and t5 (or t0 for Windows) are all distinct :-)
@@ -590,9 +590,9 @@
return FINALIZE_CODE(patchBuffer, JITThunkPtrTag, "fixup arity");
}
-MacroAssemblerCodeRef<JITThunkPtrTag> unreachableGenerator(VM* vm)
+MacroAssemblerCodeRef<JITThunkPtrTag> unreachableGenerator(VM& vm)
{
- JSInterfaceJIT jit(vm);
+ JSInterfaceJIT jit(&vm);
jit.breakpoint();
@@ -600,7 +600,7 @@
return FINALIZE_CODE(patchBuffer, JITThunkPtrTag, "unreachable thunk");
}
-MacroAssemblerCodeRef<JITThunkPtrTag> stringGetByValGenerator(VM* vm)
+MacroAssemblerCodeRef<JITThunkPtrTag> stringGetByValGenerator(VM& vm)
{
// regT0 is JSString*, and regT1 (64bit) or regT2 (32bit) is int index.
// Return regT0 = result JSString* if succeeds. Otherwise, return regT0 = 0.
@@ -614,7 +614,7 @@
GPRReg scratchGPR = GPRInfo::regT1;
#endif
- JSInterfaceJIT jit(vm);
+ JSInterfaceJIT jit(&vm);
JSInterfaceJIT::JumpList failures;
jit.tagReturnAddress();
@@ -640,7 +640,7 @@
cont8Bit.link(&jit);
failures.append(jit.branch32(JSInterfaceJIT::Above, stringGPR, JSInterfaceJIT::TrustedImm32(maxSingleCharacterString)));
- jit.move(JSInterfaceJIT::TrustedImmPtr(vm->smallStrings.singleCharacterStrings()), indexGPR);
+ jit.move(JSInterfaceJIT::TrustedImmPtr(vm.smallStrings.singleCharacterStrings()), indexGPR);
jit.loadPtr(JSInterfaceJIT::BaseIndex(indexGPR, stringGPR, JSInterfaceJIT::ScalePtr, 0), stringGPR);
jit.ret();
@@ -682,42 +682,42 @@
cont8Bit.link(&jit);
}
-static void charToString(SpecializedThunkJIT& jit, VM* vm, MacroAssembler::RegisterID src, MacroAssembler::RegisterID dst, MacroAssembler::RegisterID scratch)
+static void charToString(SpecializedThunkJIT& jit, VM& vm, MacroAssembler::RegisterID src, MacroAssembler::RegisterID dst, MacroAssembler::RegisterID scratch)
{
jit.appendFailure(jit.branch32(MacroAssembler::Above, src, MacroAssembler::TrustedImm32(maxSingleCharacterString)));
- jit.move(MacroAssembler::TrustedImmPtr(vm->smallStrings.singleCharacterStrings()), scratch);
+ jit.move(MacroAssembler::TrustedImmPtr(vm.smallStrings.singleCharacterStrings()), scratch);
jit.loadPtr(MacroAssembler::BaseIndex(scratch, src, MacroAssembler::ScalePtr, 0), dst);
jit.appendFailure(jit.branchTestPtr(MacroAssembler::Zero, dst));
}
-MacroAssemblerCodeRef<JITThunkPtrTag> charCodeAtThunkGenerator(VM* vm)
+MacroAssemblerCodeRef<JITThunkPtrTag> charCodeAtThunkGenerator(VM& vm)
{
SpecializedThunkJIT jit(vm, 1);
stringCharLoad(jit);
jit.returnInt32(SpecializedThunkJIT::regT0);
- return jit.finalize(vm->jitStubs->ctiNativeTailCall(vm), "charCodeAt");
+ return jit.finalize(vm.jitStubs->ctiNativeTailCall(vm), "charCodeAt");
}
-MacroAssemblerCodeRef<JITThunkPtrTag> charAtThunkGenerator(VM* vm)
+MacroAssemblerCodeRef<JITThunkPtrTag> charAtThunkGenerator(VM& vm)
{
SpecializedThunkJIT jit(vm, 1);
stringCharLoad(jit);
charToString(jit, vm, SpecializedThunkJIT::regT0, SpecializedThunkJIT::regT0, SpecializedThunkJIT::regT1);
jit.returnJSCell(SpecializedThunkJIT::regT0);
- return jit.finalize(vm->jitStubs->ctiNativeTailCall(vm), "charAt");
+ return jit.finalize(vm.jitStubs->ctiNativeTailCall(vm), "charAt");
}
-MacroAssemblerCodeRef<JITThunkPtrTag> fromCharCodeThunkGenerator(VM* vm)
+MacroAssemblerCodeRef<JITThunkPtrTag> fromCharCodeThunkGenerator(VM& vm)
{
SpecializedThunkJIT jit(vm, 1);
// load char code
jit.loadInt32Argument(0, SpecializedThunkJIT::regT0);
charToString(jit, vm, SpecializedThunkJIT::regT0, SpecializedThunkJIT::regT0, SpecializedThunkJIT::regT1);
jit.returnJSCell(SpecializedThunkJIT::regT0);
- return jit.finalize(vm->jitStubs->ctiNativeTailCall(vm), "fromCharCode");
+ return jit.finalize(vm.jitStubs->ctiNativeTailCall(vm), "fromCharCode");
}
-MacroAssemblerCodeRef<JITThunkPtrTag> clz32ThunkGenerator(VM* vm)
+MacroAssemblerCodeRef<JITThunkPtrTag> clz32ThunkGenerator(VM& vm)
{
SpecializedThunkJIT jit(vm, 1);
MacroAssembler::Jump nonIntArgJump;
@@ -735,19 +735,19 @@
} else
jit.appendFailure(nonIntArgJump);
- return jit.finalize(vm->jitStubs->ctiNativeTailCall(vm), "clz32");
+ return jit.finalize(vm.jitStubs->ctiNativeTailCall(vm), "clz32");
}
-MacroAssemblerCodeRef<JITThunkPtrTag> sqrtThunkGenerator(VM* vm)
+MacroAssemblerCodeRef<JITThunkPtrTag> sqrtThunkGenerator(VM& vm)
{
SpecializedThunkJIT jit(vm, 1);
if (!jit.supportsFloatingPointSqrt())
- return MacroAssemblerCodeRef<JITThunkPtrTag>::createSelfManagedCodeRef(vm->jitStubs->ctiNativeCall(vm));
+ return MacroAssemblerCodeRef<JITThunkPtrTag>::createSelfManagedCodeRef(vm.jitStubs->ctiNativeCall(vm));
jit.loadDoubleArgument(0, SpecializedThunkJIT::fpRegT0, SpecializedThunkJIT::regT0);
jit.sqrtDouble(SpecializedThunkJIT::fpRegT0, SpecializedThunkJIT::fpRegT0);
jit.returnDouble(SpecializedThunkJIT::fpRegT0);
- return jit.finalize(vm->jitStubs->ctiNativeTailCall(vm), "sqrt");
+ return jit.finalize(vm.jitStubs->ctiNativeTailCall(vm), "sqrt");
}
@@ -898,12 +898,12 @@
static const double halfConstant = 0.5;
-MacroAssemblerCodeRef<JITThunkPtrTag> floorThunkGenerator(VM* vm)
+MacroAssemblerCodeRef<JITThunkPtrTag> floorThunkGenerator(VM& vm)
{
SpecializedThunkJIT jit(vm, 1);
MacroAssembler::Jump nonIntJump;
if (!UnaryDoubleOpWrapper(floor) || !jit.supportsFloatingPoint())
- return MacroAssemblerCodeRef<JITThunkPtrTag>::createSelfManagedCodeRef(vm->jitStubs->ctiNativeCall(vm));
+ return MacroAssemblerCodeRef<JITThunkPtrTag>::createSelfManagedCodeRef(vm.jitStubs->ctiNativeCall(vm));
jit.loadInt32Argument(0, SpecializedThunkJIT::regT0, nonIntJump);
jit.returnInt32(SpecializedThunkJIT::regT0);
nonIntJump.link(&jit);
@@ -916,7 +916,7 @@
jit.returnInt32(SpecializedThunkJIT::regT0);
doubleResult.link(&jit);
jit.returnDouble(SpecializedThunkJIT::fpRegT0);
- return jit.finalize(vm->jitStubs->ctiNativeTailCall(vm), "floor");
+ return jit.finalize(vm.jitStubs->ctiNativeTailCall(vm), "floor");
}
SpecializedThunkJIT::Jump intResult;
@@ -938,14 +938,14 @@
jit.returnInt32(SpecializedThunkJIT::regT0);
doubleResult.link(&jit);
jit.returnDouble(SpecializedThunkJIT::fpRegT0);
- return jit.finalize(vm->jitStubs->ctiNativeTailCall(vm), "floor");
+ return jit.finalize(vm.jitStubs->ctiNativeTailCall(vm), "floor");
}
-MacroAssemblerCodeRef<JITThunkPtrTag> ceilThunkGenerator(VM* vm)
+MacroAssemblerCodeRef<JITThunkPtrTag> ceilThunkGenerator(VM& vm)
{
SpecializedThunkJIT jit(vm, 1);
if (!UnaryDoubleOpWrapper(ceil) || !jit.supportsFloatingPoint())
- return MacroAssemblerCodeRef<JITThunkPtrTag>::createSelfManagedCodeRef(vm->jitStubs->ctiNativeCall(vm));
+ return MacroAssemblerCodeRef<JITThunkPtrTag>::createSelfManagedCodeRef(vm.jitStubs->ctiNativeCall(vm));
MacroAssembler::Jump nonIntJump;
jit.loadInt32Argument(0, SpecializedThunkJIT::regT0, nonIntJump);
jit.returnInt32(SpecializedThunkJIT::regT0);
@@ -961,14 +961,14 @@
jit.returnInt32(SpecializedThunkJIT::regT0);
doubleResult.link(&jit);
jit.returnDouble(SpecializedThunkJIT::fpRegT0);
- return jit.finalize(vm->jitStubs->ctiNativeTailCall(vm), "ceil");
+ return jit.finalize(vm.jitStubs->ctiNativeTailCall(vm), "ceil");
}
-MacroAssemblerCodeRef<JITThunkPtrTag> truncThunkGenerator(VM* vm)
+MacroAssemblerCodeRef<JITThunkPtrTag> truncThunkGenerator(VM& vm)
{
SpecializedThunkJIT jit(vm, 1);
if (!UnaryDoubleOpWrapper(trunc) || !jit.supportsFloatingPoint())
- return MacroAssemblerCodeRef<JITThunkPtrTag>::createSelfManagedCodeRef(vm->jitStubs->ctiNativeCall(vm));
+ return MacroAssemblerCodeRef<JITThunkPtrTag>::createSelfManagedCodeRef(vm.jitStubs->ctiNativeCall(vm));
MacroAssembler::Jump nonIntJump;
jit.loadInt32Argument(0, SpecializedThunkJIT::regT0, nonIntJump);
jit.returnInt32(SpecializedThunkJIT::regT0);
@@ -984,14 +984,14 @@
jit.returnInt32(SpecializedThunkJIT::regT0);
doubleResult.link(&jit);
jit.returnDouble(SpecializedThunkJIT::fpRegT0);
- return jit.finalize(vm->jitStubs->ctiNativeTailCall(vm), "trunc");
+ return jit.finalize(vm.jitStubs->ctiNativeTailCall(vm), "trunc");
}
-MacroAssemblerCodeRef<JITThunkPtrTag> roundThunkGenerator(VM* vm)
+MacroAssemblerCodeRef<JITThunkPtrTag> roundThunkGenerator(VM& vm)
{
SpecializedThunkJIT jit(vm, 1);
if (!UnaryDoubleOpWrapper(jsRound) || !jit.supportsFloatingPoint())
- return MacroAssemblerCodeRef<JITThunkPtrTag>::createSelfManagedCodeRef(vm->jitStubs->ctiNativeCall(vm));
+ return MacroAssemblerCodeRef<JITThunkPtrTag>::createSelfManagedCodeRef(vm.jitStubs->ctiNativeCall(vm));
MacroAssembler::Jump nonIntJump;
jit.loadInt32Argument(0, SpecializedThunkJIT::regT0, nonIntJump);
jit.returnInt32(SpecializedThunkJIT::regT0);
@@ -1018,40 +1018,40 @@
jit.returnInt32(SpecializedThunkJIT::regT0);
doubleResult.link(&jit);
jit.returnDouble(SpecializedThunkJIT::fpRegT0);
- return jit.finalize(vm->jitStubs->ctiNativeTailCall(vm), "round");
+ return jit.finalize(vm.jitStubs->ctiNativeTailCall(vm), "round");
}
-MacroAssemblerCodeRef<JITThunkPtrTag> expThunkGenerator(VM* vm)
+MacroAssemblerCodeRef<JITThunkPtrTag> expThunkGenerator(VM& vm)
{
if (!UnaryDoubleOpWrapper(exp))
- return MacroAssemblerCodeRef<JITThunkPtrTag>::createSelfManagedCodeRef(vm->jitStubs->ctiNativeCall(vm));
+ return MacroAssemblerCodeRef<JITThunkPtrTag>::createSelfManagedCodeRef(vm.jitStubs->ctiNativeCall(vm));
SpecializedThunkJIT jit(vm, 1);
if (!jit.supportsFloatingPoint())
- return MacroAssemblerCodeRef<JITThunkPtrTag>::createSelfManagedCodeRef(vm->jitStubs->ctiNativeCall(vm));
+ return MacroAssemblerCodeRef<JITThunkPtrTag>::createSelfManagedCodeRef(vm.jitStubs->ctiNativeCall(vm));
jit.loadDoubleArgument(0, SpecializedThunkJIT::fpRegT0, SpecializedThunkJIT::regT0);
jit.callDoubleToDoublePreservingReturn(UnaryDoubleOpWrapper(exp));
jit.returnDouble(SpecializedThunkJIT::fpRegT0);
- return jit.finalize(vm->jitStubs->ctiNativeTailCall(vm), "exp");
+ return jit.finalize(vm.jitStubs->ctiNativeTailCall(vm), "exp");
}
-MacroAssemblerCodeRef<JITThunkPtrTag> logThunkGenerator(VM* vm)
+MacroAssemblerCodeRef<JITThunkPtrTag> logThunkGenerator(VM& vm)
{
if (!UnaryDoubleOpWrapper(log))
- return MacroAssemblerCodeRef<JITThunkPtrTag>::createSelfManagedCodeRef(vm->jitStubs->ctiNativeCall(vm));
+ return MacroAssemblerCodeRef<JITThunkPtrTag>::createSelfManagedCodeRef(vm.jitStubs->ctiNativeCall(vm));
SpecializedThunkJIT jit(vm, 1);
if (!jit.supportsFloatingPoint())
- return MacroAssemblerCodeRef<JITThunkPtrTag>::createSelfManagedCodeRef(vm->jitStubs->ctiNativeCall(vm));
+ return MacroAssemblerCodeRef<JITThunkPtrTag>::createSelfManagedCodeRef(vm.jitStubs->ctiNativeCall(vm));
jit.loadDoubleArgument(0, SpecializedThunkJIT::fpRegT0, SpecializedThunkJIT::regT0);
jit.callDoubleToDoublePreservingReturn(UnaryDoubleOpWrapper(log));
jit.returnDouble(SpecializedThunkJIT::fpRegT0);
- return jit.finalize(vm->jitStubs->ctiNativeTailCall(vm), "log");
+ return jit.finalize(vm.jitStubs->ctiNativeTailCall(vm), "log");
}
-MacroAssemblerCodeRef<JITThunkPtrTag> absThunkGenerator(VM* vm)
+MacroAssemblerCodeRef<JITThunkPtrTag> absThunkGenerator(VM& vm)
{
SpecializedThunkJIT jit(vm, 1);
if (!jit.supportsFloatingPointAbs())
- return MacroAssemblerCodeRef<JITThunkPtrTag>::createSelfManagedCodeRef(vm->jitStubs->ctiNativeCall(vm));
+ return MacroAssemblerCodeRef<JITThunkPtrTag>::createSelfManagedCodeRef(vm.jitStubs->ctiNativeCall(vm));
#if USE(JSVALUE64)
unsigned virtualRegisterIndex = CallFrame::argumentOffset(0);
@@ -1101,10 +1101,10 @@
jit.absDouble(SpecializedThunkJIT::fpRegT0, SpecializedThunkJIT::fpRegT1);
jit.returnDouble(SpecializedThunkJIT::fpRegT1);
#endif
- return jit.finalize(vm->jitStubs->ctiNativeTailCall(vm), "abs");
+ return jit.finalize(vm.jitStubs->ctiNativeTailCall(vm), "abs");
}
-MacroAssemblerCodeRef<JITThunkPtrTag> imulThunkGenerator(VM* vm)
+MacroAssemblerCodeRef<JITThunkPtrTag> imulThunkGenerator(VM& vm)
{
SpecializedThunkJIT jit(vm, 2);
MacroAssembler::Jump nonIntArg0Jump;
@@ -1132,26 +1132,26 @@
} else
jit.appendFailure(nonIntArg1Jump);
- return jit.finalize(vm->jitStubs->ctiNativeTailCall(vm), "imul");
+ return jit.finalize(vm.jitStubs->ctiNativeTailCall(vm), "imul");
}
-MacroAssemblerCodeRef<JITThunkPtrTag> randomThunkGenerator(VM* vm)
+MacroAssemblerCodeRef<JITThunkPtrTag> randomThunkGenerator(VM& vm)
{
SpecializedThunkJIT jit(vm, 0);
if (!jit.supportsFloatingPoint())
- return MacroAssemblerCodeRef<JITThunkPtrTag>::createSelfManagedCodeRef(vm->jitStubs->ctiNativeCall(vm));
+ return MacroAssemblerCodeRef<JITThunkPtrTag>::createSelfManagedCodeRef(vm.jitStubs->ctiNativeCall(vm));
#if USE(JSVALUE64)
- jit.emitRandomThunk(*vm, SpecializedThunkJIT::regT0, SpecializedThunkJIT::regT1, SpecializedThunkJIT::regT2, SpecializedThunkJIT::regT3, SpecializedThunkJIT::fpRegT0);
+ jit.emitRandomThunk(vm, SpecializedThunkJIT::regT0, SpecializedThunkJIT::regT1, SpecializedThunkJIT::regT2, SpecializedThunkJIT::regT3, SpecializedThunkJIT::fpRegT0);
jit.returnDouble(SpecializedThunkJIT::fpRegT0);
- return jit.finalize(vm->jitStubs->ctiNativeTailCall(vm), "random");
+ return jit.finalize(vm.jitStubs->ctiNativeTailCall(vm), "random");
#else
- return MacroAssemblerCodeRef<JITThunkPtrTag>::createSelfManagedCodeRef(vm->jitStubs->ctiNativeCall(vm));
+ return MacroAssemblerCodeRef<JITThunkPtrTag>::createSelfManagedCodeRef(vm.jitStubs->ctiNativeCall(vm));
#endif
}
-MacroAssemblerCodeRef<JITThunkPtrTag> boundThisNoArgsFunctionCallGenerator(VM* vm)
+MacroAssemblerCodeRef<JITThunkPtrTag> boundThisNoArgsFunctionCallGenerator(VM& vm)
{
CCallHelpers jit;
@@ -1194,15 +1194,15 @@
jit.negPtr(GPRInfo::regT2);
jit.addPtr(CCallHelpers::stackPointerRegister, GPRInfo::regT2);
- CCallHelpers::Jump haveStackSpace = jit.branchPtr(CCallHelpers::BelowOrEqual, CCallHelpers::AbsoluteAddress(vm->addressOfSoftStackLimit()), GPRInfo::regT2);
+ CCallHelpers::Jump haveStackSpace = jit.branchPtr(CCallHelpers::BelowOrEqual, CCallHelpers::AbsoluteAddress(vm.addressOfSoftStackLimit()), GPRInfo::regT2);
// Throw Stack Overflow exception
- jit.copyCalleeSavesToEntryFrameCalleeSavesBuffer(vm->topEntryFrame);
- jit.setupArguments<decltype(throwStackOverflowErrorFromThunk)>(CCallHelpers::TrustedImmPtr(vm), GPRInfo::callFrameRegister);
+ jit.copyCalleeSavesToEntryFrameCalleeSavesBuffer(vm.topEntryFrame);
+ jit.setupArguments<decltype(throwStackOverflowErrorFromThunk)>(CCallHelpers::TrustedImmPtr(&vm), GPRInfo::callFrameRegister);
jit.move(CCallHelpers::TrustedImmPtr(tagCFunctionPtr<OperationPtrTag>(throwStackOverflowErrorFromThunk)), GPRInfo::nonArgGPR0);
emitPointerValidation(jit, GPRInfo::nonArgGPR0, OperationPtrTag);
jit.call(GPRInfo::nonArgGPR0, OperationPtrTag);
- jit.jumpToExceptionHandler(*vm);
+ jit.jumpToExceptionHandler(vm);
haveStackSpace.link(&jit);
jit.move(GPRInfo::regT2, CCallHelpers::stackPointerRegister);
@@ -1250,7 +1250,7 @@
jit.ret();
LinkBuffer linkBuffer(jit, GLOBAL_THUNK_ID);
- linkBuffer.link(noCode, CodeLocationLabel<JITThunkPtrTag>(vm->jitStubs->ctiNativeTailCallWithoutSavedTags(vm)));
+ linkBuffer.link(noCode, CodeLocationLabel<JITThunkPtrTag>(vm.jitStubs->ctiNativeTailCallWithoutSavedTags(vm)));
return FINALIZE_CODE(
linkBuffer, JITThunkPtrTag, "Specialized thunk for bound function calls with no arguments");
}
diff --git a/Source/JavaScriptCore/jit/ThunkGenerators.h b/Source/JavaScriptCore/jit/ThunkGenerators.h
index 2d4b30f..9153821 100644
--- a/Source/JavaScriptCore/jit/ThunkGenerators.h
+++ b/Source/JavaScriptCore/jit/ThunkGenerators.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2010-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
@@ -35,39 +35,39 @@
template<PtrTag> class MacroAssemblerCodeRef;
class VM;
-MacroAssemblerCodeRef<JITThunkPtrTag> throwExceptionFromCallSlowPathGenerator(VM*);
+MacroAssemblerCodeRef<JITThunkPtrTag> throwExceptionFromCallSlowPathGenerator(VM&);
MacroAssemblerCodeRef<JITThunkPtrTag> linkCallThunk(VM*, CallLinkInfo&, CodeSpecializationKind);
-MacroAssemblerCodeRef<JITThunkPtrTag> linkCallThunkGenerator(VM*);
-MacroAssemblerCodeRef<JITThunkPtrTag> linkPolymorphicCallThunkGenerator(VM*);
+MacroAssemblerCodeRef<JITThunkPtrTag> linkCallThunkGenerator(VM&);
+MacroAssemblerCodeRef<JITThunkPtrTag> linkPolymorphicCallThunkGenerator(VM&);
-MacroAssemblerCodeRef<JITStubRoutinePtrTag> virtualThunkFor(VM*, CallLinkInfo&);
+MacroAssemblerCodeRef<JITStubRoutinePtrTag> virtualThunkFor(VM&, CallLinkInfo&);
-MacroAssemblerCodeRef<JITThunkPtrTag> nativeCallGenerator(VM*);
-MacroAssemblerCodeRef<JITThunkPtrTag> nativeConstructGenerator(VM*);
-MacroAssemblerCodeRef<JITThunkPtrTag> nativeTailCallGenerator(VM*);
-MacroAssemblerCodeRef<JITThunkPtrTag> nativeTailCallWithoutSavedTagsGenerator(VM*);
-MacroAssemblerCodeRef<JITThunkPtrTag> internalFunctionCallGenerator(VM*);
-MacroAssemblerCodeRef<JITThunkPtrTag> internalFunctionConstructGenerator(VM*);
-MacroAssemblerCodeRef<JITThunkPtrTag> arityFixupGenerator(VM*);
-MacroAssemblerCodeRef<JITThunkPtrTag> unreachableGenerator(VM*);
-MacroAssemblerCodeRef<JITThunkPtrTag> stringGetByValGenerator(VM*);
+MacroAssemblerCodeRef<JITThunkPtrTag> nativeCallGenerator(VM&);
+MacroAssemblerCodeRef<JITThunkPtrTag> nativeConstructGenerator(VM&);
+MacroAssemblerCodeRef<JITThunkPtrTag> nativeTailCallGenerator(VM&);
+MacroAssemblerCodeRef<JITThunkPtrTag> nativeTailCallWithoutSavedTagsGenerator(VM&);
+MacroAssemblerCodeRef<JITThunkPtrTag> internalFunctionCallGenerator(VM&);
+MacroAssemblerCodeRef<JITThunkPtrTag> internalFunctionConstructGenerator(VM&);
+MacroAssemblerCodeRef<JITThunkPtrTag> arityFixupGenerator(VM&);
+MacroAssemblerCodeRef<JITThunkPtrTag> unreachableGenerator(VM&);
+MacroAssemblerCodeRef<JITThunkPtrTag> stringGetByValGenerator(VM&);
-MacroAssemblerCodeRef<JITThunkPtrTag> charCodeAtThunkGenerator(VM*);
-MacroAssemblerCodeRef<JITThunkPtrTag> charAtThunkGenerator(VM*);
-MacroAssemblerCodeRef<JITThunkPtrTag> clz32ThunkGenerator(VM*);
-MacroAssemblerCodeRef<JITThunkPtrTag> fromCharCodeThunkGenerator(VM*);
-MacroAssemblerCodeRef<JITThunkPtrTag> absThunkGenerator(VM*);
-MacroAssemblerCodeRef<JITThunkPtrTag> ceilThunkGenerator(VM*);
-MacroAssemblerCodeRef<JITThunkPtrTag> expThunkGenerator(VM*);
-MacroAssemblerCodeRef<JITThunkPtrTag> floorThunkGenerator(VM*);
-MacroAssemblerCodeRef<JITThunkPtrTag> logThunkGenerator(VM*);
-MacroAssemblerCodeRef<JITThunkPtrTag> roundThunkGenerator(VM*);
-MacroAssemblerCodeRef<JITThunkPtrTag> sqrtThunkGenerator(VM*);
-MacroAssemblerCodeRef<JITThunkPtrTag> imulThunkGenerator(VM*);
-MacroAssemblerCodeRef<JITThunkPtrTag> randomThunkGenerator(VM*);
-MacroAssemblerCodeRef<JITThunkPtrTag> truncThunkGenerator(VM*);
+MacroAssemblerCodeRef<JITThunkPtrTag> charCodeAtThunkGenerator(VM&);
+MacroAssemblerCodeRef<JITThunkPtrTag> charAtThunkGenerator(VM&);
+MacroAssemblerCodeRef<JITThunkPtrTag> clz32ThunkGenerator(VM&);
+MacroAssemblerCodeRef<JITThunkPtrTag> fromCharCodeThunkGenerator(VM&);
+MacroAssemblerCodeRef<JITThunkPtrTag> absThunkGenerator(VM&);
+MacroAssemblerCodeRef<JITThunkPtrTag> ceilThunkGenerator(VM&);
+MacroAssemblerCodeRef<JITThunkPtrTag> expThunkGenerator(VM&);
+MacroAssemblerCodeRef<JITThunkPtrTag> floorThunkGenerator(VM&);
+MacroAssemblerCodeRef<JITThunkPtrTag> logThunkGenerator(VM&);
+MacroAssemblerCodeRef<JITThunkPtrTag> roundThunkGenerator(VM&);
+MacroAssemblerCodeRef<JITThunkPtrTag> sqrtThunkGenerator(VM&);
+MacroAssemblerCodeRef<JITThunkPtrTag> imulThunkGenerator(VM&);
+MacroAssemblerCodeRef<JITThunkPtrTag> randomThunkGenerator(VM&);
+MacroAssemblerCodeRef<JITThunkPtrTag> truncThunkGenerator(VM&);
-MacroAssemblerCodeRef<JITThunkPtrTag> boundThisNoArgsFunctionCallGenerator(VM*);
+MacroAssemblerCodeRef<JITThunkPtrTag> boundThisNoArgsFunctionCallGenerator(VM&);
}
#endif // ENABLE(JIT)
diff --git a/Source/JavaScriptCore/jsc.cpp b/Source/JavaScriptCore/jsc.cpp
index 74dfa749..eb11a25 100644
--- a/Source/JavaScriptCore/jsc.cpp
+++ b/Source/JavaScriptCore/jsc.cpp
@@ -551,12 +551,12 @@
addFunction(vm, "clearSamplingFlags", functionClearSamplingFlags, 1);
#endif
- putDirectNativeFunction(vm, this, Identifier::fromString(&vm, "OSRExit"), 0, functionUndefined1, OSRExitIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunction(vm, this, Identifier::fromString(&vm, "isFinalTier"), 0, functionFalse, IsFinalTierIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunction(vm, this, Identifier::fromString(&vm, "predictInt32"), 0, functionUndefined2, SetInt32HeapPredictionIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunction(vm, this, Identifier::fromString(&vm, "isInt32"), 0, functionIsInt32, CheckInt32Intrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunction(vm, this, Identifier::fromString(&vm, "isPureNaN"), 0, functionIsPureNaN, CheckInt32Intrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunction(vm, this, Identifier::fromString(&vm, "fiatInt52"), 0, functionIdentity, FiatInt52Intrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunction(vm, this, Identifier::fromString(vm, "OSRExit"), 0, functionUndefined1, OSRExitIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunction(vm, this, Identifier::fromString(vm, "isFinalTier"), 0, functionFalse, IsFinalTierIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunction(vm, this, Identifier::fromString(vm, "predictInt32"), 0, functionUndefined2, SetInt32HeapPredictionIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunction(vm, this, Identifier::fromString(vm, "isInt32"), 0, functionIsInt32, CheckInt32Intrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunction(vm, this, Identifier::fromString(vm, "isPureNaN"), 0, functionIsPureNaN, CheckInt32Intrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunction(vm, this, Identifier::fromString(vm, "fiatInt52"), 0, functionIdentity, FiatInt52Intrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
addFunction(vm, "effectful42", functionEffectful42, 0);
addFunction(vm, "makeMasquerader", functionMakeMasquerader, 0);
@@ -600,26 +600,26 @@
if (!arguments.isEmpty()) {
JSArray* array = constructEmptyArray(globalExec(), 0);
for (size_t i = 0; i < arguments.size(); ++i)
- array->putDirectIndex(globalExec(), i, jsString(globalExec(), arguments[i]));
- putDirect(vm, Identifier::fromString(globalExec(), "arguments"), array);
+ array->putDirectIndex(globalExec(), i, jsString(vm, arguments[i]));
+ putDirect(vm, Identifier::fromString(vm, "arguments"), array);
}
- putDirect(vm, Identifier::fromString(globalExec(), "console"), jsUndefined());
+ putDirect(vm, Identifier::fromString(vm, "console"), jsUndefined());
Structure* plainObjectStructure = JSFinalObject::createStructure(vm, this, objectPrototype(), 0);
JSObject* dollar = JSFinalObject::create(vm, plainObjectStructure);
- putDirect(vm, Identifier::fromString(globalExec(), "$"), dollar);
- putDirect(vm, Identifier::fromString(globalExec(), "$262"), dollar);
+ putDirect(vm, Identifier::fromString(vm, "$"), dollar);
+ putDirect(vm, Identifier::fromString(vm, "$262"), dollar);
addFunction(vm, dollar, "createRealm", functionDollarCreateRealm, 0);
addFunction(vm, dollar, "detachArrayBuffer", functionDollarDetachArrayBuffer, 1);
addFunction(vm, dollar, "evalScript", functionDollarEvalScript, 1);
- dollar->putDirect(vm, Identifier::fromString(globalExec(), "global"), this);
+ dollar->putDirect(vm, Identifier::fromString(vm, "global"), this);
JSObject* agent = JSFinalObject::create(vm, plainObjectStructure);
- dollar->putDirect(vm, Identifier::fromString(globalExec(), "agent"), agent);
+ dollar->putDirect(vm, Identifier::fromString(vm, "agent"), agent);
// The test262 INTERPRETING.md document says that some of these functions are just in the main
// thread and some are in the other threads. We just put them in all threads.
@@ -646,7 +646,7 @@
void addFunction(VM& vm, JSObject* object, const char* name, NativeFunction function, unsigned arguments)
{
- Identifier identifier = Identifier::fromString(&vm, name);
+ Identifier identifier = Identifier::fromString(vm, name);
object->putDirect(vm, identifier, JSFunction::create(vm, this, arguments, identifier.string(), function));
}
@@ -844,7 +844,7 @@
if (!directoryName)
return reject(createError(exec, makeString("Could not resolve the referrer name '", String(referrer.impl()), "'.")));
- auto result = JSC::importModule(exec, Identifier::fromString(&vm, resolvePath(directoryName.value(), ModuleName(moduleName))), parameters, jsUndefined());
+ auto result = JSC::importModule(exec, Identifier::fromString(vm, resolvePath(directoryName.value(), ModuleName(moduleName))), parameters, jsUndefined());
if (UNLIKELY(catchScope.exception()))
return reject(catchScope.exception());
return result;
@@ -868,7 +868,7 @@
throwException(exec, scope, createError(exec, "Could not resolve the current working directory."_s));
return { };
}
- return Identifier::fromString(&vm, resolvePath(directoryName.value(), ModuleName(key.impl())));
+ return Identifier::fromString(vm, resolvePath(directoryName.value(), ModuleName(key.impl())));
}
const Identifier referrer = referrerValue.toPropertyKey(exec);
@@ -880,7 +880,7 @@
throwException(exec, scope, createError(exec, "Could not resolve the current working directory."_s));
return { };
}
- return Identifier::fromString(&vm, resolvePath(directoryName.value(), ModuleName(key.impl())));
+ return Identifier::fromString(vm, resolvePath(directoryName.value(), ModuleName(key.impl())));
}
// If the referrer exists, we assume that the referrer is the correct absolute path.
@@ -889,7 +889,7 @@
throwException(exec, scope, createError(exec, makeString("Could not resolve the referrer name '", String(referrer.impl()), "'.")));
return { };
}
- return Identifier::fromString(&vm, resolvePath(directoryName.value(), ModuleName(key.impl())));
+ return Identifier::fromString(vm, resolvePath(directoryName.value(), ModuleName(key.impl())));
}
template<typename Vector>
@@ -996,7 +996,7 @@
if (!cacheEnabled() || !m_cachedBytecode)
return;
BytecodeCacheError error;
- RefPtr<CachedBytecode> cachedBytecode = encodeFunctionCodeBlock(*executable->vm(), codeBlock, error);
+ RefPtr<CachedBytecode> cachedBytecode = encodeFunctionCodeBlock(executable->vm(), codeBlock, error);
if (cachedBytecode && !error.isValid())
m_cachedBytecode->addFunctionUpdate(executable, kind, *cachedBytecode);
}
@@ -1208,7 +1208,7 @@
JSObject* metaProperties = constructEmptyObject(exec, globalObject->nullPrototypeObjectStructure());
RETURN_IF_EXCEPTION(scope, nullptr);
- metaProperties->putDirect(vm, Identifier::fromString(&vm, "filename"), key);
+ metaProperties->putDirect(vm, Identifier::fromString(vm, "filename"), key);
RETURN_IF_EXCEPTION(scope, nullptr);
return metaProperties;
@@ -1284,9 +1284,10 @@
EncodedJSValue JSC_HOST_CALL functionDescribe(ExecState* exec)
{
+ VM& vm = exec->vm();
if (exec->argumentCount() < 1)
return JSValue::encode(jsUndefined());
- return JSValue::encode(jsString(exec, toString(exec->argument(0))));
+ return JSValue::encode(jsString(vm, toString(exec->argument(0))));
}
EncodedJSValue JSC_HOST_CALL functionDescribeArray(ExecState* exec)
@@ -1296,8 +1297,8 @@
VM& vm = exec->vm();
JSObject* object = jsDynamicCast<JSObject*>(vm, exec->argument(0));
if (!object)
- return JSValue::encode(jsNontrivialString(exec, "<not object>"_s));
- return JSValue::encode(jsNontrivialString(exec, toString("<Butterfly: ", RawPointer(object->butterfly()), "; public length: ", object->getArrayLength(), "; vector length: ", object->getVectorLength(), ">")));
+ return JSValue::encode(jsNontrivialString(vm, "<not object>"_s));
+ return JSValue::encode(jsNontrivialString(vm, toString("<Butterfly: ", RawPointer(object->butterfly()), "; public length: ", object->getArrayLength(), "; vector length: ", object->getVectorLength(), ">")));
}
EncodedJSValue JSC_HOST_CALL functionSleepSeconds(ExecState* exec)
@@ -1420,7 +1421,7 @@
private:
void addProperty(VM& vm, const char* name, JSValue value)
{
- Identifier identifier = Identifier::fromString(&vm, name);
+ Identifier identifier = Identifier::fromString(vm, name);
putDirect(vm, identifier, value);
}
};
@@ -1480,8 +1481,7 @@
array->putDirectIndex(globalObject->globalExec(), i - 1, exec->uncheckedArgument(i));
RETURN_IF_EXCEPTION(scope, encodedJSValue());
}
- globalObject->putDirect(
- vm, Identifier::fromString(globalObject->globalExec(), "arguments"), array);
+ globalObject->putDirect(vm, Identifier::fromString(vm, "arguments"), array);
NakedPtr<Exception> exception;
StopWatch stopWatch;
@@ -1513,8 +1513,7 @@
array->putDirectIndex(globalObject->globalExec(), i - 1, exec->uncheckedArgument(i));
RETURN_IF_EXCEPTION(scope, encodedJSValue());
}
- globalObject->putDirect(
- vm, Identifier::fromString(globalObject->globalExec(), "arguments"), array);
+ globalObject->putDirect(vm, Identifier::fromString(vm, "arguments"), array);
NakedPtr<Exception> exception;
evaluate(globalObject->globalExec(), jscSource(source, exec->callerSourceOrigin()), JSValue(), exception);
@@ -1585,7 +1584,7 @@
return throwVMError(exec, scope, "Could not open file.");
if (!isBinary)
- return JSValue::encode(jsString(exec, String::fromUTF8WithLatin1Fallback(content->data(), content->length())));
+ return JSValue::encode(jsString(vm, String::fromUTF8WithLatin1Fallback(content->data(), content->length())));
Structure* structure = exec->lexicalGlobalObject()->typedArrayStructure(TypeUint8);
JSObject* result = JSUint8Array::create(vm, structure, WTFMove(content));
@@ -1671,7 +1670,7 @@
SourceOrigin sourceOrigin = state->callerSourceOrigin();
if (sourceOrigin.isNull())
return JSValue::encode(jsNull());
- return JSValue::encode(jsString(state, sourceOrigin.string()));
+ return JSValue::encode(jsString(state->vm(), sourceOrigin.string()));
}
EncodedJSValue JSC_HOST_CALL functionReadline(ExecState* exec)
@@ -1685,7 +1684,7 @@
line.append(c);
}
line.append('\0');
- return JSValue::encode(jsString(exec, line.data()));
+ return JSValue::encode(jsString(exec->vm(), line.data()));
}
EncodedJSValue JSC_HOST_CALL functionPreciseTime(ExecState*)
@@ -1843,7 +1842,7 @@
{
VM& vm = exec->vm();
GlobalObject* result = GlobalObject::create(vm, GlobalObject::createStructure(vm, jsNull()), Vector<String>());
- return JSValue::encode(result->getDirect(vm, Identifier::fromString(exec, "$")));
+ return JSValue::encode(result->getDirect(vm, Identifier::fromString(vm, "$")));
}
EncodedJSValue JSC_HOST_CALL functionDollarDetachArrayBuffer(ExecState* exec)
@@ -1860,7 +1859,7 @@
RETURN_IF_EXCEPTION(scope, encodedJSValue());
GlobalObject* globalObject = jsDynamicCast<GlobalObject*>(vm,
- exec->thisValue().get(exec, Identifier::fromString(exec, "global")));
+ exec->thisValue().get(exec, Identifier::fromString(vm, "global")));
RETURN_IF_EXCEPTION(scope, encodedJSValue());
if (!globalObject)
return JSValue::encode(throwException(exec, scope, createError(exec, "Expected global to point to a global object"_s)));
@@ -2006,7 +2005,7 @@
if (!string)
return JSValue::encode(jsNull());
- return JSValue::encode(jsString(&vm, string));
+ return JSValue::encode(jsString(vm, string));
}
EncodedJSValue JSC_HOST_CALL functionDollarAgentLeaving(ExecState*)
@@ -2031,7 +2030,7 @@
if (!string)
return JSValue::encode(jsNull());
- return JSValue::encode(jsString(&vm, string));
+ return JSValue::encode(jsString(vm, string));
}
EncodedJSValue JSC_HOST_CALL functionHeapCapacity(ExecState* exec)
@@ -2097,7 +2096,7 @@
VM& vm = exec->vm();
JSObject* optionsObject = constructEmptyObject(exec);
#define FOR_EACH_OPTION(type_, name_, defaultValue_, availability_, description_) \
- addOption(vm, optionsObject, Identifier::fromString(exec, #name_), Options::name_());
+ addOption(vm, optionsObject, Identifier::fromString(vm, #name_), Options::name_());
JSC_OPTIONS(FOR_EACH_OPTION)
#undef FOR_EACH_OPTION
return JSValue::encode(optionsObject);
@@ -2255,7 +2254,7 @@
stopWatch.stop();
if (!validSyntax)
- throwException(exec, scope, jsNontrivialString(exec, toString("SyntaxError: ", error.message(), ":", error.line())));
+ throwException(exec, scope, jsNontrivialString(vm, toString("SyntaxError: ", error.message(), ":", error.line())));
return JSValue::encode(jsNumber(stopWatch.getElapsedMS()));
}
@@ -2298,7 +2297,7 @@
jsonString = snapshotBuilder.json();
}
scope.releaseAssertNoException();
- return JSValue::encode(jsString(&vm, jsonString));
+ return JSValue::encode(jsString(vm, jsonString));
}
EncodedJSValue JSC_HOST_CALL functionResetSuperSamplerState(ExecState*)
@@ -2378,9 +2377,9 @@
if (JSObject* object = exec->argument(0).getObject()) {
if (auto* memory = jsDynamicCast<JSWebAssemblyMemory*>(vm, object))
- return JSValue::encode(jsString(&vm, makeString(memory->memory().mode())));
+ return JSValue::encode(jsString(vm, makeString(memory->memory().mode())));
if (auto* instance = jsDynamicCast<JSWebAssemblyInstance*>(vm, object))
- return JSValue::encode(jsString(&vm, makeString(instance->memoryMode())));
+ return JSValue::encode(jsString(vm, makeString(instance->memoryMode())));
}
return throwVMTypeError(exec, scope, "WebAssemblyMemoryMode expects either a WebAssembly.Memory or WebAssembly.Instance"_s);
@@ -2511,13 +2510,13 @@
else
printf("Exception: <out of memory while extracting exception string>\n");
- Identifier nameID = Identifier::fromString(globalObject->globalExec(), "name");
+ Identifier nameID = Identifier::fromString(vm, "name");
CHECK_EXCEPTION();
- Identifier fileNameID = Identifier::fromString(globalObject->globalExec(), "sourceURL");
+ Identifier fileNameID = Identifier::fromString(vm, "sourceURL");
CHECK_EXCEPTION();
- Identifier lineNumberID = Identifier::fromString(globalObject->globalExec(), "line");
+ Identifier lineNumberID = Identifier::fromString(vm, "line");
CHECK_EXCEPTION();
- Identifier stackID = Identifier::fromString(globalObject->globalExec(), "stack");
+ Identifier stackID = Identifier::fromString(vm, "stack");
CHECK_EXCEPTION();
JSValue nameValue = exception.get(globalObject->globalExec(), nameID);
@@ -2557,7 +2556,7 @@
}
ExecState* exec = globalObject->globalExec();
- JSValue exceptionClass = globalObject->get(exec, Identifier::fromString(exec, expectedExceptionName));
+ JSValue exceptionClass = globalObject->get(exec, Identifier::fromString(vm, expectedExceptionName));
if (!exceptionClass.isObject() || scope.exception()) {
printf("Expected uncaught exception with name '%s' but given exception class is not defined\n", expectedExceptionName.utf8().data());
return false;
diff --git a/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp b/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp
index 1e18e3b..c0b3161 100644
--- a/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp
+++ b/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp
@@ -77,7 +77,7 @@
#define LLINT_BEGIN_NO_SET_PC() \
VM& vm = exec->vm(); \
- NativeCallFrameTracer tracer(&vm, exec); \
+ NativeCallFrameTracer tracer(vm, exec); \
auto throwScope = DECLARE_THROW_SCOPE(vm)
#ifndef NDEBUG
@@ -529,7 +529,7 @@
// It's ok to create the NativeCallFrameTracer here before we
// convertToStackOverflowFrame() because this function is always called
// after the frame has been propulated with a proper CodeBlock and callee.
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
LLINT_SET_PC_FOR_STUBS();
@@ -1441,7 +1441,7 @@
ASSERT(callType != CallType::JS);
if (callType == CallType::Host) {
- NativeCallFrameTracer tracer(&vm, execCallee);
+ NativeCallFrameTracer tracer(vm, execCallee);
execCallee->setCallee(asObject(callee));
vm.hostCallReturnValue = JSValue::decode(callData.native.function(execCallee));
LLINT_CALL_RETURN(execCallee, execCallee, LLInt::getCodePtr(getHostCallReturnValue), CFunctionPtrTag);
@@ -1461,7 +1461,7 @@
ASSERT(constructType != ConstructType::JS);
if (constructType == ConstructType::Host) {
- NativeCallFrameTracer tracer(&vm, execCallee);
+ NativeCallFrameTracer tracer(vm, execCallee);
execCallee->setCallee(asObject(callee));
vm.hostCallReturnValue = JSValue::decode(constructData.native.function(execCallee));
LLINT_CALL_RETURN(execCallee, execCallee, LLInt::getCodePtr(getHostCallReturnValue), CFunctionPtrTag);
@@ -1777,7 +1777,7 @@
{
LLINT_BEGIN_NO_SET_PC();
UNUSED_PARAM(throwScope);
- genericUnwind(&vm, exec);
+ genericUnwind(vm, exec);
LLINT_END_IMPL();
}
diff --git a/Source/JavaScriptCore/parser/ASTBuilder.h b/Source/JavaScriptCore/parser/ASTBuilder.h
index f70cfeb..d588211 100644
--- a/Source/JavaScriptCore/parser/ASTBuilder.h
+++ b/Source/JavaScriptCore/parser/ASTBuilder.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010, 2013, 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2010-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
@@ -78,7 +78,7 @@
Operator m_op;
};
public:
- ASTBuilder(VM* vm, ParserArena& parserArena, SourceCode* sourceCode)
+ ASTBuilder(VM& vm, ParserArena& parserArena, SourceCode* sourceCode)
: m_vm(vm)
, m_parserArena(parserArena)
, m_sourceCode(sourceCode)
@@ -196,11 +196,11 @@
bool isImportMeta(ExpressionNode* node) { return node->isImportMeta(); }
ExpressionNode* createResolve(const JSTokenLocation& location, const Identifier& ident, const JSTextPosition& start, const JSTextPosition& end)
{
- if (m_vm->propertyNames->arguments == ident)
+ if (m_vm.propertyNames->arguments == ident)
usesArguments();
if (ident.isSymbol()) {
- if (BytecodeIntrinsicNode::EmitterType emitter = m_vm->bytecodeIntrinsicRegistry().lookup(ident))
+ if (BytecodeIntrinsicNode::EmitterType emitter = m_vm.bytecodeIntrinsicRegistry().lookup(ident))
return new (m_parserArena) BytecodeIntrinsicNode(BytecodeIntrinsicNode::Type::Constant, location, emitter, ident, nullptr, start, start, end);
}
@@ -482,7 +482,7 @@
functionInfo.body->setLoc(functionInfo.startLine, functionInfo.endLine, location.startOffset, location.lineStartOffset);
functionInfo.body->setEcmaName(*name);
SourceCode source = m_sourceCode->subExpression(functionInfo.startOffset, functionInfo.endOffset, functionInfo.startLine, functionInfo.parametersStartColumn);
- MethodDefinitionNode* methodDef = new (m_parserArena) MethodDefinitionNode(location, m_vm->propertyNames->nullIdentifier, functionInfo.body, source);
+ MethodDefinitionNode* methodDef = new (m_parserArena) MethodDefinitionNode(location, m_vm.propertyNames->nullIdentifier, functionInfo.body, source);
return new (m_parserArena) PropertyNode(*name, methodDef, type, PropertyNode::Unknown, SuperBinding::Needed, tag);
}
@@ -492,17 +492,17 @@
ASSERT(name);
functionInfo.body->setLoc(functionInfo.startLine, functionInfo.endLine, location.startOffset, location.lineStartOffset);
SourceCode source = m_sourceCode->subExpression(functionInfo.startOffset, functionInfo.endOffset, functionInfo.startLine, functionInfo.parametersStartColumn);
- MethodDefinitionNode* methodDef = new (m_parserArena) MethodDefinitionNode(location, m_vm->propertyNames->nullIdentifier, functionInfo.body, source);
+ MethodDefinitionNode* methodDef = new (m_parserArena) MethodDefinitionNode(location, m_vm.propertyNames->nullIdentifier, functionInfo.body, source);
return new (m_parserArena) PropertyNode(name, methodDef, type, PropertyNode::Unknown, SuperBinding::Needed, tag);
}
- NEVER_INLINE PropertyNode* createGetterOrSetterProperty(VM* vm, ParserArena& parserArena, const JSTokenLocation& location, PropertyNode::Type type, bool,
+ NEVER_INLINE PropertyNode* createGetterOrSetterProperty(VM& vm, ParserArena& parserArena, const JSTokenLocation& location, PropertyNode::Type type, bool,
double name, const ParserFunctionInfo<ASTBuilder>& functionInfo, ClassElementTag tag)
{
functionInfo.body->setLoc(functionInfo.startLine, functionInfo.endLine, location.startOffset, location.lineStartOffset);
const Identifier& ident = parserArena.identifierArena().makeNumericIdentifier(vm, name);
SourceCode source = m_sourceCode->subExpression(functionInfo.startOffset, functionInfo.endOffset, functionInfo.startLine, functionInfo.parametersStartColumn);
- MethodDefinitionNode* methodDef = new (m_parserArena) MethodDefinitionNode(location, vm->propertyNames->nullIdentifier, functionInfo.body, source);
+ MethodDefinitionNode* methodDef = new (m_parserArena) MethodDefinitionNode(location, vm.propertyNames->nullIdentifier, functionInfo.body, source);
return new (m_parserArena) PropertyNode(ident, methodDef, type, PropertyNode::Unknown, SuperBinding::Needed, tag);
}
@@ -521,7 +521,7 @@
{
return new (m_parserArena) PropertyNode(node, type, putType, superBinding, tag);
}
- PropertyNode* createProperty(VM* vm, ParserArena& parserArena, double propertyName, ExpressionNode* node, PropertyNode::Type type, PropertyNode::PutType putType, bool, SuperBinding superBinding, ClassElementTag tag)
+ PropertyNode* createProperty(VM& vm, ParserArena& parserArena, double propertyName, ExpressionNode* node, PropertyNode::Type type, PropertyNode::PutType putType, bool, SuperBinding superBinding, ClassElementTag tag)
{
return new (m_parserArena) PropertyNode(parserArena.identifierArena().makeNumericIdentifier(vm, propertyName), node, type, putType, superBinding, tag);
}
@@ -558,7 +558,7 @@
{
FuncDeclNode* decl = new (m_parserArena) FuncDeclNode(location, *functionInfo.name, functionInfo.body,
m_sourceCode->subExpression(functionInfo.startOffset, functionInfo.endOffset, functionInfo.startLine, functionInfo.parametersStartColumn));
- if (*functionInfo.name == m_vm->propertyNames->arguments)
+ if (*functionInfo.name == m_vm.propertyNames->arguments)
usesArguments();
functionInfo.body->setLoc(functionInfo.startLine, functionInfo.endLine, location.startOffset, location.lineStartOffset);
return decl;
@@ -1133,7 +1133,7 @@
static_cast<ClassExprNode*>(defaultValue)->setEcmaName(ident);
}
- VM* m_vm;
+ VM& m_vm;
ParserArena& m_parserArena;
SourceCode* m_sourceCode;
Scope m_scope;
@@ -1405,7 +1405,7 @@
if (func->isResolveNode()) {
ResolveNode* resolve = static_cast<ResolveNode*>(func);
const Identifier& identifier = resolve->identifier();
- if (identifier == m_vm->propertyNames->eval) {
+ if (identifier == m_vm.propertyNames->eval) {
usesEval();
return new (m_parserArena) EvalFunctionCallNode(location, args, divot, divotStart, divotEnd);
}
@@ -1420,9 +1420,9 @@
ASSERT(func->isDotAccessorNode());
DotAccessorNode* dot = static_cast<DotAccessorNode*>(func);
FunctionCallDotNode* node = nullptr;
- if (!previousBaseWasSuper && (dot->identifier() == m_vm->propertyNames->builtinNames().callPublicName() || dot->identifier() == m_vm->propertyNames->builtinNames().callPrivateName()))
+ if (!previousBaseWasSuper && (dot->identifier() == m_vm.propertyNames->builtinNames().callPublicName() || dot->identifier() == m_vm.propertyNames->builtinNames().callPrivateName()))
node = new (m_parserArena) CallFunctionCallDotNode(location, dot->base(), dot->identifier(), args, divot, divotStart, divotEnd, callOrApplyChildDepth);
- else if (!previousBaseWasSuper && (dot->identifier() == m_vm->propertyNames->builtinNames().applyPublicName() || dot->identifier() == m_vm->propertyNames->builtinNames().applyPrivateName())) {
+ else if (!previousBaseWasSuper && (dot->identifier() == m_vm.propertyNames->builtinNames().applyPublicName() || dot->identifier() == m_vm.propertyNames->builtinNames().applyPrivateName())) {
// FIXME: This check is only needed because we haven't taught the bytecode generator to inline
// Reflect.apply yet. See https://bugs.webkit.org/show_bug.cgi?id=190668.
if (!dot->base()->isResolveNode() || static_cast<ResolveNode*>(dot->base())->identifier() != "Reflect")
diff --git a/Source/JavaScriptCore/parser/Lexer.cpp b/Source/JavaScriptCore/parser/Lexer.cpp
index 301fa10..7d70319 100644
--- a/Source/JavaScriptCore/parser/Lexer.cpp
+++ b/Source/JavaScriptCore/parser/Lexer.cpp
@@ -1,6 +1,6 @@
/*
* Copyright (C) 1999-2000 Harri Porten (porten@kde.org)
- * Copyright (C) 2006-2017 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2006-2019 Apple Inc. All Rights Reserved.
* Copyright (C) 2007 Cameron Zwarich (cwzwarich@uwaterloo.ca)
* Copyright (C) 2010 Zoltan Herczeg (zherczeg@inf.u-szeged.hu)
* Copyright (C) 2012 Mathias Bynens (mathias@qiwi.be)
@@ -493,7 +493,7 @@
};
template <typename T>
-Lexer<T>::Lexer(VM* vm, JSParserBuiltinMode builtinMode, JSParserScriptMode scriptMode)
+Lexer<T>::Lexer(VM& vm, JSParserBuiltinMode builtinMode, JSParserScriptMode scriptMode)
: m_isReparsingFunction(false)
, m_vm(vm)
, m_parsingBuiltinFunction(builtinMode == JSParserBuiltinMode::Builtin)
@@ -960,14 +960,14 @@
int identifierLength = currentSourcePtr() - identifierStart;
ident = makeIdentifier(identifierStart, identifierLength);
if (m_parsingBuiltinFunction) {
- if (!isSafeBuiltinIdentifier(*m_vm, ident) && !isPrivateName) {
+ if (!isSafeBuiltinIdentifier(m_vm, ident) && !isPrivateName) {
m_lexErrorMessage = makeString("The use of '", ident->string(), "' is disallowed in builtin functions.");
return ERRORTOK;
}
if (isPrivateName)
- ident = &m_arena->makeIdentifier(m_vm, m_vm->propertyNames->lookUpPrivateName(*ident));
- else if (*ident == m_vm->propertyNames->undefinedKeyword)
- tokenData->ident = &m_vm->propertyNames->undefinedPrivateName;
+ ident = &m_arena->makeIdentifier(m_vm, m_vm.propertyNames->lookUpPrivateName(*ident));
+ else if (*ident == m_vm.propertyNames->undefinedKeyword)
+ tokenData->ident = &m_vm.propertyNames->undefinedPrivateName;
if (!ident)
return INVALID_PRIVATE_NAME_ERRORTOK;
}
@@ -1038,14 +1038,14 @@
else
ident = makeIdentifier(identifierStart, identifierLength);
if (m_parsingBuiltinFunction) {
- if (!isSafeBuiltinIdentifier(*m_vm, ident) && !isPrivateName) {
+ if (!isSafeBuiltinIdentifier(m_vm, ident) && !isPrivateName) {
m_lexErrorMessage = makeString("The use of '", ident->string(), "' is disallowed in builtin functions.");
return ERRORTOK;
}
if (isPrivateName)
- ident = &m_arena->makeIdentifier(m_vm, m_vm->propertyNames->lookUpPrivateName(*ident));
- else if (*ident == m_vm->propertyNames->undefinedKeyword)
- tokenData->ident = &m_vm->propertyNames->undefinedPrivateName;
+ ident = &m_arena->makeIdentifier(m_vm, m_vm.propertyNames->lookUpPrivateName(*ident));
+ else if (*ident == m_vm.propertyNames->undefinedKeyword)
+ tokenData->ident = &m_vm.propertyNames->undefinedPrivateName;
if (!ident)
return INVALID_PRIVATE_NAME_ERRORTOK;
}
diff --git a/Source/JavaScriptCore/parser/Lexer.h b/Source/JavaScriptCore/parser/Lexer.h
index d51f2c0..e702684 100644
--- a/Source/JavaScriptCore/parser/Lexer.h
+++ b/Source/JavaScriptCore/parser/Lexer.h
@@ -1,6 +1,6 @@
/*
* Copyright (C) 1999-2000 Harri Porten (porten@kde.org)
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012, 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2002-2019 Apple Inc. All rights reserved.
* Copyright (C) 2010 Zoltan Herczeg (zherczeg@inf.u-szeged.hu)
*
* This library is free software; you can redistribute it and/or
@@ -50,7 +50,7 @@
WTF_MAKE_FAST_ALLOCATED;
public:
- Lexer(VM*, JSParserBuiltinMode, JSParserScriptMode);
+ Lexer(VM&, JSParserBuiltinMode, JSParserScriptMode);
~Lexer();
// Character manipulation functions.
@@ -227,7 +227,7 @@
IdentifierArena* m_arena;
- VM* m_vm;
+ VM& m_vm;
bool m_parsingBuiltinFunction;
JSParserScriptMode m_scriptMode;
};
@@ -392,7 +392,7 @@
tokenRecord->m_endPosition = currentPosition();
#if !ASSERT_DISABLED
if (m_parsingBuiltinFunction) {
- if (!isSafeBuiltinIdentifier(*m_vm, tokenData->ident))
+ if (!isSafeBuiltinIdentifier(m_vm, tokenData->ident))
return ERRORTOK;
}
#endif
diff --git a/Source/JavaScriptCore/parser/ModuleAnalyzer.cpp b/Source/JavaScriptCore/parser/ModuleAnalyzer.cpp
index 55288ee..2e61c90 100644
--- a/Source/JavaScriptCore/parser/ModuleAnalyzer.cpp
+++ b/Source/JavaScriptCore/parser/ModuleAnalyzer.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015-2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-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
@@ -36,8 +36,8 @@
ModuleAnalyzer::ModuleAnalyzer(ExecState* exec, const Identifier& moduleKey, const SourceCode& sourceCode, const VariableEnvironment& declaredVariables, const VariableEnvironment& lexicalVariables)
- : m_vm(&exec->vm())
- , m_moduleRecord(*m_vm, JSModuleRecord::create(exec, *m_vm, exec->lexicalGlobalObject()->moduleRecordStructure(), moduleKey, sourceCode, declaredVariables, lexicalVariables))
+ : m_vm(exec->vm())
+ , m_moduleRecord(m_vm, JSModuleRecord::create(exec, m_vm, exec->lexicalGlobalObject()->moduleRecordStructure(), moduleKey, sourceCode, declaredVariables, lexicalVariables))
{
}
diff --git a/Source/JavaScriptCore/parser/ModuleAnalyzer.h b/Source/JavaScriptCore/parser/ModuleAnalyzer.h
index cdc7e00..6f63ac6 100644
--- a/Source/JavaScriptCore/parser/ModuleAnalyzer.h
+++ b/Source/JavaScriptCore/parser/ModuleAnalyzer.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-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
@@ -39,14 +39,14 @@
JSModuleRecord* analyze(ModuleProgramNode&);
- VM& vm() { return *m_vm; }
+ VM& vm() { return m_vm; }
JSModuleRecord* moduleRecord() { return m_moduleRecord.get(); }
private:
void exportVariable(ModuleProgramNode&, const RefPtr<UniquedStringImpl>&, const VariableEnvironmentEntry&);
- VM* m_vm;
+ VM& m_vm;
Strong<JSModuleRecord> m_moduleRecord;
};
diff --git a/Source/JavaScriptCore/parser/Parser.cpp b/Source/JavaScriptCore/parser/Parser.cpp
index 16e63743..f5c1913 100644
--- a/Source/JavaScriptCore/parser/Parser.cpp
+++ b/Source/JavaScriptCore/parser/Parser.cpp
@@ -126,7 +126,7 @@
}
template <typename LexerType>
-Parser<LexerType>::Parser(VM* vm, const SourceCode& source, JSParserBuiltinMode builtinMode, JSParserStrictMode strictMode, JSParserScriptMode scriptMode, SourceParseMode parseMode, SuperBinding superBinding, ConstructorKind defaultConstructorKind, DerivedContextType derivedContextType, bool isEvalContext, EvalContextType evalContextType, DebuggerParseData* debuggerParseData)
+Parser<LexerType>::Parser(VM& vm, const SourceCode& source, JSParserBuiltinMode builtinMode, JSParserStrictMode strictMode, JSParserScriptMode scriptMode, SourceParseMode parseMode, SuperBinding superBinding, ConstructorKind defaultConstructorKind, DerivedContextType derivedContextType, bool isEvalContext, EvalContextType evalContextType, DebuggerParseData* debuggerParseData)
: m_vm(vm)
, m_source(&source)
, m_hasStackOverflow(false)
@@ -146,7 +146,7 @@
m_token.m_location.startOffset = source.startOffset();
m_token.m_location.endOffset = source.startOffset();
m_token.m_location.lineStartOffset = source.startOffset();
- m_functionCache = vm->addSourceProviderCache(source.provider());
+ m_functionCache = vm.addSourceProviderCache(source.provider());
m_expressionErrorClassifier = nullptr;
ScopeRef scope = pushScope();
@@ -212,7 +212,7 @@
{
String parseError = String();
- ASTBuilder context(const_cast<VM*>(m_vm), m_parserArena, const_cast<SourceCode*>(m_source));
+ ASTBuilder context(const_cast<VM&>(m_vm), m_parserArena, const_cast<SourceCode*>(m_source));
ScopeRef scope = currentScope();
scope->setIsLexicalScope();
SetForScope<FunctionParsePhase> functionParsePhasePoisoner(m_parserState.functionParsePhase, FunctionParsePhase::Body);
@@ -276,7 +276,7 @@
varDeclarations.markVariableAsCaptured(entry);
if (isGeneratorWrapperParseMode(parseMode) || isAsyncFunctionOrAsyncGeneratorWrapperParseMode(parseMode)) {
- if (scope->usedVariablesContains(m_vm->propertyNames->arguments.impl()))
+ if (scope->usedVariablesContains(m_vm.propertyNames->arguments.impl()))
context.propagateArgumentsUse();
}
@@ -294,7 +294,7 @@
const HashSet<UniquedStringImpl*>& closedVariableCandidates = scope->closedVariableCandidates();
for (UniquedStringImpl* candidate : closedVariableCandidates) {
// FIXME: We allow async to leak because it appearing as a closed variable is a side effect of trying to parse async arrow functions.
- if (!lexicalVariables.contains(candidate) && !varDeclarations.contains(candidate) && !candidate->isSymbol() && candidate != m_vm->propertyNames->async.impl()) {
+ if (!lexicalVariables.contains(candidate) && !varDeclarations.contains(candidate) && !candidate->isSymbol() && candidate != m_vm.propertyNames->async.impl()) {
dataLog("Bad global capture in builtin: '", candidate, "'\n");
dataLog(m_source->view());
CRASH();
@@ -330,7 +330,7 @@
next();
isArrowFunction = match(ARROWFUNCTION);
} else {
- SyntaxChecker syntaxChecker(const_cast<VM*>(m_vm), m_lexer.get());
+ SyntaxChecker syntaxChecker(const_cast<VM&>(m_vm), m_lexer.get());
// We make fake scope, otherwise parseFormalParameters will add variable to current scope that lead to errors
AutoPopScopeRef fakeScope(this, pushScope());
fakeScope->setSourceParseMode(SourceParseMode::ArrowFunctionMode);
@@ -377,19 +377,19 @@
if (shouldCheckForUseStrict) {
if (directive) {
// "use strict" must be the exact literal without escape sequences or line continuation.
- if (directiveLiteralLength == lengthOfUseStrictLiteral && m_vm->propertyNames->useStrictIdentifier == *directive) {
+ if (directiveLiteralLength == lengthOfUseStrictLiteral && m_vm.propertyNames->useStrictIdentifier == *directive) {
setStrictMode();
shouldCheckForUseStrict = false; // We saw "use strict", there is no need to keep checking for it.
if (!isValidStrictMode()) {
if (m_parserState.lastFunctionName) {
- if (m_vm->propertyNames->arguments == *m_parserState.lastFunctionName)
+ if (m_vm.propertyNames->arguments == *m_parserState.lastFunctionName)
semanticFail("Cannot name a function 'arguments' in strict mode");
- if (m_vm->propertyNames->eval == *m_parserState.lastFunctionName)
+ if (m_vm.propertyNames->eval == *m_parserState.lastFunctionName)
semanticFail("Cannot name a function 'eval' in strict mode");
}
- if (hasDeclaredVariable(m_vm->propertyNames->arguments))
+ if (hasDeclaredVariable(m_vm.propertyNames->arguments))
semanticFail("Cannot declare a variable named 'arguments' in strict mode");
- if (hasDeclaredVariable(m_vm->propertyNames->eval))
+ if (hasDeclaredVariable(m_vm.propertyNames->eval))
semanticFail("Cannot declare a variable named 'eval' in strict mode");
semanticFailIfTrue(currentScope()->hasNonSimpleParameterList(), "'use strict' directive not allowed inside a function with a non-simple parameter list");
semanticFailIfFalse(isValidStrictMode(), "Invalid parameters or function name in strict mode");
@@ -421,7 +421,7 @@
template <class TreeBuilder> TreeSourceElements Parser<LexerType>::parseModuleSourceElements(TreeBuilder& context, SourceParseMode parseMode)
{
TreeSourceElements sourceElements = context.createSourceElements();
- SyntaxChecker syntaxChecker(const_cast<VM*>(m_vm), m_lexer.get());
+ SyntaxChecker syntaxChecker(const_cast<VM&>(m_vm), m_lexer.get());
while (true) {
TreeStatement statement = 0;
@@ -500,7 +500,7 @@
int parametersStart = m_token.m_location.startOffset;
ParserFunctionInfo<TreeBuilder> info;
- info.name = &m_vm->propertyNames->nullIdentifier;
+ info.name = &m_vm.propertyNames->nullIdentifier;
createGeneratorParameters(context, info.parameterCount);
info.startOffset = parametersStart;
info.startLine = tokenLine();
@@ -511,7 +511,7 @@
generatorBodyScope->setConstructorKind(ConstructorKind::None);
generatorBodyScope->setExpectedSuperBinding(m_superBinding);
- SyntaxChecker generatorFunctionContext(const_cast<VM*>(m_vm), m_lexer.get());
+ SyntaxChecker generatorFunctionContext(const_cast<VM&>(m_vm), m_lexer.get());
failIfFalse(parseSourceElements(generatorFunctionContext, mode), "Cannot parse the body of a generator");
popScope(generatorBodyScope, TreeBuilder::NeedsFreeVariableInfo);
}
@@ -542,7 +542,7 @@
int parametersStart = m_token.m_location.startOffset;
ParserFunctionInfo<TreeBuilder> info;
- info.name = &m_vm->propertyNames->nullIdentifier;
+ info.name = &m_vm.propertyNames->nullIdentifier;
createGeneratorParameters(context, info.parameterCount);
info.startOffset = parametersStart;
info.startLine = tokenLine();
@@ -552,7 +552,7 @@
{
AutoPopScopeRef asyncFunctionBodyScope(this, pushScope());
asyncFunctionBodyScope->setSourceParseMode(innerParseMode);
- SyntaxChecker syntaxChecker(const_cast<VM*>(m_vm), m_lexer.get());
+ SyntaxChecker syntaxChecker(const_cast<VM&>(m_vm), m_lexer.get());
if (isArrowFunctionBodyExpression) {
if (m_debuggerParseData)
failIfFalse(parseArrowFunctionSingleExpressionBodySourceElements(context), "Cannot parse the body of async arrow function");
@@ -593,7 +593,7 @@
int parametersStart = m_token.m_location.startOffset;
ParserFunctionInfo<TreeBuilder> info;
- info.name = &m_vm->propertyNames->nullIdentifier;
+ info.name = &m_vm.propertyNames->nullIdentifier;
createGeneratorParameters(context, info.parameterCount);
info.startOffset = parametersStart;
info.startLine = tokenLine();
@@ -601,7 +601,7 @@
{
AutoPopScopeRef asyncFunctionBodyScope(this, pushScope());
asyncFunctionBodyScope->setSourceParseMode(innerParseMode);
- SyntaxChecker syntaxChecker(const_cast<VM*>(m_vm), m_lexer.get());
+ SyntaxChecker syntaxChecker(const_cast<VM&>(m_vm), m_lexer.get());
if (isArrowFunctionBodyExpression) {
if (m_debuggerParseData)
failIfFalse(parseArrowFunctionSingleExpressionBodySourceElements(context), "Cannot parse the body of async arrow function");
@@ -638,7 +638,7 @@
statement = parseFunctionDeclaration(context, ExportType::NotExported, DeclarationDefaultContext::Standard, functionConstructorParametersEndPosition);
break;
case IDENT:
- if (*m_token.m_data.ident == m_vm->propertyNames->async && !m_token.m_data.escaped) {
+ if (*m_token.m_data.ident == m_vm.propertyNames->async && !m_token.m_data.escaped) {
next();
failIfFalse(match(FUNCTION) && !m_lexer->hasLineTerminatorBeforeToken(), "Cannot parse the async function");
statement = parseAsyncFunctionDeclaration(context, ExportType::NotExported, DeclarationDefaultContext::Standard, functionConstructorParametersEndPosition);
@@ -707,7 +707,7 @@
result = parseFunctionDeclaration(context);
break;
case IDENT:
- if (UNLIKELY(*m_token.m_data.ident == m_vm->propertyNames->async && !m_token.m_data.escaped)) {
+ if (UNLIKELY(*m_token.m_data.ident == m_vm.propertyNames->async && !m_token.m_data.escaped)) {
// Eagerly parse as AsyncFunctionDeclaration. This is the uncommon case,
// but could be mistakenly parsed as an AsyncFunctionExpression.
SavePoint savePoint = createSavePoint();
@@ -1040,7 +1040,7 @@
}
if (strictMode() && m_parserState.lastIdentifier && context.isResolve(element)) {
- bool isEvalOrArguments = m_vm->propertyNames->eval == *m_parserState.lastIdentifier || m_vm->propertyNames->arguments == *m_parserState.lastIdentifier;
+ bool isEvalOrArguments = m_vm.propertyNames->eval == *m_parserState.lastIdentifier || m_vm.propertyNames->arguments == *m_parserState.lastIdentifier;
if (isEvalOrArguments && strictMode())
reclassifyExpressionError(ErrorIndicatesPattern, ErrorIndicatesNothing);
failIfTrueIfStrict(isEvalOrArguments, "Cannot modify '", m_parserState.lastIdentifier->impl(), "' in strict mode");
@@ -1068,7 +1068,7 @@
semanticFailIfFalse(element && context.isAssignmentLocation(element), "Invalid destructuring assignment target");
if (strictMode() && m_parserState.lastIdentifier && context.isResolve(element)) {
- bool isEvalOrArguments = m_vm->propertyNames->eval == *m_parserState.lastIdentifier || m_vm->propertyNames->arguments == *m_parserState.lastIdentifier;
+ bool isEvalOrArguments = m_vm.propertyNames->eval == *m_parserState.lastIdentifier || m_vm.propertyNames->arguments == *m_parserState.lastIdentifier;
failIfTrueIfStrict(isEvalOrArguments, "Cannot modify '", m_parserState.lastIdentifier->impl(), "' in strict mode");
}
@@ -1196,7 +1196,7 @@
propagateError();
if (!innerPattern)
return 0;
- context.appendObjectPatternRestEntry(*m_vm, objectPattern, location, innerPattern);
+ context.appendObjectPatternRestEntry(m_vm, objectPattern, location, innerPattern);
restElementWasFound = true;
context.setContainsObjectRestElement(objectPattern, restElementWasFound);
break;
@@ -1215,7 +1215,7 @@
innerPattern = parseBindingOrAssignmentElement(context, kind, exportType, duplicateIdentifier, hasDestructuringPattern, bindingContext, depth + 1);
else {
if (kind == DestructuringKind::DestructureToExpressions) {
- bool isEvalOrArguments = m_vm->propertyNames->eval == *propertyName || m_vm->propertyNames->arguments == *propertyName;
+ bool isEvalOrArguments = m_vm.propertyNames->eval == *propertyName || m_vm.propertyNames->arguments == *propertyName;
if (isEvalOrArguments && strictMode())
reclassifyExpressionError(ErrorIndicatesPattern, ErrorIndicatesNothing);
failIfTrueIfStrict(isEvalOrArguments, "Cannot modify '", propertyName->impl(), "' in strict mode");
@@ -1228,7 +1228,7 @@
switch (m_token.m_type) {
case DOUBLE:
case INTEGER:
- propertyName = &m_parserArena.identifierArena().makeNumericIdentifier(const_cast<VM*>(m_vm), m_token.m_data.doubleValue);
+ propertyName = &m_parserArena.identifierArena().makeNumericIdentifier(const_cast<VM&>(m_vm), m_token.m_data.doubleValue);
break;
case STRING:
propertyName = m_token.m_data.ident;
@@ -1267,7 +1267,7 @@
TreeExpression defaultValue = parseDefaultValueForDestructuringPattern(context);
propagateError();
if (propertyExpression) {
- context.appendObjectPatternEntry(*m_vm, objectPattern, location, propertyExpression, innerPattern, defaultValue);
+ context.appendObjectPatternEntry(m_vm, objectPattern, location, propertyExpression, innerPattern, defaultValue);
context.setContainsComputedProperty(objectPattern, true);
} else {
ASSERT(propertyName);
@@ -1398,7 +1398,7 @@
JSTextPosition inLocation = tokenStartPosition();
bool isOfEnumeration = false;
if (!match(INTOKEN)) {
- failIfFalse(matchContextualKeyword(m_vm->propertyNames->of), "Expected either 'in' or 'of' in enumeration syntax");
+ failIfFalse(matchContextualKeyword(m_vm.propertyNames->of), "Expected either 'in' or 'of' in enumeration syntax");
isOfEnumeration = true;
next();
} else {
@@ -1448,7 +1448,7 @@
declsStart = tokenStartPosition();
pattern = tryParseDestructuringPatternExpression(context, AssignmentContext::DeclarationStatement);
declsEnd = lastTokenEndPosition();
- if (pattern && (match(INTOKEN) || matchContextualKeyword(m_vm->propertyNames->of)))
+ if (pattern && (match(INTOKEN) || matchContextualKeyword(m_vm.propertyNames->of)))
goto enumerationLoop;
pattern = TreeDestructuringPattern(0);
restoreSavePoint(savePoint);
@@ -1503,7 +1503,7 @@
failIfFalse(nonLHSCount == m_parserState.nonLHSCount, "Expected a reference on the left hand side of an enumeration statement");
bool isOfEnumeration = false;
if (!match(INTOKEN)) {
- failIfFalse(matchContextualKeyword(m_vm->propertyNames->of), "Expected either 'in' or 'of' in enumeration syntax");
+ failIfFalse(matchContextualKeyword(m_vm.propertyNames->of), "Expected either 'in' or 'of' in enumeration syntax");
isOfEnumeration = true;
next();
} else {
@@ -1558,7 +1558,7 @@
if (autoSemiColon()) {
semanticFailIfFalse(breakIsValid(), "'break' is only valid inside a switch or loop statement");
- return context.createBreakStatement(location, &m_vm->propertyNames->nullIdentifier, start, end);
+ return context.createBreakStatement(location, &m_vm.propertyNames->nullIdentifier, start, end);
}
failIfFalse(matchSpecIdentifier(), "Expected an identifier as the target for a break statement");
const Identifier* ident = m_token.m_data.ident;
@@ -1580,7 +1580,7 @@
if (autoSemiColon()) {
semanticFailIfFalse(continueIsValid(), "'continue' is only valid inside a loop statement");
- return context.createContinueStatement(location, &m_vm->propertyNames->nullIdentifier, start, end);
+ return context.createContinueStatement(location, &m_vm.propertyNames->nullIdentifier, start, end);
}
failIfFalse(matchSpecIdentifier(), "Expected an identifier as the target for a continue statement");
const Identifier* ident = m_token.m_data.ident;
@@ -1950,7 +1950,7 @@
goto defaultCase;
}
case IDENT:
- if (UNLIKELY(*m_token.m_data.ident == m_vm->propertyNames->async && !m_token.m_data.escaped)) {
+ if (UNLIKELY(*m_token.m_data.ident == m_vm.propertyNames->async && !m_token.m_data.escaped)) {
if (maybeParseAsyncFunctionDeclarationStatement(context, result, parentAllowsFunctionDeclarationAsStatement))
break;
}
@@ -2039,7 +2039,7 @@
template <typename LexerType>
template <class TreeBuilder> bool Parser<LexerType>::maybeParseAsyncFunctionDeclarationStatement(TreeBuilder& context, TreeStatement& result, bool parentAllowsFunctionDeclarationAsStatement)
{
- ASSERT(matchContextualKeyword(m_vm->propertyNames->async));
+ ASSERT(matchContextualKeyword(m_vm.propertyNames->async));
SavePoint savePoint = createSavePoint();
next();
if (match(FUNCTION) && !m_lexer->hasLineTerminatorBeforeToken()) {
@@ -2300,15 +2300,15 @@
};
// @generator
- addParameter(m_vm->propertyNames->generatorPrivateName);
+ addParameter(m_vm.propertyNames->generatorPrivateName);
// @generatorState
- addParameter(m_vm->propertyNames->generatorStatePrivateName);
+ addParameter(m_vm.propertyNames->generatorStatePrivateName);
// @generatorValue
- addParameter(m_vm->propertyNames->generatorValuePrivateName);
+ addParameter(m_vm.propertyNames->generatorValuePrivateName);
// @generatorResumeMode
- addParameter(m_vm->propertyNames->generatorResumeModePrivateName);
+ addParameter(m_vm.propertyNames->generatorResumeModePrivateName);
// @generatorFrame
- addParameter(m_vm->propertyNames->generatorFramePrivateName);
+ addParameter(m_vm.propertyNames->generatorFramePrivateName);
return parameters;
}
@@ -2412,7 +2412,7 @@
return false;
};
- SyntaxChecker syntaxChecker(const_cast<VM*>(m_vm), m_lexer.get());
+ SyntaxChecker syntaxChecker(const_cast<VM&>(m_vm), m_lexer.get());
if (UNLIKELY((SourceParseModeSet(SourceParseMode::ArrowFunctionMode, SourceParseMode::AsyncArrowFunctionMode).contains(mode)))) {
startLocation = tokenLocation();
@@ -2589,8 +2589,8 @@
if (functionScope->strictMode() && requirements != FunctionNameRequirements::Unnamed) {
ASSERT(functionInfo.name);
RELEASE_ASSERT(SourceParseModeSet(SourceParseMode::NormalFunctionMode, SourceParseMode::MethodMode, SourceParseMode::ArrowFunctionMode, SourceParseMode::GeneratorBodyMode, SourceParseMode::GeneratorWrapperFunctionMode).contains(mode) || isAsyncFunctionOrAsyncGeneratorWrapperParseMode(mode));
- semanticFailIfTrue(m_vm->propertyNames->arguments == *functionInfo.name, "'", functionInfo.name->impl(), "' is not a valid function name in strict mode");
- semanticFailIfTrue(m_vm->propertyNames->eval == *functionInfo.name, "'", functionInfo.name->impl(), "' is not a valid function name in strict mode");
+ semanticFailIfTrue(m_vm.propertyNames->arguments == *functionInfo.name, "'", functionInfo.name->impl(), "' is not a valid function name in strict mode");
+ semanticFailIfTrue(m_vm.propertyNames->eval == *functionInfo.name, "'", functionInfo.name->impl(), "' is not a valid function name in strict mode");
}
JSTokenLocation location = JSTokenLocation(m_token.m_location);
@@ -2692,7 +2692,7 @@
//
// In this case, we use "*default*" as this function declaration's name.
requirements = FunctionNameRequirements::None;
- functionInfo.name = &m_vm->propertyNames->starDefaultPrivateName;
+ functionInfo.name = &m_vm.propertyNames->starDefaultPrivateName;
}
failIfFalse((parseFunctionInfo(context, requirements, parseMode, true, ConstructorKind::None, SuperBinding::NotNeeded, functionKeywordStart, functionInfo, FunctionDefinitionType::Declaration, functionConstructorParametersEndPosition)), "Cannot parse this function");
@@ -2750,7 +2750,7 @@
//
// In this case, we use "*default*" as this function declaration's name.
requirements = FunctionNameRequirements::None;
- functionInfo.name = &m_vm->propertyNames->starDefaultPrivateName;
+ functionInfo.name = &m_vm.propertyNames->starDefaultPrivateName;
}
failIfFalse((parseFunctionInfo(context, requirements, parseMode, true, ConstructorKind::None, SuperBinding::NotNeeded, functionKeywordStart, functionInfo, FunctionDefinitionType::Declaration, functionConstructorParametersEndPosition)), "Cannot parse this async function");
@@ -2796,7 +2796,7 @@
//
// In this case, we use "*default*" as this class declaration's name.
requirements = FunctionNameRequirements::None;
- info.className = &m_vm->propertyNames->starDefaultPrivateName;
+ info.className = &m_vm.propertyNames->starDefaultPrivateName;
}
TreeClassExpression classExpr = parseClass(context, requirements, info);
@@ -2870,7 +2870,7 @@
// For backwards compatibility, "static" is a non-reserved keyword in non-strict mode.
ClassElementTag tag = ClassElementTag::Instance;
- if (match(RESERVED_IF_STRICT) && *m_token.m_data.ident == m_vm->propertyNames->staticKeyword) {
+ if (match(RESERVED_IF_STRICT) && *m_token.m_data.ident == m_vm.propertyNames->staticKeyword) {
SavePoint savePoint = createSavePoint();
next();
if (match(OPENPAREN)) {
@@ -2881,7 +2881,7 @@
}
// FIXME: Figure out a way to share more code with parseProperty.
- const CommonIdentifiers& propertyNames = *m_vm->propertyNames;
+ const CommonIdentifiers& propertyNames = *m_vm.propertyNames;
const Identifier* ident = &propertyNames.nullIdentifier;
TreeExpression computedPropertyName = 0;
bool isGetter = false;
@@ -2899,7 +2899,7 @@
next();
break;
case IDENT:
- if (UNLIKELY(*m_token.m_data.ident == m_vm->propertyNames->async && !m_token.m_data.escaped)) {
+ if (UNLIKELY(*m_token.m_data.ident == m_vm.propertyNames->async && !m_token.m_data.escaped)) {
if (!isGeneratorMethodParseMode(parseMode) && !isAsyncMethodParseMode(parseMode)) {
ident = m_token.m_data.ident;
next();
@@ -2924,7 +2924,7 @@
break;
case DOUBLE:
case INTEGER:
- ident = &m_parserArena.identifierArena().makeNumericIdentifier(const_cast<VM*>(m_vm), m_token.m_data.doubleValue);
+ ident = &m_parserArena.identifierArena().makeNumericIdentifier(const_cast<VM&>(m_vm), m_token.m_data.doubleValue);
ASSERT(ident);
next();
break;
@@ -2951,8 +2951,8 @@
bool isConstructor = tag == ClassElementTag::Instance && *ident == propertyNames.constructor;
if (isAsyncMethodParseMode(parseMode) || isAsyncGeneratorMethodParseMode(parseMode) || isGeneratorMethodParseMode(parseMode)) {
isConstructor = false;
- semanticFailIfTrue(*ident == m_vm->propertyNames->prototype, "Cannot declare ", stringArticleForFunctionMode(parseMode), stringForFunctionMode(parseMode), " named 'prototype'");
- semanticFailIfTrue(*ident == m_vm->propertyNames->constructor, "Cannot declare ", stringArticleForFunctionMode(parseMode), stringForFunctionMode(parseMode), " named 'constructor'");
+ semanticFailIfTrue(*ident == m_vm.propertyNames->prototype, "Cannot declare ", stringArticleForFunctionMode(parseMode), stringForFunctionMode(parseMode), " named 'prototype'");
+ semanticFailIfTrue(*ident == m_vm.propertyNames->constructor, "Cannot declare ", stringArticleForFunctionMode(parseMode), stringForFunctionMode(parseMode), " named 'constructor'");
}
methodInfo.name = isConstructor ? info.className : ident;
@@ -3218,10 +3218,10 @@
// e.g.
// * as namespace
ASSERT(match(TIMES));
- importedName = &m_vm->propertyNames->timesIdentifier;
+ importedName = &m_vm.propertyNames->timesIdentifier;
next();
- failIfFalse(matchContextualKeyword(m_vm->propertyNames->as), "Expected 'as' before imported binding name");
+ failIfFalse(matchContextualKeyword(m_vm.propertyNames->as), "Expected 'as' before imported binding name");
next();
failIfFalse(matchSpecIdentifier(), "Expected a variable name for the import declaration");
@@ -3244,7 +3244,7 @@
importedName = localName;
next();
- if (matchContextualKeyword(m_vm->propertyNames->as)) {
+ if (matchContextualKeyword(m_vm.propertyNames->as)) {
next();
failIfFalse(matchSpecIdentifier(), "Expected a variable name for the import declaration");
localNameToken = m_token;
@@ -3260,7 +3260,7 @@
ASSERT(matchSpecIdentifier());
localNameToken = m_token;
localName = m_token.m_data.ident;
- importedName = &m_vm->propertyNames->defaultKeyword;
+ importedName = &m_vm.propertyNames->defaultKeyword;
next();
break;
}
@@ -3338,7 +3338,7 @@
// FromClause :
// from ModuleSpecifier
- failIfFalse(matchContextualKeyword(m_vm->propertyNames->from), "Expected 'from' before imported module name");
+ failIfFalse(matchContextualKeyword(m_vm.propertyNames->from), "Expected 'from' before imported module name");
next();
auto moduleName = parseModuleName(context);
@@ -3363,7 +3363,7 @@
const Identifier* exportedName = localName;
next();
- if (matchContextualKeyword(m_vm->propertyNames->as)) {
+ if (matchContextualKeyword(m_vm.propertyNames->as)) {
next();
failIfFalse(matchIdentifierOrKeyword(), "Expected an exported name for the export declaration");
exportedName = m_token.m_data.ident;
@@ -3388,7 +3388,7 @@
// export * FromClause ;
next();
- failIfFalse(matchContextualKeyword(m_vm->propertyNames->from), "Expected 'from' before exported module name");
+ failIfFalse(matchContextualKeyword(m_vm.propertyNames->from), "Expected 'from' before exported module name");
next();
auto moduleName = parseModuleName(context);
failIfFalse(moduleName, "Cannot parse the 'from' clause");
@@ -3420,7 +3420,7 @@
if (match(IDENT))
localName = m_token.m_data.ident;
restoreSavePoint(savePoint);
- } else if (matchContextualKeyword(m_vm->propertyNames->async)) {
+ } else if (matchContextualKeyword(m_vm.propertyNames->async)) {
SavePoint savePoint = createSavePoint();
next();
if (match(FUNCTION) && !m_lexer->hasLineTerminatorBeforeToken()) {
@@ -3433,7 +3433,7 @@
}
if (!localName)
- localName = &m_vm->propertyNames->starDefaultPrivateName;
+ localName = &m_vm.propertyNames->starDefaultPrivateName;
if (isFunctionOrClassDeclaration) {
if (startsWithFunction) {
@@ -3444,7 +3444,7 @@
} else if (match(CLASSTOKEN)) {
result = parseClassDeclaration(context, ExportType::NotExported, DeclarationDefaultContext::ExportDefault);
} else {
- ASSERT(matchContextualKeyword(m_vm->propertyNames->async));
+ ASSERT(matchContextualKeyword(m_vm.propertyNames->async));
next();
DepthManager statementDepth(&m_statementDepth);
m_statementDepth = 1;
@@ -3465,18 +3465,18 @@
TreeExpression expression = parseAssignmentExpression(context);
failIfFalse(expression, "Cannot parse expression");
- DeclarationResultMask declarationResult = declareVariable(&m_vm->propertyNames->starDefaultPrivateName, DeclarationType::ConstDeclaration);
+ DeclarationResultMask declarationResult = declareVariable(&m_vm.propertyNames->starDefaultPrivateName, DeclarationType::ConstDeclaration);
if (declarationResult & DeclarationResult::InvalidDuplicateDeclaration)
internalFailWithMessage(false, "Only one 'default' export is allowed");
- TreeExpression assignment = context.createAssignResolve(location, m_vm->propertyNames->starDefaultPrivateName, expression, start, start, tokenEndPosition(), AssignmentContext::ConstDeclarationStatement);
+ TreeExpression assignment = context.createAssignResolve(location, m_vm.propertyNames->starDefaultPrivateName, expression, start, start, tokenEndPosition(), AssignmentContext::ConstDeclarationStatement);
result = context.createExprStatement(location, assignment, start, tokenEndPosition());
failIfFalse(autoSemiColon(), "Expected a ';' following a targeted export declaration");
}
failIfFalse(result, "Cannot parse the declaration");
- semanticFailIfFalse(exportName(m_vm->propertyNames->defaultKeyword), "Only one 'default' export is allowed");
- m_moduleScopeData->exportBinding(*localName, m_vm->propertyNames->defaultKeyword);
+ semanticFailIfFalse(exportName(m_vm.propertyNames->defaultKeyword), "Only one 'default' export is allowed");
+ m_moduleScopeData->exportBinding(*localName, m_vm.propertyNames->defaultKeyword);
return context.createExportDefaultDeclaration(exportLocation, result, *localName);
}
@@ -3510,7 +3510,7 @@
handleProductionOrFail2(CLOSEBRACE, "}", "end", "export list");
typename TreeBuilder::ModuleName moduleName = 0;
- if (matchContextualKeyword(m_vm->propertyNames->from)) {
+ if (matchContextualKeyword(m_vm.propertyNames->from)) {
next();
moduleName = parseModuleName(context);
failIfFalse(moduleName, "Cannot parse the 'from' clause");
@@ -3566,7 +3566,7 @@
break;
case IDENT:
- if (*m_token.m_data.ident == m_vm->propertyNames->async && !m_token.m_data.escaped) {
+ if (*m_token.m_data.ident == m_vm.propertyNames->async && !m_token.m_data.escaped) {
next();
semanticFailIfFalse(match(FUNCTION) && !m_lexer->hasLineTerminatorBeforeToken(), "Expected 'function' keyword following 'async' keyword with no preceding line terminator");
DepthManager statementDepth(&m_statementDepth);
@@ -3692,7 +3692,7 @@
restoreSavePoint(savePoint);
bool isAsyncArrow = false;
if (UNLIKELY(classifier.indicatesPossibleAsyncArrowFunction())) {
- if (matchContextualKeyword(m_vm->propertyNames->async)) {
+ if (matchContextualKeyword(m_vm.propertyNames->async)) {
next();
isAsyncArrow = !m_lexer->hasLineTerminatorBeforeToken();
}
@@ -3767,8 +3767,8 @@
m_parserState.assignmentCount++;
next(TreeBuilder::DontBuildStrings);
if (strictMode() && m_parserState.lastIdentifier && context.isResolve(lhs)) {
- failIfTrueIfStrict(m_vm->propertyNames->eval == *m_parserState.lastIdentifier, "Cannot modify 'eval' in strict mode");
- failIfTrueIfStrict(m_vm->propertyNames->arguments == *m_parserState.lastIdentifier, "Cannot modify 'arguments' in strict mode");
+ failIfTrueIfStrict(m_vm.propertyNames->eval == *m_parserState.lastIdentifier, "Cannot modify 'eval' in strict mode");
+ failIfTrueIfStrict(m_vm.propertyNames->arguments == *m_parserState.lastIdentifier, "Cannot modify 'arguments' in strict mode");
m_parserState.lastIdentifier = 0;
}
lhs = parseAssignmentExpression(context);
@@ -3971,7 +3971,7 @@
parseProperty:
switch (m_token.m_type) {
case IDENT:
- if (UNLIKELY(*m_token.m_data.ident == m_vm->propertyNames->async && !m_token.m_data.escaped)) {
+ if (UNLIKELY(*m_token.m_data.ident == m_vm.propertyNames->async && !m_token.m_data.escaped)) {
if (parseMode == SourceParseMode::MethodMode) {
SavePoint savePoint = createSavePoint();
next();
@@ -4001,7 +4001,7 @@
unsigned getterOrSetterStartOffset = tokenStart();
JSToken identToken = m_token;
- if (complete || (wasIdent && !isGeneratorMethodParseMode(parseMode) && (*ident == m_vm->propertyNames->get || *ident == m_vm->propertyNames->set)))
+ if (complete || (wasIdent && !isGeneratorMethodParseMode(parseMode) && (*ident == m_vm.propertyNames->get || *ident == m_vm.propertyNames->set)))
nextExpectIdentifier(LexerFlagsIgnoreReservedWords);
else
nextExpectIdentifier(LexerFlagsIgnoreReservedWords | TreeBuilder::DontBuildKeywords);
@@ -4011,7 +4011,7 @@
TreeExpression node = parseAssignmentExpressionOrPropagateErrorClass(context);
failIfFalse(node, "Cannot parse expression for property declaration");
context.setEndOffset(node, m_lexer->currentOffset());
- InferName inferName = ident && *ident == m_vm->propertyNames->underscoreProto ? InferName::Disallowed : InferName::Allowed;
+ InferName inferName = ident && *ident == m_vm.propertyNames->underscoreProto ? InferName::Disallowed : InferName::Allowed;
return context.createProperty(ident, node, PropertyNode::Constant, PropertyNode::Unknown, complete, SuperBinding::NotNeeded, inferName, ClassElementTag::No);
}
@@ -4028,7 +4028,7 @@
semanticFailureDueToKeywordCheckingToken(identToken, "shorthand property name");
JSTextPosition start = tokenStartPosition();
JSTokenLocation location(tokenLocation());
- currentScope()->useVariable(ident, m_vm->propertyNames->eval == *ident);
+ currentScope()->useVariable(ident, m_vm.propertyNames->eval == *ident);
if (currentScope()->isArrowFunction())
currentScope()->setInnerArrowFunctionUsesEval();
TreeExpression node = context.createResolve(location, *ident, start, lastTokenEndPosition());
@@ -4039,9 +4039,9 @@
classifyExpressionError(ErrorIndicatesPattern);
PropertyNode::Type type;
- if (*ident == m_vm->propertyNames->get)
+ if (*ident == m_vm.propertyNames->get)
type = PropertyNode::Getter;
- else if (*ident == m_vm->propertyNames->set)
+ else if (*ident == m_vm.propertyNames->set)
type = PropertyNode::Setter;
else
failWithMessage("Expected a ':' following the property name '", ident->impl(), "'");
@@ -4053,7 +4053,7 @@
next();
if (match(OPENPAREN)) {
- const Identifier& ident = m_parserArena.identifierArena().makeNumericIdentifier(const_cast<VM*>(m_vm), propertyName);
+ const Identifier& ident = m_parserArena.identifierArena().makeNumericIdentifier(const_cast<VM&>(m_vm), propertyName);
auto method = parsePropertyMethod(context, &ident, parseMode);
propagateError();
return context.createProperty(&ident, method, PropertyNode::Constant, PropertyNode::Unknown, complete, SuperBinding::Needed, InferName::Allowed, ClassElementTag::No);
@@ -4064,7 +4064,7 @@
TreeExpression node = parseAssignmentExpression(context);
failIfFalse(node, "Cannot parse expression for property declaration");
context.setEndOffset(node, m_lexer->currentOffset());
- return context.createProperty(const_cast<VM*>(m_vm), m_parserArena, propertyName, node, PropertyNode::Constant, PropertyNode::Unknown, complete, SuperBinding::NotNeeded, ClassElementTag::No);
+ return context.createProperty(const_cast<VM&>(m_vm), m_parserArena, propertyName, node, PropertyNode::Constant, PropertyNode::Unknown, complete, SuperBinding::NotNeeded, ClassElementTag::No);
}
case OPENBRACKET: {
next();
@@ -4073,7 +4073,7 @@
handleProductionOrFail(CLOSEBRACKET, "]", "end", "computed property name");
if (match(OPENPAREN)) {
- auto method = parsePropertyMethod(context, &m_vm->propertyNames->nullIdentifier, parseMode);
+ auto method = parsePropertyMethod(context, &m_vm.propertyNames->nullIdentifier, parseMode);
propagateError();
return context.createProperty(propertyName, method, static_cast<PropertyNode::Type>(PropertyNode::Constant | PropertyNode::Computed), PropertyNode::KnownDirect, complete, SuperBinding::Needed, ClassElementTag::No);
}
@@ -4126,9 +4126,9 @@
if (matchSpecIdentifier() || match(STRING) || m_token.m_type & KeywordTokenFlag) {
stringPropertyName = m_token.m_data.ident;
- semanticFailIfTrue(tag == ClassElementTag::Static && *stringPropertyName == m_vm->propertyNames->prototype,
+ semanticFailIfTrue(tag == ClassElementTag::Static && *stringPropertyName == m_vm.propertyNames->prototype,
"Cannot declare a static method named 'prototype'");
- semanticFailIfTrue(tag == ClassElementTag::Instance && *stringPropertyName == m_vm->propertyNames->constructor,
+ semanticFailIfTrue(tag == ClassElementTag::Instance && *stringPropertyName == m_vm.propertyNames->constructor,
"Cannot declare a getter or setter named 'constructor'");
next();
} else if (match(DOUBLE) || match(INTEGER)) {
@@ -4157,7 +4157,7 @@
if (computedPropertyName)
return context.createGetterOrSetterProperty(location, static_cast<PropertyNode::Type>(type | PropertyNode::Computed), strict, computedPropertyName, info, tag);
- return context.createGetterOrSetterProperty(const_cast<VM*>(m_vm), m_parserArena, location, type, strict, numericPropertyName, info, tag);
+ return context.createGetterOrSetterProperty(const_cast<VM&>(m_vm), m_parserArena, location, type, strict, numericPropertyName, info, tag);
}
template <typename LexerType>
@@ -4224,7 +4224,7 @@
bool seenUnderscoreProto = false;
if (shouldCheckPropertyForUnderscoreProtoDuplicate(context, property))
- seenUnderscoreProto = *context.getName(property) == m_vm->propertyNames->underscoreProto;
+ seenUnderscoreProto = *context.getName(property) == m_vm.propertyNames->underscoreProto;
TreePropertyList propertyList = context.createPropertyList(location, property);
TreePropertyList tail = propertyList;
@@ -4240,7 +4240,7 @@
return parseStrictObjectLiteral(context);
}
if (shouldCheckPropertyForUnderscoreProtoDuplicate(context, property)) {
- if (*context.getName(property) == m_vm->propertyNames->underscoreProto) {
+ if (*context.getName(property) == m_vm.propertyNames->underscoreProto) {
semanticFailIfTrue(seenUnderscoreProto, "Attempted to redefine __proto__ property");
seenUnderscoreProto = true;
}
@@ -4274,7 +4274,7 @@
bool seenUnderscoreProto = false;
if (shouldCheckPropertyForUnderscoreProtoDuplicate(context, property))
- seenUnderscoreProto = *context.getName(property) == m_vm->propertyNames->underscoreProto;
+ seenUnderscoreProto = *context.getName(property) == m_vm.propertyNames->underscoreProto;
TreePropertyList propertyList = context.createPropertyList(location, property);
TreePropertyList tail = propertyList;
@@ -4286,7 +4286,7 @@
property = parseProperty(context, true);
failIfFalse(property, "Cannot parse object literal property");
if (shouldCheckPropertyForUnderscoreProtoDuplicate(context, property)) {
- if (*context.getName(property) == m_vm->propertyNames->underscoreProto) {
+ if (*context.getName(property) == m_vm.propertyNames->underscoreProto) {
semanticFailIfTrue(seenUnderscoreProto, "Attempted to redefine __proto__ property");
seenUnderscoreProto = true;
}
@@ -4381,7 +4381,7 @@
{
ASSERT(match(CLASSTOKEN));
ParserClassInfo<TreeBuilder> info;
- info.className = &m_vm->propertyNames->nullIdentifier;
+ info.className = &m_vm.propertyNames->nullIdentifier;
return parseClass(context, FunctionNameRequirements::None, info);
}
@@ -4393,7 +4393,7 @@
unsigned functionKeywordStart = tokenStart();
next();
ParserFunctionInfo<TreeBuilder> functionInfo;
- functionInfo.name = &m_vm->propertyNames->nullIdentifier;
+ functionInfo.name = &m_vm.propertyNames->nullIdentifier;
SourceParseMode parseMode = SourceParseMode::NormalFunctionMode;
if (consume(TIMES))
parseMode = SourceParseMode::GeneratorWrapperFunctionMode;
@@ -4414,7 +4414,7 @@
parseMode = SourceParseMode::AsyncGeneratorWrapperFunctionMode;
ParserFunctionInfo<TreeBuilder> functionInfo;
- functionInfo.name = &m_vm->propertyNames->nullIdentifier;
+ functionInfo.name = &m_vm.propertyNames->nullIdentifier;
failIfFalse(parseFunctionInfo(context, FunctionNameRequirements::None, parseMode, false, ConstructorKind::None, SuperBinding::NotNeeded, functionKeywordStart, functionInfo, FunctionDefinitionType::Expression), parseMode == SourceParseMode::AsyncFunctionMode ? "Cannot parse async function expression" : "Cannot parse async generator function expression");
return context.createFunctionExpr(location, functionInfo);
}
@@ -4526,7 +4526,7 @@
goto identifierExpression;
case IDENT: {
- if (UNLIKELY(*m_token.m_data.ident == m_vm->propertyNames->async && !m_token.m_data.escaped)) {
+ if (UNLIKELY(*m_token.m_data.ident == m_vm.propertyNames->async && !m_token.m_data.escaped)) {
JSTextPosition start = tokenStartPosition();
const Identifier* ident = m_token.m_data.ident;
JSTokenLocation location(tokenLocation());
@@ -4551,7 +4551,7 @@
if (UNLIKELY(match(ARROWFUNCTION)))
return 0;
- return createResolveAndUseVariable(context, ident, *ident == m_vm->propertyNames->eval, start, location);
+ return createResolveAndUseVariable(context, ident, *ident == m_vm.propertyNames->eval, start, location);
}
case BIGINT: {
const Identifier* ident = m_token.m_data.bigIntString;
@@ -4736,7 +4736,7 @@
bool baseIsNewTarget = false;
if (newCount && match(DOT)) {
next();
- if (matchContextualKeyword(m_vm->propertyNames->target)) {
+ if (matchContextualKeyword(m_vm.propertyNames->target)) {
ScopeRef closestOrdinaryFunctionScope = closestParentOrdinaryFunctionNonLexicalScope();
semanticFailIfFalse(currentScope()->isFunction() || closestOrdinaryFunctionScope->evalContextType() == EvalContextType::FunctionEvalContext, "new.target is only valid inside functions");
baseIsNewTarget = true;
@@ -4777,9 +4777,9 @@
next();
JSTextPosition expressionEnd = lastTokenEndPosition();
if (consume(DOT)) {
- if (matchContextualKeyword(m_vm->propertyNames->builtinNames().metaPublicName())) {
+ if (matchContextualKeyword(m_vm.propertyNames->builtinNames().metaPublicName())) {
semanticFailIfFalse(m_scriptMode == JSParserScriptMode::Module, "import.meta is only valid inside modules");
- base = context.createImportMetaExpr(location, createResolveAndUseVariable(context, &m_vm->propertyNames->metaPrivateName, false, expressionStart, location));
+ base = context.createImportMetaExpr(location, createResolveAndUseVariable(context, &m_vm.propertyNames->metaPrivateName, false, expressionStart, location));
next();
} else {
failIfTrue(match(IDENT), "\"import.\" can only followed with meta");
@@ -4793,7 +4793,7 @@
base = context.createImportExpr(location, expr, expressionStart, expressionEnd, lastTokenEndPosition());
}
} else if (!baseIsNewTarget) {
- const bool isAsync = matchContextualKeyword(m_vm->propertyNames->async);
+ const bool isAsync = matchContextualKeyword(m_vm.propertyNames->async);
base = parsePrimaryExpression(context);
failIfFalse(base, "Cannot parse base expression");
@@ -4863,7 +4863,7 @@
size_t usedVariablesSize = currentScope()->currentUsedVariablesSize();
JSTextPosition expressionEnd = lastTokenEndPosition();
Optional<CallOrApplyDepthScope> callOrApplyDepthScope;
- recordCallOrApplyDepth<TreeBuilder>(this, *m_vm, callOrApplyDepthScope, base);
+ recordCallOrApplyDepth<TreeBuilder>(this, m_vm, callOrApplyDepthScope, base);
TreeArguments arguments = parseArguments(context);
@@ -4952,7 +4952,7 @@
unsigned functionKeywordStart = tokenStart();
location = tokenLocation();
ParserFunctionInfo<TreeBuilder> info;
- info.name = &m_vm->propertyNames->nullIdentifier;
+ info.name = &m_vm.propertyNames->nullIdentifier;
SourceParseMode parseMode = isAsync ? SourceParseMode::AsyncArrowFunctionMode : SourceParseMode::ArrowFunctionMode;
failIfFalse((parseFunctionInfo(context, FunctionNameRequirements::Unnamed, parseMode, true, ConstructorKind::None, SuperBinding::NotNeeded, functionKeywordStart, info, FunctionDefinitionType::Expression)), "Cannot parse arrow function expression");
@@ -5038,7 +5038,7 @@
bool isEvalOrArguments = false;
if (strictMode()) {
if (context.isResolve(expr))
- isEvalOrArguments = *m_parserState.lastIdentifier == m_vm->propertyNames->eval || *m_parserState.lastIdentifier == m_vm->propertyNames->arguments;
+ isEvalOrArguments = *m_parserState.lastIdentifier == m_vm.propertyNames->eval || *m_parserState.lastIdentifier == m_vm.propertyNames->arguments;
}
failIfTrueIfStrict(isEvalOrArguments && hasPrefixUpdateOp, "Cannot modify '", m_parserState.lastIdentifier->impl(), "' in strict mode");
switch (m_token.m_type) {
diff --git a/Source/JavaScriptCore/parser/Parser.h b/Source/JavaScriptCore/parser/Parser.h
index 0a5ede4..e474826 100644
--- a/Source/JavaScriptCore/parser/Parser.h
+++ b/Source/JavaScriptCore/parser/Parser.h
@@ -1,7 +1,7 @@
/*
* Copyright (C) 1999-2001 Harri Porten (porten@kde.org)
* Copyright (C) 2001 Peter Kelly (pmk@post.com)
- * Copyright (C) 2003, 2006, 2007, 2008, 2009, 2010, 2011, 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2003-2019 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -117,15 +117,15 @@
bool isLoop;
};
-ALWAYS_INLINE static bool isArguments(const VM* vm, const Identifier* ident)
+ALWAYS_INLINE static bool isArguments(const VM& vm, const Identifier* ident)
{
- return vm->propertyNames->arguments == *ident;
+ return vm.propertyNames->arguments == *ident;
}
-ALWAYS_INLINE static bool isEval(const VM* vm, const Identifier* ident)
+ALWAYS_INLINE static bool isEval(const VM& vm, const Identifier* ident)
{
- return vm->propertyNames->eval == *ident;
+ return vm.propertyNames->eval == *ident;
}
-ALWAYS_INLINE static bool isEvalOrArgumentsIdentifier(const VM* vm, const Identifier* ident)
+ALWAYS_INLINE static bool isEvalOrArgumentsIdentifier(const VM& vm, const Identifier* ident)
{
return isEval(vm, ident) || isArguments(vm, ident);
}
@@ -156,7 +156,7 @@
WTF_MAKE_NONCOPYABLE(Scope);
public:
- Scope(const VM* vm, bool isFunction, bool isGenerator, bool strictMode, bool isArrowFunction, bool isAsyncFunction)
+ Scope(const VM& vm, bool isFunction, bool isGenerator, bool strictMode, bool isArrowFunction, bool isAsyncFunction)
: m_vm(vm)
, m_shadowsArguments(false)
, m_usesEval(false)
@@ -489,7 +489,7 @@
bool isArgumentsIdent = isArguments(m_vm, ident);
auto addResult = m_declaredVariables.add(ident->impl());
bool isValidStrictMode = (addResult.isNewEntry || !addResult.iterator->value.isParameter())
- && m_vm->propertyNames->eval != *ident && !isArgumentsIdent;
+ && m_vm.propertyNames->eval != *ident && !isArgumentsIdent;
addResult.iterator->value.clearIsVar();
addResult.iterator->value.setIsParameter();
m_isValidStrictMode = m_isValidStrictMode && isValidStrictMode;
@@ -573,7 +573,7 @@
if (m_usesEval)
setInnerArrowFunctionUsesEval();
- if (usedVariablesContains(m_vm->propertyNames->arguments.impl()))
+ if (usedVariablesContains(m_vm.propertyNames->arguments.impl()))
setInnerArrowFunctionUsesArguments();
}
@@ -595,7 +595,7 @@
continue;
// "arguments" reference should be resolved at function boudary.
- if (nestedScope->isFunctionBoundary() && nestedScope->hasArguments() && impl == m_vm->propertyNames->arguments.impl() && !nestedScope->isArrowFunctionBoundary())
+ if (nestedScope->isFunctionBoundary() && nestedScope->hasArguments() && impl == m_vm.propertyNames->arguments.impl() && !nestedScope->isArrowFunctionBoundary())
continue;
destinationSet.add(impl);
@@ -795,7 +795,7 @@
m_isAsyncFunctionBoundary = true;
}
- const VM* m_vm;
+ const VM& m_vm;
bool m_shadowsArguments;
bool m_usesEval;
bool m_needsFullActivation;
@@ -885,7 +885,7 @@
WTF_MAKE_FAST_ALLOCATED;
public:
- Parser(VM*, const SourceCode&, JSParserBuiltinMode, JSParserStrictMode, JSParserScriptMode, SourceParseMode, SuperBinding, ConstructorKind defaultConstructorKind = ConstructorKind::None, DerivedContextType = DerivedContextType::None, bool isEvalContext = false, EvalContextType = EvalContextType::None, DebuggerParseData* = nullptr);
+ Parser(VM&, const SourceCode&, JSParserBuiltinMode, JSParserStrictMode, JSParserScriptMode, SourceParseMode, SuperBinding, ConstructorKind defaultConstructorKind = ConstructorKind::None, DerivedContextType = DerivedContextType::None, bool isEvalContext = false, EvalContextType = EvalContextType::None, DebuggerParseData* = nullptr);
~Parser();
template <class ParsedNode>
@@ -1683,7 +1683,7 @@
bool canRecurse()
{
- return m_vm->isSafeToRecurse();
+ return m_vm.isSafeToRecurse();
}
const JSTextPosition& lastTokenEndPosition() const
@@ -1866,7 +1866,7 @@
m_errorMessage = String();
}
- VM* m_vm;
+ VM& m_vm;
const SourceCode* m_source;
ParserArena m_parserArena;
std::unique_ptr<LexerType> m_lexer;
@@ -1997,7 +1997,7 @@
template <class ParsedNode>
std::unique_ptr<ParsedNode> parse(
- VM* vm, const SourceCode& source,
+ VM& vm, const SourceCode& source,
const Identifier& name, JSParserBuiltinMode builtinMode,
JSParserStrictMode strictMode, JSParserScriptMode scriptMode, SourceParseMode parseMode, SuperBinding superBinding,
ParserError& error, JSTextPosition* positionBeforeLastNewline = nullptr,
@@ -2057,12 +2057,12 @@
bool isEvalNode = false;
std::unique_ptr<ProgramNode> result;
if (source.provider()->source().is8Bit()) {
- Parser<Lexer<LChar>> parser(&vm, source, JSParserBuiltinMode::NotBuiltin, JSParserStrictMode::NotStrict, JSParserScriptMode::Classic, SourceParseMode::ProgramMode, SuperBinding::NotNeeded, ConstructorKind::None, DerivedContextType::None, isEvalNode, EvalContextType::None, nullptr);
+ Parser<Lexer<LChar>> parser(vm, source, JSParserBuiltinMode::NotBuiltin, JSParserStrictMode::NotStrict, JSParserScriptMode::Classic, SourceParseMode::ProgramMode, SuperBinding::NotNeeded, ConstructorKind::None, DerivedContextType::None, isEvalNode, EvalContextType::None, nullptr);
result = parser.parse<ProgramNode>(error, name, SourceParseMode::ProgramMode, ParsingContext::FunctionConstructor, functionConstructorParametersEndPosition);
if (positionBeforeLastNewline)
*positionBeforeLastNewline = parser.positionBeforeLastNewline();
} else {
- Parser<Lexer<UChar>> parser(&vm, source, JSParserBuiltinMode::NotBuiltin, JSParserStrictMode::NotStrict, JSParserScriptMode::Classic, SourceParseMode::ProgramMode, SuperBinding::NotNeeded, ConstructorKind::None, DerivedContextType::None, isEvalNode, EvalContextType::None, nullptr);
+ Parser<Lexer<UChar>> parser(vm, source, JSParserBuiltinMode::NotBuiltin, JSParserStrictMode::NotStrict, JSParserScriptMode::Classic, SourceParseMode::ProgramMode, SuperBinding::NotNeeded, ConstructorKind::None, DerivedContextType::None, isEvalNode, EvalContextType::None, nullptr);
result = parser.parse<ProgramNode>(error, name, SourceParseMode::ProgramMode, ParsingContext::FunctionConstructor, functionConstructorParametersEndPosition);
if (positionBeforeLastNewline)
*positionBeforeLastNewline = parser.positionBeforeLastNewline();
diff --git a/Source/JavaScriptCore/parser/ParserArena.h b/Source/JavaScriptCore/parser/ParserArena.h
index 410006d..1bef9ee 100644
--- a/Source/JavaScriptCore/parser/ParserArena.h
+++ b/Source/JavaScriptCore/parser/ParserArena.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2009-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
@@ -44,12 +44,12 @@
}
template <typename T>
- ALWAYS_INLINE const Identifier& makeIdentifier(VM*, const T* characters, size_t length);
- ALWAYS_INLINE const Identifier& makeEmptyIdentifier(VM*);
- ALWAYS_INLINE const Identifier& makeIdentifierLCharFromUChar(VM*, const UChar* characters, size_t length);
- ALWAYS_INLINE const Identifier& makeIdentifier(VM*, SymbolImpl*);
+ ALWAYS_INLINE const Identifier& makeIdentifier(VM&, const T* characters, size_t length);
+ ALWAYS_INLINE const Identifier& makeEmptyIdentifier(VM&);
+ ALWAYS_INLINE const Identifier& makeIdentifierLCharFromUChar(VM&, const UChar* characters, size_t length);
+ ALWAYS_INLINE const Identifier& makeIdentifier(VM&, SymbolImpl*);
- const Identifier& makeNumericIdentifier(VM*, double number);
+ const Identifier& makeNumericIdentifier(VM&, double number);
public:
static const int MaximumCachableCharacter = 128;
@@ -70,10 +70,10 @@
};
template <typename T>
- ALWAYS_INLINE const Identifier& IdentifierArena::makeIdentifier(VM* vm, const T* characters, size_t length)
+ ALWAYS_INLINE const Identifier& IdentifierArena::makeIdentifier(VM& vm, const T* characters, size_t length)
{
if (!length)
- return vm->propertyNames->emptyIdentifier;
+ return vm.propertyNames->emptyIdentifier;
if (characters[0] >= MaximumCachableCharacter) {
m_identifiers.append(Identifier::fromString(vm, characters, length));
return m_identifiers.last();
@@ -93,22 +93,22 @@
return m_identifiers.last();
}
- ALWAYS_INLINE const Identifier& IdentifierArena::makeIdentifier(VM*, SymbolImpl* symbol)
+ ALWAYS_INLINE const Identifier& IdentifierArena::makeIdentifier(VM&, SymbolImpl* symbol)
{
ASSERT(symbol);
m_identifiers.append(Identifier::fromUid(*symbol));
return m_identifiers.last();
}
- ALWAYS_INLINE const Identifier& IdentifierArena::makeEmptyIdentifier(VM* vm)
+ ALWAYS_INLINE const Identifier& IdentifierArena::makeEmptyIdentifier(VM& vm)
{
- return vm->propertyNames->emptyIdentifier;
+ return vm.propertyNames->emptyIdentifier;
}
- ALWAYS_INLINE const Identifier& IdentifierArena::makeIdentifierLCharFromUChar(VM* vm, const UChar* characters, size_t length)
+ ALWAYS_INLINE const Identifier& IdentifierArena::makeIdentifierLCharFromUChar(VM& vm, const UChar* characters, size_t length)
{
if (!length)
- return vm->propertyNames->emptyIdentifier;
+ return vm.propertyNames->emptyIdentifier;
if (characters[0] >= MaximumCachableCharacter) {
m_identifiers.append(Identifier::createLCharFromUChar(vm, characters, length));
return m_identifiers.last();
@@ -128,7 +128,7 @@
return m_identifiers.last();
}
- inline const Identifier& IdentifierArena::makeNumericIdentifier(VM* vm, double number)
+ inline const Identifier& IdentifierArena::makeNumericIdentifier(VM& vm, double number)
{
// FIXME: Why doesn't this use the Identifier::from overload that takes a double?
// Seems we are missing out on multiple optimizations by not using it.
diff --git a/Source/JavaScriptCore/parser/SyntaxChecker.h b/Source/JavaScriptCore/parser/SyntaxChecker.h
index 6ce73f7..cd9775b 100644
--- a/Source/JavaScriptCore/parser/SyntaxChecker.h
+++ b/Source/JavaScriptCore/parser/SyntaxChecker.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010, 2013, 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2010-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
@@ -64,7 +64,7 @@
SyntaxChecker* m_context;
};
- SyntaxChecker(VM* , void*)
+ SyntaxChecker(VM& , void*)
{
}
@@ -226,7 +226,7 @@
{
return Property(type);
}
- Property createProperty(VM* vm, ParserArena& parserArena, double name, int, PropertyNode::Type type, PropertyNode::PutType, bool complete, SuperBinding, ClassElementTag)
+ Property createProperty(VM& vm, ParserArena& parserArena, double name, int, PropertyNode::Type type, PropertyNode::PutType, bool complete, SuperBinding, ClassElementTag)
{
if (!complete)
return Property(type);
@@ -297,7 +297,7 @@
{
return Property(type);
}
- Property createGetterOrSetterProperty(VM* vm, ParserArena& parserArena, const JSTokenLocation&, PropertyNode::Type type, bool strict, double name, const ParserFunctionInfo<SyntaxChecker>&, ClassElementTag)
+ Property createGetterOrSetterProperty(VM& vm, ParserArena& parserArena, const JSTokenLocation&, PropertyNode::Type type, bool strict, double name, const ParserFunctionInfo<SyntaxChecker>&, ClassElementTag)
{
if (!strict)
return Property(type);
diff --git a/Source/JavaScriptCore/profiler/ProfilerBytecode.cpp b/Source/JavaScriptCore/profiler/ProfilerBytecode.cpp
index fd88a22..46e7f58 100644
--- a/Source/JavaScriptCore/profiler/ProfilerBytecode.cpp
+++ b/Source/JavaScriptCore/profiler/ProfilerBytecode.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-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
@@ -38,8 +38,8 @@
VM& vm = exec->vm();
JSObject* result = constructEmptyObject(exec);
result->putDirect(vm, vm.propertyNames->bytecodeIndex, jsNumber(m_bytecodeIndex));
- result->putDirect(vm, vm.propertyNames->opcode, jsString(exec, String::fromUTF8(opcodeNames[m_opcodeID])));
- result->putDirect(vm, vm.propertyNames->description, jsString(exec, String::fromUTF8(m_description)));
+ result->putDirect(vm, vm.propertyNames->opcode, jsString(vm, String::fromUTF8(opcodeNames[m_opcodeID])));
+ result->putDirect(vm, vm.propertyNames->description, jsString(vm, String::fromUTF8(m_description)));
return result;
}
diff --git a/Source/JavaScriptCore/profiler/ProfilerBytecodeSequence.cpp b/Source/JavaScriptCore/profiler/ProfilerBytecodeSequence.cpp
index 30cafcb..47f9472 100644
--- a/Source/JavaScriptCore/profiler/ProfilerBytecodeSequence.cpp
+++ b/Source/JavaScriptCore/profiler/ProfilerBytecodeSequence.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-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
@@ -83,7 +83,7 @@
JSArray* header = constructEmptyArray(exec, 0);
RETURN_IF_EXCEPTION(scope, void());
for (unsigned i = 0; i < m_header.size(); ++i) {
- header->putDirectIndex(exec, i, jsString(exec, String::fromUTF8(m_header[i])));
+ header->putDirectIndex(exec, i, jsString(vm, String::fromUTF8(m_header[i])));
RETURN_IF_EXCEPTION(scope, void());
}
result->putDirect(vm, vm.propertyNames->header, header);
diff --git a/Source/JavaScriptCore/profiler/ProfilerBytecodes.cpp b/Source/JavaScriptCore/profiler/ProfilerBytecodes.cpp
index 610a41d..9a441e1 100644
--- a/Source/JavaScriptCore/profiler/ProfilerBytecodes.cpp
+++ b/Source/JavaScriptCore/profiler/ProfilerBytecodes.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-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
@@ -57,9 +57,9 @@
JSObject* result = constructEmptyObject(exec);
result->putDirect(vm, vm.propertyNames->bytecodesID, jsNumber(m_id));
- result->putDirect(vm, vm.propertyNames->inferredName, jsString(exec, String::fromUTF8(m_inferredName)));
- result->putDirect(vm, vm.propertyNames->sourceCode, jsString(exec, String::fromUTF8(m_sourceCode)));
- result->putDirect(vm, vm.propertyNames->hash, jsString(exec, String::fromUTF8(toCString(m_hash))));
+ result->putDirect(vm, vm.propertyNames->inferredName, jsString(vm, String::fromUTF8(m_inferredName)));
+ result->putDirect(vm, vm.propertyNames->sourceCode, jsString(vm, String::fromUTF8(m_sourceCode)));
+ result->putDirect(vm, vm.propertyNames->hash, jsString(vm, String::fromUTF8(toCString(m_hash))));
result->putDirect(vm, vm.propertyNames->instructionCount, jsNumber(m_instructionCount));
addSequenceProperties(exec, result);
diff --git a/Source/JavaScriptCore/profiler/ProfilerCompilation.cpp b/Source/JavaScriptCore/profiler/ProfilerCompilation.cpp
index 35711b5..e44ecb6 100644
--- a/Source/JavaScriptCore/profiler/ProfilerCompilation.cpp
+++ b/Source/JavaScriptCore/profiler/ProfilerCompilation.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-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
@@ -119,7 +119,7 @@
JSObject* result = constructEmptyObject(exec);
RETURN_IF_EXCEPTION(scope, { });
result->putDirect(vm, vm.propertyNames->bytecodesID, jsNumber(m_bytecodes->id()));
- result->putDirect(vm, vm.propertyNames->compilationKind, jsString(exec, String::fromUTF8(toCString(m_kind))));
+ result->putDirect(vm, vm.propertyNames->compilationKind, jsString(vm, String::fromUTF8(toCString(m_kind))));
JSArray* profiledBytecodes = constructEmptyArray(exec, 0);
RETURN_IF_EXCEPTION(scope, { });
@@ -176,9 +176,9 @@
result->putDirect(vm, vm.propertyNames->numInlinedGetByIds, jsNumber(m_numInlinedGetByIds));
result->putDirect(vm, vm.propertyNames->numInlinedPutByIds, jsNumber(m_numInlinedPutByIds));
result->putDirect(vm, vm.propertyNames->numInlinedCalls, jsNumber(m_numInlinedCalls));
- result->putDirect(vm, vm.propertyNames->jettisonReason, jsString(exec, String::fromUTF8(toCString(m_jettisonReason))));
+ result->putDirect(vm, vm.propertyNames->jettisonReason, jsString(vm, String::fromUTF8(toCString(m_jettisonReason))));
if (!m_additionalJettisonReason.isNull())
- result->putDirect(vm, vm.propertyNames->additionalJettisonReason, jsString(exec, String::fromUTF8(m_additionalJettisonReason)));
+ result->putDirect(vm, vm.propertyNames->additionalJettisonReason, jsString(vm, String::fromUTF8(m_additionalJettisonReason)));
result->putDirect(vm, vm.propertyNames->uid, m_uid.toJS(exec));
diff --git a/Source/JavaScriptCore/profiler/ProfilerCompiledBytecode.cpp b/Source/JavaScriptCore/profiler/ProfilerCompiledBytecode.cpp
index 624d0ce..33e831f 100644
--- a/Source/JavaScriptCore/profiler/ProfilerCompiledBytecode.cpp
+++ b/Source/JavaScriptCore/profiler/ProfilerCompiledBytecode.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-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
@@ -48,7 +48,7 @@
JSObject* result = constructEmptyObject(exec);
result->putDirect(vm, vm.propertyNames->origin, m_origin.toJS(exec));
- result->putDirect(vm, vm.propertyNames->description, jsString(exec, String::fromUTF8(m_description)));
+ result->putDirect(vm, vm.propertyNames->description, jsString(vm, String::fromUTF8(m_description)));
return result;
}
diff --git a/Source/JavaScriptCore/profiler/ProfilerEvent.cpp b/Source/JavaScriptCore/profiler/ProfilerEvent.cpp
index 63f68b6..8936129 100644
--- a/Source/JavaScriptCore/profiler/ProfilerEvent.cpp
+++ b/Source/JavaScriptCore/profiler/ProfilerEvent.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-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
@@ -53,9 +53,9 @@
result->putDirect(vm, vm.propertyNames->bytecodesID, jsNumber(m_bytecodes->id()));
if (m_compilation)
result->putDirect(vm, vm.propertyNames->compilationUID, m_compilation->uid().toJS(exec));
- result->putDirect(vm, vm.propertyNames->summary, jsString(exec, String::fromUTF8(m_summary)));
+ result->putDirect(vm, vm.propertyNames->summary, jsString(vm, String::fromUTF8(m_summary)));
if (m_detail.length())
- result->putDirect(vm, vm.propertyNames->detail, jsString(exec, String::fromUTF8(m_detail)));
+ result->putDirect(vm, vm.propertyNames->detail, jsString(vm, String::fromUTF8(m_detail)));
return result;
}
diff --git a/Source/JavaScriptCore/profiler/ProfilerOSRExit.cpp b/Source/JavaScriptCore/profiler/ProfilerOSRExit.cpp
index 0f17eff..cf4d918 100644
--- a/Source/JavaScriptCore/profiler/ProfilerOSRExit.cpp
+++ b/Source/JavaScriptCore/profiler/ProfilerOSRExit.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-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
@@ -51,7 +51,7 @@
JSObject* result = constructEmptyObject(exec);
result->putDirect(vm, vm.propertyNames->id, jsNumber(m_id));
result->putDirect(vm, vm.propertyNames->origin, m_origin.toJS(exec));
- result->putDirect(vm, vm.propertyNames->exitKind, jsString(exec, exitKindToString(m_exitKind)));
+ result->putDirect(vm, vm.propertyNames->exitKind, jsString(vm, exitKindToString(m_exitKind)));
result->putDirect(vm, vm.propertyNames->isWatchpoint, jsBoolean(m_isWatchpoint));
result->putDirect(vm, vm.propertyNames->count, jsNumber(m_counter));
return result;
diff --git a/Source/JavaScriptCore/profiler/ProfilerOSRExitSite.cpp b/Source/JavaScriptCore/profiler/ProfilerOSRExitSite.cpp
index 382a107..3d8ec49 100644
--- a/Source/JavaScriptCore/profiler/ProfilerOSRExitSite.cpp
+++ b/Source/JavaScriptCore/profiler/ProfilerOSRExitSite.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-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
@@ -41,7 +41,7 @@
JSArray* result = constructEmptyArray(exec, 0);
RETURN_IF_EXCEPTION(scope, { });
for (unsigned i = 0; i < m_codeAddresses.size(); ++i) {
- result->putDirectIndex(exec, i, jsString(exec, toString(RawPointer(m_codeAddresses[i].dataLocation()))));
+ result->putDirectIndex(exec, i, jsString(vm, toString(RawPointer(m_codeAddresses[i].dataLocation()))));
RETURN_IF_EXCEPTION(scope, { });
}
return result;
diff --git a/Source/JavaScriptCore/profiler/ProfilerUID.cpp b/Source/JavaScriptCore/profiler/ProfilerUID.cpp
index b5cb114..65e7823 100644
--- a/Source/JavaScriptCore/profiler/ProfilerUID.cpp
+++ b/Source/JavaScriptCore/profiler/ProfilerUID.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-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
@@ -49,7 +49,7 @@
JSValue UID::toJS(ExecState* exec) const
{
- return jsString(exec, toString(*this));
+ return jsString(exec->vm(), toString(*this));
}
} } // namespace JSC::Profiler
diff --git a/Source/JavaScriptCore/runtime/AbstractModuleRecord.cpp b/Source/JavaScriptCore/runtime/AbstractModuleRecord.cpp
index 6ede212..151c51d 100644
--- a/Source/JavaScriptCore/runtime/AbstractModuleRecord.cpp
+++ b/Source/JavaScriptCore/runtime/AbstractModuleRecord.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-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
@@ -65,7 +65,7 @@
JSMap* map = JSMap::create(exec, vm, globalObject(vm)->mapStructure());
scope.releaseAssertNoException();
m_dependenciesMap.set(vm, this, map);
- putDirect(vm, Identifier::fromString(&vm, "dependenciesMap"_s), m_dependenciesMap.get());
+ putDirect(vm, Identifier::fromString(vm, "dependenciesMap"_s), m_dependenciesMap.get());
}
void AbstractModuleRecord::visitChildren(JSCell* cell, SlotVisitor& visitor)
@@ -148,7 +148,7 @@
JSValue moduleNameValue = identifierToJSValue(vm, moduleName);
JSValue entry = m_dependenciesMap->JSMap::get(exec, moduleNameValue);
RETURN_IF_EXCEPTION(scope, nullptr);
- RELEASE_AND_RETURN(scope, jsCast<AbstractModuleRecord*>(entry.get(exec, Identifier::fromString(exec, "module"))));
+ RELEASE_AND_RETURN(scope, jsCast<AbstractModuleRecord*>(entry.get(exec, Identifier::fromString(vm, "module"))));
}
auto AbstractModuleRecord::resolveImport(ExecState* exec, const Identifier& localName) -> Resolution
@@ -541,7 +541,7 @@
// Enqueue the tasks in reverse order.
for (auto iterator = query.moduleRecord->starExportEntries().rbegin(), end = query.moduleRecord->starExportEntries().rend(); iterator != end; ++iterator) {
const RefPtr<UniquedStringImpl>& starModuleName = *iterator;
- AbstractModuleRecord* importedModuleRecord = query.moduleRecord->hostResolveImportedModule(exec, Identifier::fromUid(exec, starModuleName.get()));
+ AbstractModuleRecord* importedModuleRecord = query.moduleRecord->hostResolveImportedModule(exec, Identifier::fromUid(vm, starModuleName.get()));
RETURN_IF_EXCEPTION(scope, false);
pendingTasks.append(Task { ResolveQuery(importedModuleRecord, query.exportName.get()), Type::Query });
}
@@ -720,7 +720,7 @@
}
for (const auto& starModuleName : moduleRecord->starExportEntries()) {
- AbstractModuleRecord* requestedModuleRecord = moduleRecord->hostResolveImportedModule(exec, Identifier::fromUid(exec, starModuleName.get()));
+ AbstractModuleRecord* requestedModuleRecord = moduleRecord->hostResolveImportedModule(exec, Identifier::fromUid(vm, starModuleName.get()));
RETURN_IF_EXCEPTION(scope, void());
pendingModules.append(requestedModuleRecord);
}
@@ -743,7 +743,7 @@
Vector<std::pair<Identifier, Resolution>> resolutions;
for (auto& name : exportedNames) {
- Identifier ident = Identifier::fromUid(exec, name.get());
+ Identifier ident = Identifier::fromUid(vm, name.get());
const Resolution resolution = resolveExport(exec, ident);
RETURN_IF_EXCEPTION(scope, nullptr);
switch (resolution.type) {
diff --git a/Source/JavaScriptCore/runtime/ArrayBufferNeuteringWatchpointSet.cpp b/Source/JavaScriptCore/runtime/ArrayBufferNeuteringWatchpointSet.cpp
index ef23de1..0b16d81 100644
--- a/Source/JavaScriptCore/runtime/ArrayBufferNeuteringWatchpointSet.cpp
+++ b/Source/JavaScriptCore/runtime/ArrayBufferNeuteringWatchpointSet.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-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
@@ -62,7 +62,7 @@
void ArrayBufferNeuteringWatchpointSet::fireAll()
{
- m_set->fireAll(*vm(), "Array buffer was neutered");
+ m_set->fireAll(vm(), "Array buffer was neutered");
}
} // namespace JSC
diff --git a/Source/JavaScriptCore/runtime/ArrayIteratorPrototype.cpp b/Source/JavaScriptCore/runtime/ArrayIteratorPrototype.cpp
index 04d4737..3c0f4f5 100644
--- a/Source/JavaScriptCore/runtime/ArrayIteratorPrototype.cpp
+++ b/Source/JavaScriptCore/runtime/ArrayIteratorPrototype.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013 Apple, Inc. All rights reserved.
+ * Copyright (C) 2013-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
@@ -43,7 +43,7 @@
{
Base::finishCreation(vm);
ASSERT(inherits(vm, info()));
- putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(&vm, "Array Iterator"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
+ putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(vm, "Array Iterator"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
JSC_BUILTIN_FUNCTION_WITHOUT_TRANSITION(vm.propertyNames->next, arrayIteratorPrototypeNextCodeGenerator, static_cast<unsigned>(PropertyAttribute::DontEnum));
}
diff --git a/Source/JavaScriptCore/runtime/ArrayPrototype.cpp b/Source/JavaScriptCore/runtime/ArrayPrototype.cpp
index 8f0c27a..90283af 100644
--- a/Source/JavaScriptCore/runtime/ArrayPrototype.cpp
+++ b/Source/JavaScriptCore/runtime/ArrayPrototype.cpp
@@ -1,6 +1,6 @@
/*
* Copyright (C) 1999-2000 Harri Porten (porten@kde.org)
- * Copyright (C) 2003-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2003-2019 Apple Inc. All rights reserved.
* Copyright (C) 2003 Peter Kelly (pmk@post.com)
* Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com)
*
@@ -533,19 +533,19 @@
goto generalCase;
switch (separator.length()) {
case 0:
- RELEASE_AND_RETURN(scope, jsEmptyString(&state));
+ RELEASE_AND_RETURN(scope, jsEmptyString(vm));
case 1: {
if (length <= 1)
- RELEASE_AND_RETURN(scope, jsEmptyString(&state));
+ RELEASE_AND_RETURN(scope, jsEmptyString(vm));
if (separator.is8Bit())
RELEASE_AND_RETURN(scope, repeatCharacter(state, separator.characters8()[0], length - 1));
RELEASE_AND_RETURN(scope, repeatCharacter(state, separator.characters16()[0], length - 1));
default:
- JSString* result = jsEmptyString(&state);
+ JSString* result = jsEmptyString(vm);
if (length <= 1)
return result;
- JSString* operand = jsString(&vm, separator.toString());
+ JSString* operand = jsString(vm, separator.toString());
RETURN_IF_EXCEPTION(scope, { });
unsigned count = length - 1;
for (;;) {
@@ -699,7 +699,7 @@
JSValue element = thisObject->getIndex(exec, i);
RETURN_IF_EXCEPTION(scope, encodedJSValue());
if (element.isUndefinedOrNull())
- element = jsEmptyString(exec);
+ element = jsEmptyString(vm);
else {
JSValue conversionFunction = element.get(exec, vm.propertyNames->toLocaleString);
RETURN_IF_EXCEPTION(scope, encodedJSValue());
@@ -728,7 +728,7 @@
// 5. If len is zero, return the empty String.
if (!length)
- return jsEmptyString(&exec);
+ return jsEmptyString(vm);
// 6. Let element0 be Get(O, "0").
JSValue element0 = thisObject->getIndex(&exec, 0);
@@ -737,7 +737,7 @@
// 7. If element0 is undefined or null, let R be the empty String; otherwise, let R be ? ToString(element0).
JSString* r = nullptr;
if (element0.isUndefinedOrNull())
- r = jsEmptyString(&exec);
+ r = jsEmptyString(vm);
else
r = element0.toString(&exec);
RETURN_IF_EXCEPTION(scope, { });
@@ -747,7 +747,7 @@
// 9.e Increase k by 1..
for (uint64_t k = 1; k < length; ++k) {
// b. Let element be ? Get(O, ! ToString(k)).
- JSValue element = thisObject->get(&exec, Identifier::fromString(&exec, AtomString::number(k)));
+ JSValue element = thisObject->get(&exec, Identifier::fromString(vm, AtomString::number(k)));
RETURN_IF_EXCEPTION(scope, { });
// c. If element is undefined or null, let next be the empty String; otherwise, let next be ? ToString(element).
@@ -755,7 +755,7 @@
if (element.isUndefinedOrNull()) {
if (!separator->length())
continue;
- next = jsEmptyString(&exec);
+ next = jsEmptyString(vm);
} else
next = element.toString(&exec);
RETURN_IF_EXCEPTION(scope, { });
@@ -797,7 +797,7 @@
if (UNLIKELY(length > std::numeric_limits<unsigned>::max() || !canUseFastJoin(thisObject))) {
uint64_t length64 = static_cast<uint64_t>(length);
ASSERT(static_cast<double>(length64) == length);
- JSString* jsSeparator = jsSingleCharacterString(exec, comma);
+ JSString* jsSeparator = jsSingleCharacterString(vm, comma);
RETURN_IF_EXCEPTION(scope, encodedJSValue());
RELEASE_AND_RETURN(scope, JSValue::encode(slowJoin(*exec, thisObject, jsSeparator, length64)));
@@ -888,7 +888,7 @@
thisObj->methodTable(vm)->putByIndex(thisObj, exec, length + n, exec->uncheckedArgument(n), true);
else {
PutPropertySlot slot(thisObj);
- Identifier propertyName = Identifier::fromString(exec, JSValue(static_cast<int64_t>(length) + static_cast<int64_t>(n)).toWTFString(exec));
+ Identifier propertyName = Identifier::fromString(vm, JSValue(static_cast<int64_t>(length) + static_cast<int64_t>(n)).toWTFString(exec));
thisObj->methodTable(vm)->put(thisObj, exec, propertyName, exec->uncheckedArgument(n), slot);
}
RETURN_IF_EXCEPTION(scope, encodedJSValue());
diff --git a/Source/JavaScriptCore/runtime/AsyncFunctionPrototype.cpp b/Source/JavaScriptCore/runtime/AsyncFunctionPrototype.cpp
index f9e00ed7..a74de85 100644
--- a/Source/JavaScriptCore/runtime/AsyncFunctionPrototype.cpp
+++ b/Source/JavaScriptCore/runtime/AsyncFunctionPrototype.cpp
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2016 Caitlin Potter <caitp@igalia.com>.
+ * 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
@@ -49,7 +50,7 @@
Base::finishCreation(vm);
ASSERT(inherits(vm, info()));
putDirectWithoutTransition(vm, vm.propertyNames->length, jsNumber(0), PropertyAttribute::DontDelete | PropertyAttribute::ReadOnly | PropertyAttribute::DontEnum);
- putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(&vm, "AsyncFunction"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
+ putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(vm, "AsyncFunction"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
}
} // namespace JSC
diff --git a/Source/JavaScriptCore/runtime/AsyncGeneratorFunctionPrototype.cpp b/Source/JavaScriptCore/runtime/AsyncGeneratorFunctionPrototype.cpp
index 380ffa0..599c819 100644
--- a/Source/JavaScriptCore/runtime/AsyncGeneratorFunctionPrototype.cpp
+++ b/Source/JavaScriptCore/runtime/AsyncGeneratorFunctionPrototype.cpp
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2017 Oleksandr Skachkov <gskachkov@gmail.com>.
+ * 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
@@ -49,7 +50,7 @@
Base::finishCreation(vm);
ASSERT(inherits(vm, info()));
putDirectWithoutTransition(vm, vm.propertyNames->length, jsNumber(0), PropertyAttribute::DontDelete | PropertyAttribute::ReadOnly | PropertyAttribute::DontEnum);
- putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(&vm, "AsyncGeneratorFunction"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
+ putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(vm, "AsyncGeneratorFunction"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
}
} // namespace JSC
diff --git a/Source/JavaScriptCore/runtime/AsyncGeneratorPrototype.cpp b/Source/JavaScriptCore/runtime/AsyncGeneratorPrototype.cpp
index 9db3254..7c76ec7 100644
--- a/Source/JavaScriptCore/runtime/AsyncGeneratorPrototype.cpp
+++ b/Source/JavaScriptCore/runtime/AsyncGeneratorPrototype.cpp
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2017 Oleksandr Skachkov <gskachkov@gmail.com>.
+ * 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
@@ -48,7 +49,7 @@
{
Base::finishCreation(vm);
ASSERT(inherits(vm, info()));
- putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(&vm, "AsyncGenerator"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
+ putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(vm, "AsyncGenerator"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
}
} // namespace JSC
diff --git a/Source/JavaScriptCore/runtime/AtomicsObject.cpp b/Source/JavaScriptCore/runtime/AtomicsObject.cpp
index 057d2ff..df7749a 100644
--- a/Source/JavaScriptCore/runtime/AtomicsObject.cpp
+++ b/Source/JavaScriptCore/runtime/AtomicsObject.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-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
@@ -81,7 +81,7 @@
ASSERT(inherits(vm, info()));
#define PUT_DIRECT_NATIVE_FUNC(lowerName, upperName, count) \
- putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(&vm, #lowerName), count, atomicsFunc ## upperName, Atomics ## upperName ## Intrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(vm, #lowerName), count, atomicsFunc ## upperName, Atomics ## upperName ## Intrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
FOR_EACH_ATOMICS_FUNC(PUT_DIRECT_NATIVE_FUNC)
#undef PUT_DIRECT_NATIVE_FUNC
}
@@ -425,7 +425,7 @@
resultString = "timed-out";
else
resultString = "ok";
- return JSValue::encode(jsString(exec, resultString));
+ return JSValue::encode(jsString(vm, resultString));
}
EncodedJSValue JSC_HOST_CALL atomicsFuncWake(ExecState* exec)
@@ -468,7 +468,7 @@
EncodedJSValue JIT_OPERATION operationAtomicsAdd(ExecState* exec, EncodedJSValue base, EncodedJSValue index, EncodedJSValue operand)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
JSValue args[] = {JSValue::decode(base), JSValue::decode(index), JSValue::decode(operand)};
return atomicOperationWithArgs(vm, exec, args, AddFunc());
}
@@ -476,7 +476,7 @@
EncodedJSValue JIT_OPERATION operationAtomicsAnd(ExecState* exec, EncodedJSValue base, EncodedJSValue index, EncodedJSValue operand)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
JSValue args[] = {JSValue::decode(base), JSValue::decode(index), JSValue::decode(operand)};
return atomicOperationWithArgs(vm, exec, args, AndFunc());
}
@@ -484,7 +484,7 @@
EncodedJSValue JIT_OPERATION operationAtomicsCompareExchange(ExecState* exec, EncodedJSValue base, EncodedJSValue index, EncodedJSValue expected, EncodedJSValue newValue)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
JSValue args[] = {JSValue::decode(base), JSValue::decode(index), JSValue::decode(expected), JSValue::decode(newValue)};
return atomicOperationWithArgs(vm, exec, args, CompareExchangeFunc());
}
@@ -492,7 +492,7 @@
EncodedJSValue JIT_OPERATION operationAtomicsExchange(ExecState* exec, EncodedJSValue base, EncodedJSValue index, EncodedJSValue operand)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
JSValue args[] = {JSValue::decode(base), JSValue::decode(index), JSValue::decode(operand)};
return atomicOperationWithArgs(vm, exec, args, ExchangeFunc());
}
@@ -500,14 +500,14 @@
EncodedJSValue JIT_OPERATION operationAtomicsIsLockFree(ExecState* exec, EncodedJSValue size)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return isLockFree(exec, JSValue::decode(size));
}
EncodedJSValue JIT_OPERATION operationAtomicsLoad(ExecState* exec, EncodedJSValue base, EncodedJSValue index)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
JSValue args[] = {JSValue::decode(base), JSValue::decode(index)};
return atomicOperationWithArgs(vm, exec, args, LoadFunc());
}
@@ -515,7 +515,7 @@
EncodedJSValue JIT_OPERATION operationAtomicsOr(ExecState* exec, EncodedJSValue base, EncodedJSValue index, EncodedJSValue operand)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
JSValue args[] = {JSValue::decode(base), JSValue::decode(index), JSValue::decode(operand)};
return atomicOperationWithArgs(vm, exec, args, OrFunc());
}
@@ -523,7 +523,7 @@
EncodedJSValue JIT_OPERATION operationAtomicsStore(ExecState* exec, EncodedJSValue base, EncodedJSValue index, EncodedJSValue operand)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
JSValue args[] = {JSValue::decode(base), JSValue::decode(index), JSValue::decode(operand)};
return atomicOperationWithArgs(vm, exec, args, StoreFunc());
}
@@ -531,7 +531,7 @@
EncodedJSValue JIT_OPERATION operationAtomicsSub(ExecState* exec, EncodedJSValue base, EncodedJSValue index, EncodedJSValue operand)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
JSValue args[] = {JSValue::decode(base), JSValue::decode(index), JSValue::decode(operand)};
return atomicOperationWithArgs(vm, exec, args, SubFunc());
}
@@ -539,7 +539,7 @@
EncodedJSValue JIT_OPERATION operationAtomicsXor(ExecState* exec, EncodedJSValue base, EncodedJSValue index, EncodedJSValue operand)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
JSValue args[] = {JSValue::decode(base), JSValue::decode(index), JSValue::decode(operand)};
return atomicOperationWithArgs(vm, exec, args, XorFunc());
}
diff --git a/Source/JavaScriptCore/runtime/BigIntPrototype.cpp b/Source/JavaScriptCore/runtime/BigIntPrototype.cpp
index 215c095..4f1e25a 100644
--- a/Source/JavaScriptCore/runtime/BigIntPrototype.cpp
+++ b/Source/JavaScriptCore/runtime/BigIntPrototype.cpp
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2017 Caio Lima <ticaiolima@gmail.com>.
- * Copyright (C) 2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2017-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
@@ -72,7 +72,7 @@
{
Base::finishCreation(vm);
ASSERT(inherits(vm, info()));
- putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(&vm, "BigInt"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
+ putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(vm, "BigInt"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
}
// ------------------------------ Functions ---------------------------
@@ -110,7 +110,7 @@
if (resultString.length() == 1)
return JSValue::encode(vm.smallStrings.singleCharacterString(resultString[0]));
- return JSValue::encode(jsNontrivialString(&vm, resultString));
+ return JSValue::encode(jsNontrivialString(vm, resultString));
}
EncodedJSValue JSC_HOST_CALL bigIntProtoFuncToLocaleString(ExecState* state)
diff --git a/Source/JavaScriptCore/runtime/CachedTypes.cpp b/Source/JavaScriptCore/runtime/CachedTypes.cpp
index 6fe5550..3ee1660 100644
--- a/Source/JavaScriptCore/runtime/CachedTypes.cpp
+++ b/Source/JavaScriptCore/runtime/CachedTypes.cpp
@@ -711,7 +711,7 @@
if (!m_isSymbol)
return AtomStringImpl::add(buffer, m_length).leakRef();
- Identifier ident = Identifier::fromString(&decoder.vm(), buffer, m_length);
+ Identifier ident = Identifier::fromString(decoder.vm(), buffer, m_length);
String str = decoder.vm().propertyNames->lookUpPrivateName(ident);
StringImpl* impl = str.releaseImpl().get();
ASSERT(impl->isSymbol());
@@ -773,7 +773,7 @@
if (str.isNull())
return Identifier();
- return Identifier::fromUid(&decoder.vm(), (UniquedStringImpl*)str.impl());
+ return Identifier::fromUid(decoder.vm(), (UniquedStringImpl*)str.impl());
}
void decode(Decoder& decoder, Identifier& ident) const
@@ -1314,7 +1314,7 @@
break;
case EncodedType::String: {
StringImpl* impl = this->buffer<CachedUniquedStringImpl>()->decode(decoder);
- v = jsString(&decoder.vm(), adoptRef(*impl));
+ v = jsString(decoder.vm(), adoptRef(*impl));
break;
}
case EncodedType::ImmutableButterfly:
diff --git a/Source/JavaScriptCore/runtime/CodeCache.cpp b/Source/JavaScriptCore/runtime/CodeCache.cpp
index 26a237b..b2cfe74 100644
--- a/Source/JavaScriptCore/runtime/CodeCache.cpp
+++ b/Source/JavaScriptCore/runtime/CodeCache.cpp
@@ -45,7 +45,7 @@
while (m_size > m_capacity || !canPruneQuickly()) {
MapType::iterator it = m_map.begin();
- writeCodeBlock(*it->value.cell->vm(), it->key, it->value);
+ writeCodeBlock(it->value.cell->vm(), it->key, it->value);
m_size -= it->key.length();
m_map.remove(it);
@@ -151,7 +151,7 @@
// The Function constructor only has access to global variables, so no variables will be under TDZ unless they're
// in the global lexical environment, which we always TDZ check accesses from.
ConstructAbility constructAbility = constructAbilityForParseMode(metadata->parseMode());
- UnlinkedFunctionExecutable* functionExecutable = UnlinkedFunctionExecutable::create(&vm, source, metadata, UnlinkedNormalFunction, constructAbility, JSParserScriptMode::Classic, WTF::nullopt, DerivedContextType::None);
+ UnlinkedFunctionExecutable* functionExecutable = UnlinkedFunctionExecutable::create(vm, source, metadata, UnlinkedNormalFunction, constructAbility, JSParserScriptMode::Classic, WTF::nullopt, DerivedContextType::None);
if (!source.provider()->sourceURLDirective().isNull())
functionExecutable->setSourceURLDirective(source.provider()->sourceURLDirective());
diff --git a/Source/JavaScriptCore/runtime/CodeCache.h b/Source/JavaScriptCore/runtime/CodeCache.h
index 7c37ab0..b2c07b5 100644
--- a/Source/JavaScriptCore/runtime/CodeCache.h
+++ b/Source/JavaScriptCore/runtime/CodeCache.h
@@ -264,7 +264,7 @@
{
typedef typename CacheTypes<UnlinkedCodeBlockType>::RootNode RootNode;
std::unique_ptr<RootNode> rootNode = parse<RootNode>(
- &vm, source, Identifier(), JSParserBuiltinMode::NotBuiltin, strictMode, scriptMode, CacheTypes<UnlinkedCodeBlockType>::parseMode, SuperBinding::NotNeeded, error, nullptr, ConstructorKind::None, derivedContextType, evalContextType);
+ vm, source, Identifier(), JSParserBuiltinMode::NotBuiltin, strictMode, scriptMode, CacheTypes<UnlinkedCodeBlockType>::parseMode, SuperBinding::NotNeeded, error, nullptr, ConstructorKind::None, derivedContextType, evalContextType);
if (!rootNode)
return nullptr;
@@ -281,7 +281,7 @@
bool isStrictMode = rootNode->features() & StrictModeFeature;
ExecutableInfo executableInfo(usesEval, isStrictMode, false, false, ConstructorKind::None, scriptMode, SuperBinding::NotNeeded, CacheTypes<UnlinkedCodeBlockType>::parseMode, derivedContextType, isArrowFunctionContext, false, evalContextType);
- UnlinkedCodeBlockType* unlinkedCodeBlock = UnlinkedCodeBlockType::create(&vm, executableInfo, codeGenerationMode);
+ UnlinkedCodeBlockType* unlinkedCodeBlock = UnlinkedCodeBlockType::create(vm, executableInfo, codeGenerationMode);
unlinkedCodeBlock->recordParse(rootNode->features(), rootNode->hasCapturedVariables(), lineCount, unlinkedEndColumn);
if (!source.provider()->sourceURLDirective().isNull())
unlinkedCodeBlock->setSourceURLDirective(source.provider()->sourceURLDirective());
diff --git a/Source/JavaScriptCore/runtime/CommonIdentifiers.cpp b/Source/JavaScriptCore/runtime/CommonIdentifiers.cpp
index fae4724..c63a029 100644
--- a/Source/JavaScriptCore/runtime/CommonIdentifiers.cpp
+++ b/Source/JavaScriptCore/runtime/CommonIdentifiers.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003, 2007, 2009, 2012, 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2003-2019 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -33,7 +33,7 @@
#define INITIALIZE_PRIVATE_NAME(name) , name##PrivateName(m_builtinNames->name##PrivateName())
#define INITIALIZE_SYMBOL(name) , name##Symbol(m_builtinNames->name##Symbol())
-CommonIdentifiers::CommonIdentifiers(VM* vm)
+CommonIdentifiers::CommonIdentifiers(VM& vm)
: nullIdentifier()
, emptyIdentifier(Identifier::EmptyIdentifier)
, underscoreProto(Identifier::fromString(vm, "__proto__"))
diff --git a/Source/JavaScriptCore/runtime/CommonIdentifiers.h b/Source/JavaScriptCore/runtime/CommonIdentifiers.h
index 3e6f51c..3b47c90 100644
--- a/Source/JavaScriptCore/runtime/CommonIdentifiers.h
+++ b/Source/JavaScriptCore/runtime/CommonIdentifiers.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2003-2019 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -282,7 +282,7 @@
class CommonIdentifiers {
WTF_MAKE_NONCOPYABLE(CommonIdentifiers); WTF_MAKE_FAST_ALLOCATED;
private:
- CommonIdentifiers(VM*);
+ CommonIdentifiers(VM&);
~CommonIdentifiers();
friend class VM;
diff --git a/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp b/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp
index c5fda30..da5a7c5 100644
--- a/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp
+++ b/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp
@@ -72,7 +72,7 @@
#define BEGIN_NO_SET_PC() \
VM& vm = exec->vm(); \
- NativeCallFrameTracer tracer(&vm, exec); \
+ NativeCallFrameTracer tracer(vm, exec); \
auto throwScope = DECLARE_THROW_SCOPE(vm); \
UNUSED_PARAM(throwScope)
@@ -180,7 +180,7 @@
if (UNLIKELY(slotsToAdd < 0)) {
CodeBlock* codeBlock = CommonSlowPaths::codeBlockFromCallFrameCallee(exec, CodeForCall);
exec->convertToStackOverflowFrame(vm, codeBlock);
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
ErrorHandlingScope errorScope(vm);
throwScope.release();
throwArityCheckStackOverflowError(exec, throwScope);
@@ -196,7 +196,7 @@
if (UNLIKELY(slotsToAdd < 0)) {
CodeBlock* codeBlock = CommonSlowPaths::codeBlockFromCallFrameCallee(exec, CodeForConstruct);
exec->convertToStackOverflowFrame(vm, codeBlock);
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
ErrorHandlingScope errorScope(vm);
throwArityCheckStackOverflowError(exec, throwScope);
RETURN_TWO(bitwise_cast<void*>(static_cast<uintptr_t>(1)), exec);
@@ -1012,7 +1012,7 @@
auto bytecode = pc->as<OpToIndexString>();
JSValue indexValue = GET(bytecode.m_index).jsValue();
ASSERT(indexValue.isUInt32AsAnyInt());
- RETURN(jsString(exec, Identifier::from(exec, indexValue.asUInt32AsAnyInt()).string()));
+ RETURN(jsString(vm, Identifier::from(vm, indexValue.asUInt32AsAnyInt()).string()));
}
SLOW_PATH_DECL(slow_path_profile_type_clear_log)
diff --git a/Source/JavaScriptCore/runtime/Completion.cpp b/Source/JavaScriptCore/runtime/Completion.cpp
index 00a15c9..92cf8f7 100644
--- a/Source/JavaScriptCore/runtime/Completion.cpp
+++ b/Source/JavaScriptCore/runtime/Completion.cpp
@@ -49,7 +49,7 @@
static inline bool checkSyntaxInternal(VM& vm, const SourceCode& source, ParserError& error)
{
return !!parse<ProgramNode>(
- &vm, source, Identifier(), JSParserBuiltinMode::NotBuiltin,
+ vm, source, Identifier(), JSParserBuiltinMode::NotBuiltin,
JSParserStrictMode::NotStrict, JSParserScriptMode::Classic, SourceParseMode::ProgramMode, SuperBinding::NotNeeded, error);
}
@@ -81,7 +81,7 @@
JSLockHolder lock(vm);
RELEASE_ASSERT(vm.atomStringTable() == Thread::current().atomStringTable());
std::unique_ptr<ModuleProgramNode> moduleProgramNode = parse<ModuleProgramNode>(
- &vm, source, Identifier(), JSParserBuiltinMode::NotBuiltin,
+ vm, source, Identifier(), JSParserBuiltinMode::NotBuiltin,
JSParserStrictMode::Strict, JSParserScriptMode::Module, SourceParseMode::ModuleAnalyzeMode, SuperBinding::NotNeeded, error);
if (!moduleProgramNode)
return false;
@@ -219,7 +219,7 @@
RELEASE_ASSERT(vm.atomStringTable() == Thread::current().atomStringTable());
RELEASE_ASSERT(!vm.isCollectorBusyOnCurrentThread());
- return vm.vmEntryGlobalObject(exec)->moduleLoader()->loadAndEvaluateModule(exec, identifierToJSValue(vm, Identifier::fromString(exec, moduleName)), parameters, scriptFetcher);
+ return vm.vmEntryGlobalObject(exec)->moduleLoader()->loadAndEvaluateModule(exec, identifierToJSValue(vm, Identifier::fromString(vm, moduleName)), parameters, scriptFetcher);
}
JSInternalPromise* loadAndEvaluateModule(ExecState* exec, const SourceCode& source, JSValue scriptFetcher)
@@ -248,7 +248,7 @@
RELEASE_ASSERT(vm.atomStringTable() == Thread::current().atomStringTable());
RELEASE_ASSERT(!vm.isCollectorBusyOnCurrentThread());
- return vm.vmEntryGlobalObject(exec)->moduleLoader()->loadModule(exec, identifierToJSValue(vm, Identifier::fromString(exec, moduleName)), parameters, scriptFetcher);
+ return vm.vmEntryGlobalObject(exec)->moduleLoader()->loadModule(exec, identifierToJSValue(vm, Identifier::fromString(vm, moduleName)), parameters, scriptFetcher);
}
JSInternalPromise* loadModule(ExecState* exec, const SourceCode& source, JSValue scriptFetcher)
diff --git a/Source/JavaScriptCore/runtime/DateConstructor.cpp b/Source/JavaScriptCore/runtime/DateConstructor.cpp
index 18787ae..239827a 100644
--- a/Source/JavaScriptCore/runtime/DateConstructor.cpp
+++ b/Source/JavaScriptCore/runtime/DateConstructor.cpp
@@ -1,6 +1,6 @@
/*
* Copyright (C) 1999-2000 Harri Porten (porten@kde.org)
- * Copyright (C) 2004-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2004-2019 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -160,7 +160,7 @@
VM& vm = exec->vm();
GregorianDateTime ts;
msToGregorianDateTime(vm, WallTime::now().secondsSinceEpoch().milliseconds(), WTF::LocalTime, ts);
- return JSValue::encode(jsNontrivialString(&vm, formatDateTime(ts, DateTimeFormatDateAndTime, false)));
+ return JSValue::encode(jsNontrivialString(vm, formatDateTime(ts, DateTimeFormatDateAndTime, false)));
}
EncodedJSValue JSC_HOST_CALL dateParse(ExecState* exec)
diff --git a/Source/JavaScriptCore/runtime/DatePrototype.cpp b/Source/JavaScriptCore/runtime/DatePrototype.cpp
index 831ca8e..5eb35a8 100644
--- a/Source/JavaScriptCore/runtime/DatePrototype.cpp
+++ b/Source/JavaScriptCore/runtime/DatePrototype.cpp
@@ -1,6 +1,6 @@
/*
* Copyright (C) 1999-2000 Harri Porten (porten@kde.org)
- * Copyright (C) 2004-2008, 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2004-2019 Apple Inc. All rights reserved.
* Copyright (C) 2008, 2009 Torch Mobile, Inc. All rights reserved.
* Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
*
@@ -144,6 +144,7 @@
static JSCell* formatLocaleDate(ExecState* exec, DateInstance*, double timeInMilliseconds, LocaleDateTimeFormat format)
{
+ VM& vm = exec->vm();
CFDateFormatterStyle dateStyle = (format != LocaleTime ? kCFDateFormatterLongStyle : kCFDateFormatterNoStyle);
CFDateFormatterStyle timeStyle = (format != LocaleDate ? kCFDateFormatterLongStyle : kCFDateFormatterNoStyle);
@@ -167,35 +168,37 @@
auto formatter = adoptCF(CFDateFormatterCreate(kCFAllocatorDefault, adoptCF(CFLocaleCopyCurrent()).get(), dateStyle, timeStyle));
if (useCustomFormat)
CFDateFormatterSetFormat(formatter.get(), customFormatString.createCFString().get());
- return jsNontrivialString(exec, adoptCF(CFDateFormatterCreateStringWithAbsoluteTime(kCFAllocatorDefault, formatter.get(), absoluteTime)).get());
+ return jsNontrivialString(vm, adoptCF(CFDateFormatterCreateStringWithAbsoluteTime(kCFAllocatorDefault, formatter.get(), absoluteTime)).get());
}
#elif !UCONFIG_NO_FORMATTING
static JSCell* formatLocaleDate(ExecState* exec, DateInstance*, double timeInMilliseconds, LocaleDateTimeFormat format)
{
+ VM& vm = exec->vm();
UDateFormatStyle timeStyle = (format != LocaleDate ? UDAT_LONG : UDAT_NONE);
UDateFormatStyle dateStyle = (format != LocaleTime ? UDAT_LONG : UDAT_NONE);
UErrorCode status = U_ZERO_ERROR;
UDateFormat* df = udat_open(timeStyle, dateStyle, 0, 0, -1, 0, 0, &status);
if (!df)
- return jsEmptyString(exec);
+ return jsEmptyString(vm);
UChar buffer[128];
int32_t length;
length = udat_format(df, timeInMilliseconds, buffer, 128, 0, &status);
udat_close(df);
if (status != U_ZERO_ERROR)
- return jsEmptyString(exec);
+ return jsEmptyString(vm);
- return jsNontrivialString(exec, String(buffer, length));
+ return jsNontrivialString(vm, String(buffer, length));
}
#else
static JSCell* formatLocaleDate(ExecState* exec, const GregorianDateTime& gdt, LocaleDateTimeFormat format)
{
+ VM& vm = exec->vm();
#if OS(WINDOWS)
SYSTEMTIME systemTime;
memset(&systemTime, 0, sizeof(systemTime));
@@ -230,7 +233,7 @@
if (length)
length--;
- return jsNontrivialString(exec, String(buffer.data(), length));
+ return jsNontrivialString(vm, String(buffer.data(), length));
#else // OS(WINDOWS)
@@ -269,7 +272,7 @@
#endif
if (ret == 0)
- return jsEmptyString(exec);
+ return jsEmptyString(vm);
// Copy original into the buffer
if (yearNeedsOffset && format != LocaleTime) {
@@ -299,19 +302,20 @@
if (length != static_cast<size_t>(-1)) {
for (size_t i = 0; i < length; ++i)
buffer[i] = static_cast<UChar>(tempbuffer[i]);
- return jsNontrivialString(exec, String(buffer, length));
+ return jsNontrivialString(vm, String(buffer, length));
}
#endif
- return jsNontrivialString(exec, timebuffer);
+ return jsNontrivialString(vm, timebuffer);
#endif // OS(WINDOWS)
}
static JSCell* formatLocaleDate(ExecState* exec, DateInstance* dateObject, double, LocaleDateTimeFormat format)
{
+ VM& vm = exec->vm();
const GregorianDateTime* gregorianDateTime = dateObject->gregorianDateTime(exec);
if (!gregorianDateTime)
- return jsNontrivialString(exec, "Invalid Date"_s);
+ return jsNontrivialString(vm, "Invalid Date"_s);
return formatLocaleDate(exec, *gregorianDateTime, format);
}
@@ -330,9 +334,9 @@
? thisDateObj->gregorianDateTimeUTC(exec)
: thisDateObj->gregorianDateTime(exec);
if (!gregorianDateTime)
- return JSValue::encode(jsNontrivialString(exec, String("Invalid Date"_s)));
+ return JSValue::encode(jsNontrivialString(vm, String("Invalid Date"_s)));
- return JSValue::encode(jsNontrivialString(exec, formatDateTime(*gregorianDateTime, format, asUTCVariant)));
+ return JSValue::encode(jsNontrivialString(vm, formatDateTime(*gregorianDateTime, format, asUTCVariant)));
}
// Converts a list of arguments sent to a Date member function into milliseconds, updating
@@ -502,10 +506,10 @@
Base::finishCreation(vm);
ASSERT(inherits(vm, info()));
- Identifier toUTCStringName = Identifier::fromString(&vm, "toUTCString"_s);
+ Identifier toUTCStringName = Identifier::fromString(vm, "toUTCString"_s);
JSFunction* toUTCStringFunction = JSFunction::create(vm, globalObject, 0, toUTCStringName.string(), dateProtoFuncToUTCString);
putDirectWithoutTransition(vm, toUTCStringName, toUTCStringFunction, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectWithoutTransition(vm, Identifier::fromString(&vm, "toGMTString"_s), toUTCStringFunction, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectWithoutTransition(vm, Identifier::fromString(vm, "toGMTString"_s), toUTCStringFunction, static_cast<unsigned>(PropertyAttribute::DontEnum));
#if ENABLE(INTL)
JSC_BUILTIN_FUNCTION_WITHOUT_TRANSITION("toLocaleString", datePrototypeToLocaleStringCodeGenerator, static_cast<unsigned>(PropertyAttribute::DontEnum));
@@ -547,7 +551,7 @@
const GregorianDateTime* gregorianDateTime = thisDateObj->gregorianDateTimeUTC(exec);
if (!gregorianDateTime)
- return JSValue::encode(jsNontrivialString(exec, String("Invalid Date"_s)));
+ return JSValue::encode(jsNontrivialString(vm, String("Invalid Date"_s)));
// Maximum amount of space we need in buffer: 7 (max. digits in year) + 2 * 5 (2 characters each for month, day, hour, minute, second) + 4 (. + 3 digits for milliseconds)
// 6 for formatting and one for null termination = 28. We add one extra character to allow us to force null termination.
char buffer[28];
@@ -564,9 +568,9 @@
ASSERT(charactersWritten > 0 && static_cast<unsigned>(charactersWritten) < sizeof(buffer));
if (static_cast<unsigned>(charactersWritten) >= sizeof(buffer))
- return JSValue::encode(jsEmptyString(exec));
+ return JSValue::encode(jsEmptyString(vm));
- return JSValue::encode(jsNontrivialString(exec, String(buffer, charactersWritten)));
+ return JSValue::encode(jsNontrivialString(vm, String(buffer, charactersWritten)));
}
EncodedJSValue JSC_HOST_CALL dateProtoFuncToDateString(ExecState* exec)
diff --git a/Source/JavaScriptCore/runtime/Error.cpp b/Source/JavaScriptCore/runtime/Error.cpp
index a64de3f..6cd8cce 100644
--- a/Source/JavaScriptCore/runtime/Error.cpp
+++ b/Source/JavaScriptCore/runtime/Error.cpp
@@ -226,9 +226,9 @@
obj->putDirect(vm, vm.propertyNames->line, jsNumber(line));
obj->putDirect(vm, vm.propertyNames->column, jsNumber(column));
if (!sourceURL.isEmpty())
- obj->putDirect(vm, vm.propertyNames->sourceURL, jsString(&vm, sourceURL));
+ obj->putDirect(vm, vm.propertyNames->sourceURL, jsString(vm, sourceURL));
- obj->putDirect(vm, vm.propertyNames->stack, jsString(&vm, Interpreter::stackTraceAsString(vm, *stackTrace)), static_cast<unsigned>(PropertyAttribute::DontEnum));
+ obj->putDirect(vm, vm.propertyNames->stack, jsString(vm, Interpreter::stackTraceAsString(vm, *stackTrace)), static_cast<unsigned>(PropertyAttribute::DontEnum));
return true;
}
@@ -265,7 +265,7 @@
if (line != -1)
error->putDirect(vm, vm.propertyNames->line, jsNumber(line));
if (!sourceURL.isNull())
- error->putDirect(vm, vm.propertyNames->sourceURL, jsString(&vm, sourceURL));
+ error->putDirect(vm, vm.propertyNames->sourceURL, jsString(vm, sourceURL));
return error;
}
diff --git a/Source/JavaScriptCore/runtime/ErrorInstance.cpp b/Source/JavaScriptCore/runtime/ErrorInstance.cpp
index 2da121b..d108679 100644
--- a/Source/JavaScriptCore/runtime/ErrorInstance.cpp
+++ b/Source/JavaScriptCore/runtime/ErrorInstance.cpp
@@ -1,6 +1,6 @@
/*
* Copyright (C) 1999-2000 Harri Porten (porten@kde.org)
- * Copyright (C) 2003-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2003-2019 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -80,8 +80,8 @@
if (!expressionStop || expressionStart > static_cast<int>(sourceString.length()))
return;
- VM* vm = &callFrame->vm();
- JSValue jsMessage = exception->getDirect(*vm, vm->propertyNames->message);
+ VM& vm = callFrame->vm();
+ JSValue jsMessage = exception->getDirect(vm, vm.propertyNames->message);
if (!jsMessage || !jsMessage.isString())
return;
@@ -105,7 +105,7 @@
stop--;
message = appender(message, codeBlock->source().provider()->getRange(start, stop).toString(), type, ErrorInstance::FoundApproximateSource);
}
- exception->putDirect(*vm, vm->propertyNames->message, jsString(vm, message));
+ exception->putDirect(vm, vm.propertyNames->message, jsString(vm, message));
}
@@ -114,7 +114,7 @@
Base::finishCreation(vm);
ASSERT(inherits(vm, info()));
if (!message.isNull())
- putDirect(vm, vm.propertyNames->message, jsString(&vm, message), static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirect(vm, vm.propertyNames->message, jsString(vm, message), static_cast<unsigned>(PropertyAttribute::DontEnum));
std::unique_ptr<Vector<StackFrame>> stackTrace = getStackTrace(exec, vm, this, useCurrentFrame);
{
@@ -241,9 +241,9 @@
putDirect(vm, vm.propertyNames->line, jsNumber(m_line));
putDirect(vm, vm.propertyNames->column, jsNumber(m_column));
if (!m_sourceURL.isEmpty())
- putDirect(vm, vm.propertyNames->sourceURL, jsString(&vm, WTFMove(m_sourceURL)));
+ putDirect(vm, vm.propertyNames->sourceURL, jsString(vm, WTFMove(m_sourceURL)));
- putDirect(vm, vm.propertyNames->stack, jsString(&vm, WTFMove(m_stackString)), static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirect(vm, vm.propertyNames->stack, jsString(vm, WTFMove(m_stackString)), static_cast<unsigned>(PropertyAttribute::DontEnum));
}
m_errorInfoMaterialized = true;
diff --git a/Source/JavaScriptCore/runtime/ErrorPrototype.cpp b/Source/JavaScriptCore/runtime/ErrorPrototype.cpp
index 713c738..922cf4c 100644
--- a/Source/JavaScriptCore/runtime/ErrorPrototype.cpp
+++ b/Source/JavaScriptCore/runtime/ErrorPrototype.cpp
@@ -1,6 +1,6 @@
/*
* Copyright (C) 1999-2000 Harri Porten (porten@kde.org)
- * Copyright (C) 2003, 2008, 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2003-2019 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -64,8 +64,8 @@
{
Base::finishCreation(vm);
ASSERT(inherits(vm, info()));
- putDirectWithoutTransition(vm, vm.propertyNames->name, jsString(&vm, name), static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectWithoutTransition(vm, vm.propertyNames->message, jsEmptyString(&vm), static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectWithoutTransition(vm, vm.propertyNames->name, jsString(vm, name), static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectWithoutTransition(vm, vm.propertyNames->message, jsEmptyString(vm), static_cast<unsigned>(PropertyAttribute::DontEnum));
}
// ------------------------------ Functions ---------------------------
@@ -120,11 +120,11 @@
// 8. If name is the empty String, return msg.
if (!nameString.length())
- return JSValue::encode(message.isString() ? message : jsString(exec, messageString));
+ return JSValue::encode(message.isString() ? message : jsString(vm, messageString));
// 9. If msg is the empty String, return name.
if (!messageString.length())
- return JSValue::encode(name.isString() ? name : jsString(exec, nameString));
+ return JSValue::encode(name.isString() ? name : jsString(vm, nameString));
// 10. Return the result of concatenating name, ":", a single space character, and msg.
RELEASE_AND_RETURN(scope, JSValue::encode(jsMakeNontrivialString(exec, nameString, ": ", messageString)));
diff --git a/Source/JavaScriptCore/runtime/ExceptionHelpers.cpp b/Source/JavaScriptCore/runtime/ExceptionHelpers.cpp
index dc392f0..73703b2 100644
--- a/Source/JavaScriptCore/runtime/ExceptionHelpers.cpp
+++ b/Source/JavaScriptCore/runtime/ExceptionHelpers.cpp
@@ -50,7 +50,7 @@
JSValue TerminatedExecutionError::defaultValue(const JSObject*, ExecState* exec, PreferredPrimitiveType hint)
{
if (hint == PreferString)
- return jsNontrivialString(exec, String("JavaScript execution terminated."_s));
+ return jsNontrivialString(exec->vm(), String("JavaScript execution terminated."_s));
return JSValue(PNaN);
}
diff --git a/Source/JavaScriptCore/runtime/FunctionPrototype.cpp b/Source/JavaScriptCore/runtime/FunctionPrototype.cpp
index 2cec7d6..9619c00 100644
--- a/Source/JavaScriptCore/runtime/FunctionPrototype.cpp
+++ b/Source/JavaScriptCore/runtime/FunctionPrototype.cpp
@@ -1,6 +1,6 @@
/*
* Copyright (C) 1999-2001 Harri Porten (porten@kde.org)
- * Copyright (C) 2003-2009, 2015-2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2003-2019 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -89,7 +89,7 @@
FunctionExecutable* executable = function->jsExecutable();
if (executable->isClass())
- return JSValue::encode(jsString(exec, executable->classSource().view().toString()));
+ return JSValue::encode(jsString(vm, executable->classSource().view().toString()));
String functionHeader;
switch (executable->parseMode()) {
diff --git a/Source/JavaScriptCore/runtime/FunctionRareData.cpp b/Source/JavaScriptCore/runtime/FunctionRareData.cpp
index 8ee08e9..472e8cc 100644
--- a/Source/JavaScriptCore/runtime/FunctionRareData.cpp
+++ b/Source/JavaScriptCore/runtime/FunctionRareData.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-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
@@ -88,7 +88,7 @@
{
m_objectAllocationProfile.clear();
m_internalFunctionAllocationProfile.clear();
- m_objectAllocationProfileWatchpoint.fireAll(*vm(), reason);
+ m_objectAllocationProfileWatchpoint.fireAll(vm(), reason);
}
void FunctionRareData::AllocationProfileClearingWatchpoint::fireInternal(VM&, const FireDetail&)
diff --git a/Source/JavaScriptCore/runtime/GeneratorFunctionPrototype.cpp b/Source/JavaScriptCore/runtime/GeneratorFunctionPrototype.cpp
index 421787a..f65a834 100644
--- a/Source/JavaScriptCore/runtime/GeneratorFunctionPrototype.cpp
+++ b/Source/JavaScriptCore/runtime/GeneratorFunctionPrototype.cpp
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2015 Yusuke Suzuki <utatane.tea@gmail.com>.
+ * 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
@@ -51,7 +52,7 @@
Base::finishCreation(vm);
ASSERT(inherits(vm, info()));
putDirectWithoutTransition(vm, vm.propertyNames->length, jsNumber(0), PropertyAttribute::ReadOnly | PropertyAttribute::DontEnum);
- putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(&vm, "GeneratorFunction"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
+ putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(vm, "GeneratorFunction"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
}
} // namespace JSC
diff --git a/Source/JavaScriptCore/runtime/GeneratorPrototype.cpp b/Source/JavaScriptCore/runtime/GeneratorPrototype.cpp
index 1374148..99823aa 100644
--- a/Source/JavaScriptCore/runtime/GeneratorPrototype.cpp
+++ b/Source/JavaScriptCore/runtime/GeneratorPrototype.cpp
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2015 Yusuke Suzuki <utatane.tea@gmail.com>.
+ * 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
@@ -48,7 +49,7 @@
{
Base::finishCreation(vm);
ASSERT(inherits(vm, info()));
- putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(&vm, "Generator"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
+ putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(vm, "Generator"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
}
} // namespace JSC
diff --git a/Source/JavaScriptCore/runtime/GenericArgumentsInlines.h b/Source/JavaScriptCore/runtime/GenericArgumentsInlines.h
index d56ebf5..69bd6ce 100644
--- a/Source/JavaScriptCore/runtime/GenericArgumentsInlines.h
+++ b/Source/JavaScriptCore/runtime/GenericArgumentsInlines.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-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
@@ -92,18 +92,18 @@
template<typename Type>
void GenericArguments<Type>::getOwnPropertyNames(JSObject* object, ExecState* exec, PropertyNameArray& array, EnumerationMode mode)
{
+ VM& vm = exec->vm();
Type* thisObject = jsCast<Type*>(object);
if (array.includeStringProperties()) {
for (unsigned i = 0; i < thisObject->internalLength(); ++i) {
if (!thisObject->isMappedArgument(i))
continue;
- array.add(Identifier::from(exec, i));
+ array.add(Identifier::from(vm, i));
}
}
if (mode.includeDontEnumProperties() && !thisObject->overrodeThings()) {
- VM& vm = exec->vm();
array.add(vm.propertyNames->length);
array.add(vm.propertyNames->callee);
if (array.includeSymbolProperties())
diff --git a/Source/JavaScriptCore/runtime/GetterSetter.h b/Source/JavaScriptCore/runtime/GetterSetter.h
index dc9d113..2a1a55e 100644
--- a/Source/JavaScriptCore/runtime/GetterSetter.h
+++ b/Source/JavaScriptCore/runtime/GetterSetter.h
@@ -1,7 +1,7 @@
/*
* Copyright (C) 1999-2001 Harri Porten (porten@kde.org)
* Copyright (C) 2001 Peter Kelly (pmk@post.com)
- * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2003-2019 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -87,8 +87,8 @@
return result;
}
- bool isGetterNull() const { return !!jsDynamicCast<NullGetterFunction*>(*m_getter.get()->vm(), m_getter.get()); }
- bool isSetterNull() const { return !!jsDynamicCast<NullSetterFunction*>(*m_setter.get()->vm(), m_setter.get()); }
+ bool isGetterNull() const { return !!jsDynamicCast<NullGetterFunction*>(m_getter.get()->vm(), m_getter.get()); }
+ bool isSetterNull() const { return !!jsDynamicCast<NullSetterFunction*>(m_setter.get()->vm(), m_setter.get()); }
JSObject* setter() const { return m_setter.get(); }
diff --git a/Source/JavaScriptCore/runtime/Identifier.cpp b/Source/JavaScriptCore/runtime/Identifier.cpp
index 12c7a82..06c6007 100644
--- a/Source/JavaScriptCore/runtime/Identifier.cpp
+++ b/Source/JavaScriptCore/runtime/Identifier.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2003-2019 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -35,28 +35,23 @@
namespace JSC {
-Ref<StringImpl> Identifier::add(VM* vm, const char* c)
+Ref<StringImpl> Identifier::add(VM& vm, const char* c)
{
ASSERT(c);
ASSERT(c[0]);
if (!c[1])
- return vm->smallStrings.singleCharacterStringRep(c[0]);
+ return vm.smallStrings.singleCharacterStringRep(c[0]);
return *AtomStringImpl::add(c);
}
-Ref<StringImpl> Identifier::add(ExecState* exec, const char* c)
-{
- return add(&exec->vm(), c);
-}
-
-Ref<StringImpl> Identifier::add8(VM* vm, const UChar* s, int length)
+Ref<StringImpl> Identifier::add8(VM& vm, const UChar* s, int length)
{
if (length == 1) {
UChar c = s[0];
ASSERT(isLatin1(c));
if (canUseSingleCharacterString(c))
- return vm->smallStrings.singleCharacterStringRep(c);
+ return vm.smallStrings.singleCharacterStringRep(c);
}
if (!length)
return *StringImpl::empty();
@@ -64,34 +59,19 @@
return *AtomStringImpl::add(s, length);
}
-Identifier Identifier::from(ExecState* exec, unsigned value)
+Identifier Identifier::from(VM& vm, unsigned value)
{
- return Identifier(exec, exec->vm().numericStrings.add(value));
+ return Identifier(vm, vm.numericStrings.add(value));
}
-Identifier Identifier::from(ExecState* exec, int value)
+Identifier Identifier::from(VM& vm, int value)
{
- return Identifier(exec, exec->vm().numericStrings.add(value));
+ return Identifier(vm, vm.numericStrings.add(value));
}
-Identifier Identifier::from(ExecState* exec, double value)
+Identifier Identifier::from(VM& vm, double value)
{
- return Identifier(exec, exec->vm().numericStrings.add(value));
-}
-
-Identifier Identifier::from(VM* vm, unsigned value)
-{
- return Identifier(vm, vm->numericStrings.add(value));
-}
-
-Identifier Identifier::from(VM* vm, int value)
-{
- return Identifier(vm, vm->numericStrings.add(value));
-}
-
-Identifier Identifier::from(VM* vm, double value)
-{
- return Identifier(vm, vm->numericStrings.add(value));
+ return Identifier(vm, vm.numericStrings.add(value));
}
void Identifier::dump(PrintStream& out) const
@@ -109,24 +89,18 @@
#ifndef NDEBUG
-void Identifier::checkCurrentAtomStringTable(VM* vm)
+void Identifier::checkCurrentAtomStringTable(VM& vm)
{
// Check the identifier table accessible through the threadspecific matches the
// vm's identifier table.
- ASSERT_UNUSED(vm, vm->atomStringTable() == Thread::current().atomStringTable());
-}
-
-void Identifier::checkCurrentAtomStringTable(ExecState* exec)
-{
- checkCurrentAtomStringTable(&exec->vm());
+ ASSERT_UNUSED(vm, vm.atomStringTable() == Thread::current().atomStringTable());
}
#else
// These only exists so that our exports are the same for debug and release builds.
// This would be an RELEASE_ASSERT_NOT_REACHED(), but we're in NDEBUG only code here!
-NO_RETURN_DUE_TO_CRASH void Identifier::checkCurrentAtomStringTable(VM*) { CRASH(); }
-NO_RETURN_DUE_TO_CRASH void Identifier::checkCurrentAtomStringTable(ExecState*) { CRASH(); }
+NO_RETURN_DUE_TO_CRASH void Identifier::checkCurrentAtomStringTable(VM&) { CRASH(); }
#endif
diff --git a/Source/JavaScriptCore/runtime/Identifier.h b/Source/JavaScriptCore/runtime/Identifier.h
index 104a147..3846c0b 100644
--- a/Source/JavaScriptCore/runtime/Identifier.h
+++ b/Source/JavaScriptCore/runtime/Identifier.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003, 2006, 2007, 2008, 2009, 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2003-2019 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -111,31 +111,26 @@
// Only to be used with string literals.
template<unsigned charactersCount>
- static Identifier fromString(VM*, const char (&characters)[charactersCount]);
- template<unsigned charactersCount>
- static Identifier fromString(ExecState*, const char (&characters)[charactersCount]);
- static Identifier fromString(VM*, const LChar*, int length);
- static Identifier fromString(VM*, const UChar*, int length);
- static Identifier fromString(VM*, const String&);
- static Identifier fromString(ExecState*, AtomStringImpl*);
- static Identifier fromString(ExecState*, const AtomString&);
- static Identifier fromString(ExecState*, const String&);
- static Identifier fromString(ExecState*, const char*);
- static Identifier fromString(VM* vm, const Vector<LChar>& characters) { return fromString(vm, characters.data(), characters.size()); }
+ static Identifier fromString(VM&, const char (&characters)[charactersCount]);
+ static Identifier fromString(VM&, ASCIILiteral);
+ static Identifier fromString(VM&, const LChar*, int length);
+ static Identifier fromString(VM&, const UChar*, int length);
+ static Identifier fromString(VM&, const String&);
+ static Identifier fromString(VM&, AtomStringImpl*);
+ static Identifier fromString(VM&, const AtomString&);
+ static Identifier fromString(VM& vm, SymbolImpl*);
+ static Identifier fromString(VM&, const char*);
+ static Identifier fromString(VM& vm, const Vector<LChar>& characters) { return fromString(vm, characters.data(), characters.size()); }
- static Identifier fromUid(VM*, UniquedStringImpl* uid);
- static Identifier fromUid(ExecState*, UniquedStringImpl* uid);
+ static Identifier fromUid(VM&, UniquedStringImpl* uid);
static Identifier fromUid(const PrivateName&);
static Identifier fromUid(SymbolImpl&);
- static Identifier createLCharFromUChar(VM* vm, const UChar* s, int length) { return Identifier(vm, add8(vm, s, length)); }
+ static Identifier createLCharFromUChar(VM& vm, const UChar* s, int length) { return Identifier(vm, add8(vm, s, length)); }
- JS_EXPORT_PRIVATE static Identifier from(ExecState*, unsigned y);
- JS_EXPORT_PRIVATE static Identifier from(ExecState*, int y);
- static Identifier from(ExecState*, double y);
- static Identifier from(VM*, unsigned y);
- static Identifier from(VM*, int y);
- static Identifier from(VM*, double y);
+ JS_EXPORT_PRIVATE static Identifier from(VM&, unsigned y);
+ JS_EXPORT_PRIVATE static Identifier from(VM&, int y);
+ static Identifier from(VM&, double y);
bool isNull() const { return m_string.isNull(); }
bool isEmpty() const { return m_string.isEmpty(); }
@@ -157,8 +152,7 @@
static bool equal(const StringImpl* a, const StringImpl* b) { return ::equal(a, b); }
// Only to be used with string literals.
- JS_EXPORT_PRIVATE static Ref<StringImpl> add(VM*, const char*);
- JS_EXPORT_PRIVATE static Ref<StringImpl> add(ExecState*, const char*);
+ JS_EXPORT_PRIVATE static Ref<StringImpl> add(VM&, const char*);
void dump(PrintStream&) const;
@@ -167,14 +161,14 @@
// Only to be used with string literals.
template<unsigned charactersCount>
- Identifier(VM* vm, const char (&characters)[charactersCount]) : m_string(add(vm, characters)) { ASSERT(m_string.impl()->isAtom()); }
+ Identifier(VM& vm, const char (&characters)[charactersCount]) : m_string(add(vm, characters)) { ASSERT(m_string.impl()->isAtom()); }
- Identifier(VM* vm, const LChar* s, int length) : m_string(add(vm, s, length)) { ASSERT(m_string.impl()->isAtom()); }
- Identifier(VM* vm, const UChar* s, int length) : m_string(add(vm, s, length)) { ASSERT(m_string.impl()->isAtom()); }
- Identifier(ExecState*, AtomStringImpl*);
- Identifier(ExecState*, const AtomString&);
- Identifier(VM* vm, const String& string) : m_string(add(vm, string.impl())) { ASSERT(m_string.impl()->isAtom()); }
- Identifier(VM* vm, StringImpl* rep) : m_string(add(vm, rep)) { ASSERT(m_string.impl()->isAtom()); }
+ Identifier(VM& vm, const LChar* s, int length) : m_string(add(vm, s, length)) { ASSERT(m_string.impl()->isAtom()); }
+ Identifier(VM& vm, const UChar* s, int length) : m_string(add(vm, s, length)) { ASSERT(m_string.impl()->isAtom()); }
+ Identifier(VM&, AtomStringImpl*);
+ Identifier(VM&, const AtomString&);
+ Identifier(VM& vm, const String& string) : m_string(add(vm, string.impl())) { ASSERT(m_string.impl()->isAtom()); }
+ Identifier(VM& vm, StringImpl* rep) : m_string(add(vm, rep)) { ASSERT(m_string.impl()->isAtom()); }
Identifier(SymbolImpl& uid)
: m_string(&uid)
@@ -187,19 +181,16 @@
static bool equal(const Identifier& a, const Identifier& b) { return a.m_string.impl() == b.m_string.impl(); }
static bool equal(const Identifier& a, const LChar* b) { return equal(a.m_string.impl(), b); }
- template <typename T> static Ref<StringImpl> add(VM*, const T*, int length);
- static Ref<StringImpl> add8(VM*, const UChar*, int length);
+ template <typename T> static Ref<StringImpl> add(VM&, const T*, int length);
+ static Ref<StringImpl> add8(VM&, const UChar*, int length);
template <typename T> ALWAYS_INLINE static bool canUseSingleCharacterString(T);
- static Ref<StringImpl> add(ExecState*, StringImpl*);
- static Ref<StringImpl> add(VM*, StringImpl*);
+ static Ref<StringImpl> add(VM&, StringImpl*);
#ifndef NDEBUG
- JS_EXPORT_PRIVATE static void checkCurrentAtomStringTable(ExecState*);
- JS_EXPORT_PRIVATE static void checkCurrentAtomStringTable(VM*);
+ JS_EXPORT_PRIVATE static void checkCurrentAtomStringTable(VM&);
#else
- JS_EXPORT_PRIVATE NO_RETURN_DUE_TO_CRASH static void checkCurrentAtomStringTable(ExecState*);
- JS_EXPORT_PRIVATE NO_RETURN_DUE_TO_CRASH static void checkCurrentAtomStringTable(VM*);
+ JS_EXPORT_PRIVATE NO_RETURN_DUE_TO_CRASH static void checkCurrentAtomStringTable(VM&);
#endif
};
@@ -215,12 +206,12 @@
}
template <typename T>
-Ref<StringImpl> Identifier::add(VM* vm, const T* s, int length)
+Ref<StringImpl> Identifier::add(VM& vm, const T* s, int length)
{
if (length == 1) {
T c = s[0];
if (canUseSingleCharacterString(c))
- return vm->smallStrings.singleCharacterStringRep(c);
+ return vm.smallStrings.singleCharacterStringRep(c);
}
if (!length)
return *StringImpl::empty();
diff --git a/Source/JavaScriptCore/runtime/IdentifierInlines.h b/Source/JavaScriptCore/runtime/IdentifierInlines.h
index 45b7ec8..18e88d7 100644
--- a/Source/JavaScriptCore/runtime/IdentifierInlines.h
+++ b/Source/JavaScriptCore/runtime/IdentifierInlines.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-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
@@ -31,58 +31,45 @@
namespace JSC {
-inline Identifier::Identifier(ExecState* exec, AtomStringImpl* string)
+inline Identifier::Identifier(VM& vm, AtomStringImpl* string)
: m_string(string)
{
#ifndef NDEBUG
- checkCurrentAtomStringTable(exec);
+ checkCurrentAtomStringTable(vm);
if (string)
ASSERT_WITH_MESSAGE(!string->length() || string->isSymbol() || AtomStringImpl::isInAtomStringTable(string), "The atomic string comes from an other thread!");
#else
- UNUSED_PARAM(exec);
+ UNUSED_PARAM(vm);
#endif
}
-inline Identifier::Identifier(ExecState* exec, const AtomString& string)
+inline Identifier::Identifier(VM& vm, const AtomString& string)
: m_string(string.string())
{
#ifndef NDEBUG
- checkCurrentAtomStringTable(exec);
+ checkCurrentAtomStringTable(vm);
if (!string.isNull())
ASSERT_WITH_MESSAGE(!string.length() || string.impl()->isSymbol() || AtomStringImpl::isInAtomStringTable(string.impl()), "The atomic string comes from an other thread!");
#else
- UNUSED_PARAM(exec);
+ UNUSED_PARAM(vm);
#endif
}
-inline Ref<StringImpl> Identifier::add(ExecState* exec, StringImpl* r)
-{
-#ifndef NDEBUG
- checkCurrentAtomStringTable(exec);
-#endif
- VM& vm = exec->vm();
- return *AtomStringImpl::addWithStringTableProvider(vm, r);
-}
-inline Ref<StringImpl> Identifier::add(VM* vm, StringImpl* r)
+inline Ref<StringImpl> Identifier::add(VM& vm, StringImpl* r)
{
#ifndef NDEBUG
checkCurrentAtomStringTable(vm);
#endif
- return *AtomStringImpl::addWithStringTableProvider(*vm, r);
+ return *AtomStringImpl::addWithStringTableProvider(vm, r);
}
-inline Identifier Identifier::fromUid(VM* vm, UniquedStringImpl* uid)
+inline Identifier Identifier::fromUid(VM& vm, UniquedStringImpl* uid)
{
if (!uid || !uid->isSymbol())
return Identifier(vm, uid);
return static_cast<SymbolImpl&>(*uid);
}
-inline Identifier Identifier::fromUid(ExecState* exec, UniquedStringImpl* uid)
-{
- return fromUid(&exec->vm(), uid);
-}
-
inline Identifier Identifier::fromUid(const PrivateName& name)
{
return name.uid();
@@ -94,64 +81,63 @@
}
template<unsigned charactersCount>
-inline Identifier Identifier::fromString(VM* vm, const char (&characters)[charactersCount])
+inline Identifier Identifier::fromString(VM& vm, const char (&characters)[charactersCount])
{
- return Identifier(vm, characters);
+ return Identifier(&vm, characters);
}
-template<unsigned charactersCount>
-inline Identifier Identifier::fromString(ExecState* exec, const char (&characters)[charactersCount])
+inline Identifier Identifier::fromString(VM& vm, ASCIILiteral s)
{
- return Identifier(&exec->vm(), characters);
+ return Identifier(vm, String(s));
}
-inline Identifier Identifier::fromString(VM* vm, const LChar* s, int length)
+inline Identifier Identifier::fromString(VM& vm, const LChar* s, int length)
{
return Identifier(vm, s, length);
}
-inline Identifier Identifier::fromString(VM* vm, const UChar* s, int length)
+inline Identifier Identifier::fromString(VM& vm, const UChar* s, int length)
{
return Identifier(vm, s, length);
}
-inline Identifier Identifier::fromString(VM* vm, const String& string)
+inline Identifier Identifier::fromString(VM& vm, const String& string)
{
return Identifier(vm, string.impl());
}
-inline Identifier Identifier::fromString(ExecState* exec, const String& string)
+inline Identifier Identifier::fromString(VM& vm, AtomStringImpl* atomStringImpl)
{
- return Identifier(&exec->vm(), string.impl());
+ return Identifier(vm, atomStringImpl);
}
-inline Identifier Identifier::fromString(ExecState* exec, AtomStringImpl* atomString)
+inline Identifier Identifier::fromString(VM& vm, const AtomString& atomString)
{
- return Identifier(exec, atomString);
+ return Identifier(vm, atomString);
}
-inline Identifier Identifier::fromString(ExecState* exec, const AtomString& atomString)
+inline Identifier Identifier::fromString(VM& vm, SymbolImpl* symbolImpl)
{
- return Identifier(exec, atomString);
+ return Identifier(vm, symbolImpl);
}
-inline Identifier Identifier::fromString(ExecState* exec, const char* s)
+inline Identifier Identifier::fromString(VM& vm, const char* s)
{
- return Identifier(exec, AtomString(s));
+ return Identifier(vm, AtomString(s));
}
inline JSValue identifierToJSValue(VM& vm, const Identifier& identifier)
{
if (identifier.isSymbol())
return Symbol::create(vm, static_cast<SymbolImpl&>(*identifier.impl()));
- return jsString(&vm, identifier.impl());
+ return jsString(vm, identifier.impl());
}
inline JSValue identifierToSafePublicJSValue(VM& vm, const Identifier& identifier)
{
if (identifier.isSymbol() && !identifier.isPrivateName())
return Symbol::create(vm, static_cast<SymbolImpl&>(*identifier.impl()));
- return jsString(&vm, identifier.impl());
+ return jsString(vm, identifier.impl());
}
} // namespace JSC
diff --git a/Source/JavaScriptCore/runtime/InternalFunction.cpp b/Source/JavaScriptCore/runtime/InternalFunction.cpp
index 67718e2..af9dde8 100644
--- a/Source/JavaScriptCore/runtime/InternalFunction.cpp
+++ b/Source/JavaScriptCore/runtime/InternalFunction.cpp
@@ -52,7 +52,7 @@
ASSERT(methodTable(vm)->getCallData == InternalFunction::info()->methodTable.getCallData);
ASSERT(methodTable(vm)->getConstructData == InternalFunction::info()->methodTable.getConstructData);
ASSERT(type() == InternalFunctionType);
- JSString* nameString = jsString(&vm, name);
+ JSString* nameString = jsString(vm, name);
m_originalName.set(vm, this, nameString);
if (nameVisibility == NameVisibility::Visible) {
if (nameAdditionMode == NameAdditionMode::WithStructureTransition)
diff --git a/Source/JavaScriptCore/runtime/IntlCollator.cpp b/Source/JavaScriptCore/runtime/IntlCollator.cpp
index eeba37f..aa943e6 100644
--- a/Source/JavaScriptCore/runtime/IntlCollator.cpp
+++ b/Source/JavaScriptCore/runtime/IntlCollator.cpp
@@ -1,7 +1,7 @@
/*
* Copyright (C) 2015 Andy VanWagoner (andy@vanwagoner.family)
* Copyright (C) 2015 Sukolsak Sakshuwong (sukolsak@gmail.com)
- * Copyright (C) 2016-2017 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2016-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
@@ -412,13 +412,13 @@
}
JSObject* options = constructEmptyObject(&state);
- options->putDirect(vm, vm.propertyNames->locale, jsString(&state, m_locale));
- options->putDirect(vm, vm.propertyNames->usage, jsNontrivialString(&state, usageString(m_usage)));
- options->putDirect(vm, vm.propertyNames->sensitivity, jsNontrivialString(&state, sensitivityString(m_sensitivity)));
+ options->putDirect(vm, vm.propertyNames->locale, jsString(vm, m_locale));
+ options->putDirect(vm, vm.propertyNames->usage, jsNontrivialString(vm, usageString(m_usage)));
+ options->putDirect(vm, vm.propertyNames->sensitivity, jsNontrivialString(vm, sensitivityString(m_sensitivity)));
options->putDirect(vm, vm.propertyNames->ignorePunctuation, jsBoolean(m_ignorePunctuation));
- options->putDirect(vm, vm.propertyNames->collation, jsString(&state, m_collation));
+ options->putDirect(vm, vm.propertyNames->collation, jsString(vm, m_collation));
options->putDirect(vm, vm.propertyNames->numeric, jsBoolean(m_numeric));
- options->putDirect(vm, vm.propertyNames->caseFirst, jsNontrivialString(&state, caseFirstString(m_caseFirst)));
+ options->putDirect(vm, vm.propertyNames->caseFirst, jsNontrivialString(vm, caseFirstString(m_caseFirst)));
return options;
}
diff --git a/Source/JavaScriptCore/runtime/IntlCollatorPrototype.cpp b/Source/JavaScriptCore/runtime/IntlCollatorPrototype.cpp
index 35269d0..cdf486b 100644
--- a/Source/JavaScriptCore/runtime/IntlCollatorPrototype.cpp
+++ b/Source/JavaScriptCore/runtime/IntlCollatorPrototype.cpp
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2015 Andy VanWagoner (andy@vanwagoner.family)
- * Copyright (C) 2016-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-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
@@ -75,7 +75,7 @@
{
Base::finishCreation(vm);
- putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(&vm, "Object"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
+ putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(vm, "Object"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
}
static EncodedJSValue JSC_HOST_CALL IntlCollatorFuncCompare(ExecState* state)
diff --git a/Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp b/Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp
index 4bf7dbc..4378b40 100644
--- a/Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp
+++ b/Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2015 Andy VanWagoner (andy@vanwagoner.family)
- * Copyright (C) 2016-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-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
@@ -316,7 +316,7 @@
// a. For each of the property names "year", "month", "day":
// i. Let status be CreateDatePropertyOrThrow(options, prop, "numeric").
// ii. ReturnIfAbrupt(status).
- JSString* numeric = jsNontrivialString(&exec, "numeric"_s);
+ JSString* numeric = jsNontrivialString(vm, "numeric"_s);
options->putDirect(vm, vm.propertyNames->year, numeric);
RETURN_IF_EXCEPTION(scope, nullptr);
@@ -848,42 +848,42 @@
}
JSObject* options = constructEmptyObject(&exec);
- options->putDirect(vm, vm.propertyNames->locale, jsNontrivialString(&exec, m_locale));
- options->putDirect(vm, vm.propertyNames->calendar, jsNontrivialString(&exec, m_calendar));
- options->putDirect(vm, vm.propertyNames->numberingSystem, jsNontrivialString(&exec, m_numberingSystem));
- options->putDirect(vm, vm.propertyNames->timeZone, jsNontrivialString(&exec, m_timeZone));
+ options->putDirect(vm, vm.propertyNames->locale, jsNontrivialString(vm, m_locale));
+ options->putDirect(vm, vm.propertyNames->calendar, jsNontrivialString(vm, m_calendar));
+ options->putDirect(vm, vm.propertyNames->numberingSystem, jsNontrivialString(vm, m_numberingSystem));
+ options->putDirect(vm, vm.propertyNames->timeZone, jsNontrivialString(vm, m_timeZone));
if (m_weekday != Weekday::None)
- options->putDirect(vm, vm.propertyNames->weekday, jsNontrivialString(&exec, weekdayString(m_weekday)));
+ options->putDirect(vm, vm.propertyNames->weekday, jsNontrivialString(vm, weekdayString(m_weekday)));
if (m_era != Era::None)
- options->putDirect(vm, vm.propertyNames->era, jsNontrivialString(&exec, eraString(m_era)));
+ options->putDirect(vm, vm.propertyNames->era, jsNontrivialString(vm, eraString(m_era)));
if (m_year != Year::None)
- options->putDirect(vm, vm.propertyNames->year, jsNontrivialString(&exec, yearString(m_year)));
+ options->putDirect(vm, vm.propertyNames->year, jsNontrivialString(vm, yearString(m_year)));
if (m_month != Month::None)
- options->putDirect(vm, vm.propertyNames->month, jsNontrivialString(&exec, monthString(m_month)));
+ options->putDirect(vm, vm.propertyNames->month, jsNontrivialString(vm, monthString(m_month)));
if (m_day != Day::None)
- options->putDirect(vm, vm.propertyNames->day, jsNontrivialString(&exec, dayString(m_day)));
+ options->putDirect(vm, vm.propertyNames->day, jsNontrivialString(vm, dayString(m_day)));
if (m_hour != Hour::None)
- options->putDirect(vm, vm.propertyNames->hour, jsNontrivialString(&exec, hourString(m_hour)));
+ options->putDirect(vm, vm.propertyNames->hour, jsNontrivialString(vm, hourString(m_hour)));
if (!m_hourCycle.isNull()) {
- options->putDirect(vm, vm.propertyNames->hourCycle, jsNontrivialString(&exec, m_hourCycle));
+ options->putDirect(vm, vm.propertyNames->hourCycle, jsNontrivialString(vm, m_hourCycle));
options->putDirect(vm, vm.propertyNames->hour12, jsBoolean(m_hourCycle == "h11" || m_hourCycle == "h12"));
}
if (m_minute != Minute::None)
- options->putDirect(vm, vm.propertyNames->minute, jsNontrivialString(&exec, minuteString(m_minute)));
+ options->putDirect(vm, vm.propertyNames->minute, jsNontrivialString(vm, minuteString(m_minute)));
if (m_second != Second::None)
- options->putDirect(vm, vm.propertyNames->second, jsNontrivialString(&exec, secondString(m_second)));
+ options->putDirect(vm, vm.propertyNames->second, jsNontrivialString(vm, secondString(m_second)));
if (m_timeZoneName != TimeZoneName::None)
- options->putDirect(vm, vm.propertyNames->timeZoneName, jsNontrivialString(&exec, timeZoneNameString(m_timeZoneName)));
+ options->putDirect(vm, vm.propertyNames->timeZoneName, jsNontrivialString(vm, timeZoneNameString(m_timeZoneName)));
return options;
}
@@ -915,7 +915,7 @@
if (U_FAILURE(status))
return throwTypeError(&exec, scope, "failed to format date value"_s);
- return jsString(&exec, String(result.data(), resultLength));
+ return jsString(vm, String(result.data(), resultLength));
}
#if JSC_ICU_HAS_UFIELDPOSITER
@@ -1018,8 +1018,8 @@
return throwOutOfMemoryError(&exec, scope);
auto resultString = String(result.data(), resultLength);
- auto typePropertyName = Identifier::fromString(&vm, "type");
- auto literalString = jsString(&exec, "literal"_s);
+ auto typePropertyName = Identifier::fromString(vm, "type");
+ auto literalString = jsString(vm, "literal"_s);
int32_t previousEndIndex = 0;
int32_t beginIndex = 0;
@@ -1030,7 +1030,7 @@
beginIndex = endIndex = resultLength;
if (previousEndIndex < beginIndex) {
- auto value = jsString(&exec, resultString.substring(previousEndIndex, beginIndex - previousEndIndex));
+ auto value = jsString(vm, resultString.substring(previousEndIndex, beginIndex - previousEndIndex));
JSObject* part = constructEmptyObject(&exec);
part->putDirect(vm, typePropertyName, literalString);
part->putDirect(vm, vm.propertyNames->value, value);
@@ -1040,8 +1040,8 @@
previousEndIndex = endIndex;
if (fieldType >= 0) {
- auto type = jsString(&exec, partTypeString(UDateFormatField(fieldType)));
- auto value = jsString(&exec, resultString.substring(beginIndex, endIndex - beginIndex));
+ auto type = jsString(vm, partTypeString(UDateFormatField(fieldType)));
+ auto value = jsString(vm, resultString.substring(beginIndex, endIndex - beginIndex));
JSObject* part = constructEmptyObject(&exec);
part->putDirect(vm, typePropertyName, type);
part->putDirect(vm, vm.propertyNames->value, value);
diff --git a/Source/JavaScriptCore/runtime/IntlDateTimeFormatPrototype.cpp b/Source/JavaScriptCore/runtime/IntlDateTimeFormatPrototype.cpp
index 1e4d760..715857b 100644
--- a/Source/JavaScriptCore/runtime/IntlDateTimeFormatPrototype.cpp
+++ b/Source/JavaScriptCore/runtime/IntlDateTimeFormatPrototype.cpp
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2015 Andy VanWagoner (andy@vanwagoner.family)
- * Copyright (C) 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-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
@@ -89,7 +89,7 @@
UNUSED_PARAM(globalObject);
#endif
- putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(&vm, "Object"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
+ putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(vm, "Object"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
}
static EncodedJSValue JSC_HOST_CALL IntlDateTimeFormatFuncFormatDateTime(ExecState* state)
diff --git a/Source/JavaScriptCore/runtime/IntlNumberFormat.cpp b/Source/JavaScriptCore/runtime/IntlNumberFormat.cpp
index 1311381..f7a85c4 100644
--- a/Source/JavaScriptCore/runtime/IntlNumberFormat.cpp
+++ b/Source/JavaScriptCore/runtime/IntlNumberFormat.cpp
@@ -1,7 +1,7 @@
/*
* Copyright (C) 2015 Andy VanWagoner (andy@vanwagoner.family)
* Copyright (C) 2016 Sukolsak Sakshuwong (sukolsak@gmail.com)
- * Copyright (C) 2016-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-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
@@ -195,7 +195,7 @@
m_numberingSystem = result.get("nu"_s);
- String styleString = intlStringOption(state, options, Identifier::fromString(&vm, "style"), { "decimal", "percent", "currency" }, "style must be either \"decimal\", \"percent\", or \"currency\"", "decimal");
+ String styleString = intlStringOption(state, options, Identifier::fromString(vm, "style"), { "decimal", "percent", "currency" }, "style must be either \"decimal\", \"percent\", or \"currency\"", "decimal");
RETURN_IF_EXCEPTION(scope, void());
if (styleString == "decimal")
m_style = Style::Decimal;
@@ -206,7 +206,7 @@
else
ASSERT_NOT_REACHED();
- String currency = intlStringOption(state, options, Identifier::fromString(&vm, "currency"), { }, nullptr, nullptr);
+ String currency = intlStringOption(state, options, Identifier::fromString(vm, "currency"), { }, nullptr, nullptr);
RETURN_IF_EXCEPTION(scope, void());
if (!currency.isNull()) {
if (currency.length() != 3 || !currency.isAllSpecialCharacters<isASCIIAlpha>()) {
@@ -227,7 +227,7 @@
currencyDigits = computeCurrencyDigits(currency);
}
- String currencyDisplayString = intlStringOption(state, options, Identifier::fromString(&vm, "currencyDisplay"), { "code", "symbol", "name" }, "currencyDisplay must be either \"code\", \"symbol\", or \"name\"", "symbol");
+ String currencyDisplayString = intlStringOption(state, options, Identifier::fromString(vm, "currencyDisplay"), { "code", "symbol", "name" }, "currencyDisplay must be either \"code\", \"symbol\", or \"name\"", "symbol");
RETURN_IF_EXCEPTION(scope, void());
if (m_style == Style::Currency) {
if (currencyDisplayString == "code")
@@ -240,13 +240,13 @@
ASSERT_NOT_REACHED();
}
- unsigned minimumIntegerDigits = intlNumberOption(state, options, Identifier::fromString(&vm, "minimumIntegerDigits"), 1, 21, 1);
+ unsigned minimumIntegerDigits = intlNumberOption(state, options, Identifier::fromString(vm, "minimumIntegerDigits"), 1, 21, 1);
RETURN_IF_EXCEPTION(scope, void());
m_minimumIntegerDigits = minimumIntegerDigits;
unsigned minimumFractionDigitsDefault = (m_style == Style::Currency) ? currencyDigits : 0;
- unsigned minimumFractionDigits = intlNumberOption(state, options, Identifier::fromString(&vm, "minimumFractionDigits"), 0, 20, minimumFractionDigitsDefault);
+ unsigned minimumFractionDigits = intlNumberOption(state, options, Identifier::fromString(vm, "minimumFractionDigits"), 0, 20, minimumFractionDigitsDefault);
RETURN_IF_EXCEPTION(scope, void());
m_minimumFractionDigits = minimumFractionDigits;
@@ -258,27 +258,27 @@
else
maximumFractionDigitsDefault = std::max(minimumFractionDigits, 3u);
- unsigned maximumFractionDigits = intlNumberOption(state, options, Identifier::fromString(&vm, "maximumFractionDigits"), minimumFractionDigits, 20, maximumFractionDigitsDefault);
+ unsigned maximumFractionDigits = intlNumberOption(state, options, Identifier::fromString(vm, "maximumFractionDigits"), minimumFractionDigits, 20, maximumFractionDigitsDefault);
RETURN_IF_EXCEPTION(scope, void());
m_maximumFractionDigits = maximumFractionDigits;
- JSValue minimumSignificantDigitsValue = options->get(&state, Identifier::fromString(&vm, "minimumSignificantDigits"));
+ JSValue minimumSignificantDigitsValue = options->get(&state, Identifier::fromString(vm, "minimumSignificantDigits"));
RETURN_IF_EXCEPTION(scope, void());
- JSValue maximumSignificantDigitsValue = options->get(&state, Identifier::fromString(&vm, "maximumSignificantDigits"));
+ JSValue maximumSignificantDigitsValue = options->get(&state, Identifier::fromString(vm, "maximumSignificantDigits"));
RETURN_IF_EXCEPTION(scope, void());
if (!minimumSignificantDigitsValue.isUndefined() || !maximumSignificantDigitsValue.isUndefined()) {
- unsigned minimumSignificantDigits = intlDefaultNumberOption(state, minimumSignificantDigitsValue, Identifier::fromString(&vm, "minimumSignificantDigits"), 1, 21, 1);
+ unsigned minimumSignificantDigits = intlDefaultNumberOption(state, minimumSignificantDigitsValue, Identifier::fromString(vm, "minimumSignificantDigits"), 1, 21, 1);
RETURN_IF_EXCEPTION(scope, void());
- unsigned maximumSignificantDigits = intlDefaultNumberOption(state, maximumSignificantDigitsValue, Identifier::fromString(&vm, "maximumSignificantDigits"), minimumSignificantDigits, 21, 21);
+ unsigned maximumSignificantDigits = intlDefaultNumberOption(state, maximumSignificantDigitsValue, Identifier::fromString(vm, "maximumSignificantDigits"), minimumSignificantDigits, 21, 21);
RETURN_IF_EXCEPTION(scope, void());
m_minimumSignificantDigits = minimumSignificantDigits;
m_maximumSignificantDigits = maximumSignificantDigits;
}
bool usesFallback;
- bool useGrouping = intlBooleanOption(state, options, Identifier::fromString(&vm, "useGrouping"), usesFallback);
+ bool useGrouping = intlBooleanOption(state, options, Identifier::fromString(vm, "useGrouping"), usesFallback);
if (usesFallback)
useGrouping = true;
RETURN_IF_EXCEPTION(scope, void());
@@ -364,7 +364,7 @@
if (U_FAILURE(status))
return throwException(&state, scope, createError(&state, "Failed to format a number."_s));
- return jsString(&state, String(buffer.data(), length));
+ return jsString(vm, String(buffer.data(), length));
}
ASCIILiteral IntlNumberFormat::styleString(Style style)
@@ -415,22 +415,22 @@
}
JSObject* options = constructEmptyObject(&state);
- options->putDirect(vm, vm.propertyNames->locale, jsString(&state, m_locale));
- options->putDirect(vm, Identifier::fromString(&vm, "numberingSystem"), jsString(&state, m_numberingSystem));
- options->putDirect(vm, Identifier::fromString(&vm, "style"), jsNontrivialString(&state, styleString(m_style)));
+ options->putDirect(vm, vm.propertyNames->locale, jsString(vm, m_locale));
+ options->putDirect(vm, Identifier::fromString(vm, "numberingSystem"), jsString(vm, m_numberingSystem));
+ options->putDirect(vm, Identifier::fromString(vm, "style"), jsNontrivialString(vm, styleString(m_style)));
if (m_style == Style::Currency) {
- options->putDirect(vm, Identifier::fromString(&vm, "currency"), jsNontrivialString(&state, m_currency));
- options->putDirect(vm, Identifier::fromString(&vm, "currencyDisplay"), jsNontrivialString(&state, currencyDisplayString(m_currencyDisplay)));
+ options->putDirect(vm, Identifier::fromString(vm, "currency"), jsNontrivialString(vm, m_currency));
+ options->putDirect(vm, Identifier::fromString(vm, "currencyDisplay"), jsNontrivialString(vm, currencyDisplayString(m_currencyDisplay)));
}
- options->putDirect(vm, Identifier::fromString(&vm, "minimumIntegerDigits"), jsNumber(m_minimumIntegerDigits));
- options->putDirect(vm, Identifier::fromString(&vm, "minimumFractionDigits"), jsNumber(m_minimumFractionDigits));
- options->putDirect(vm, Identifier::fromString(&vm, "maximumFractionDigits"), jsNumber(m_maximumFractionDigits));
+ options->putDirect(vm, Identifier::fromString(vm, "minimumIntegerDigits"), jsNumber(m_minimumIntegerDigits));
+ options->putDirect(vm, Identifier::fromString(vm, "minimumFractionDigits"), jsNumber(m_minimumFractionDigits));
+ options->putDirect(vm, Identifier::fromString(vm, "maximumFractionDigits"), jsNumber(m_maximumFractionDigits));
if (m_minimumSignificantDigits) {
ASSERT(m_maximumSignificantDigits);
- options->putDirect(vm, Identifier::fromString(&vm, "minimumSignificantDigits"), jsNumber(m_minimumSignificantDigits));
- options->putDirect(vm, Identifier::fromString(&vm, "maximumSignificantDigits"), jsNumber(m_maximumSignificantDigits));
+ options->putDirect(vm, Identifier::fromString(vm, "minimumSignificantDigits"), jsNumber(m_minimumSignificantDigits));
+ options->putDirect(vm, Identifier::fromString(vm, "maximumSignificantDigits"), jsNumber(m_maximumSignificantDigits));
}
- options->putDirect(vm, Identifier::fromString(&vm, "useGrouping"), jsBoolean(m_useGrouping));
+ options->putDirect(vm, Identifier::fromString(vm, "useGrouping"), jsBoolean(m_useGrouping));
return options;
}
@@ -534,8 +534,8 @@
unsigned index = 0;
auto resultString = String(result.data(), resultLength);
- auto typePropertyName = Identifier::fromString(&vm, "type");
- auto literalString = jsString(&exec, "literal"_s);
+ auto typePropertyName = Identifier::fromString(vm, "type");
+ auto literalString = jsString(vm, "literal"_s);
int32_t currentIndex = 0;
while (currentIndex < resultLength) {
@@ -543,8 +543,8 @@
auto fieldType = fields[currentIndex].type;
while (currentIndex < resultLength && fields[currentIndex].type == fieldType)
++currentIndex;
- auto partType = fieldType == literalFieldType ? literalString : jsString(&exec, partTypeString(UNumberFormatFields(fieldType), value));
- auto partValue = jsSubstring(&vm, resultString, startIndex, currentIndex - startIndex);
+ auto partType = fieldType == literalFieldType ? literalString : jsString(vm, partTypeString(UNumberFormatFields(fieldType), value));
+ auto partValue = jsSubstring(vm, resultString, startIndex, currentIndex - startIndex);
JSObject* part = constructEmptyObject(&exec);
part->putDirect(vm, typePropertyName, partType);
part->putDirect(vm, vm.propertyNames->value, partValue);
diff --git a/Source/JavaScriptCore/runtime/IntlNumberFormatPrototype.cpp b/Source/JavaScriptCore/runtime/IntlNumberFormatPrototype.cpp
index f0cb457..5709c92 100644
--- a/Source/JavaScriptCore/runtime/IntlNumberFormatPrototype.cpp
+++ b/Source/JavaScriptCore/runtime/IntlNumberFormatPrototype.cpp
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2015 Andy VanWagoner (andy@vanwagoner.family)
- * Copyright (C) 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-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
@@ -86,7 +86,7 @@
UNUSED_PARAM(globalObject);
#endif
- putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(&vm, "Object"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
+ putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(vm, "Object"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
}
static EncodedJSValue JSC_HOST_CALL IntlNumberFormatFuncFormatNumber(ExecState* state)
diff --git a/Source/JavaScriptCore/runtime/IntlObject.cpp b/Source/JavaScriptCore/runtime/IntlObject.cpp
index be5aec0..801294a 100644
--- a/Source/JavaScriptCore/runtime/IntlObject.cpp
+++ b/Source/JavaScriptCore/runtime/IntlObject.cpp
@@ -1,7 +1,7 @@
/*
* Copyright (C) 2015 Andy VanWagoner (andy@vanwagoner.family)
* Copyright (C) 2015 Sukolsak Sakshuwong (sukolsak@gmail.com)
- * Copyright (C) 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-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
@@ -822,7 +822,7 @@
String noExtensionsLocale = removeUnicodeLocaleExtension(locale);
String availableLocale = bestAvailableLocale(availableLocales, noExtensionsLocale);
if (!availableLocale.isNull()) {
- subset->putDirectIndex(&state, index++, jsString(&state, locale));
+ subset->putDirectIndex(&state, index++, jsString(vm, locale));
RETURN_IF_EXCEPTION(scope, nullptr);
}
}
@@ -859,7 +859,7 @@
: lookupSupportedLocales(state, availableLocales, requestedLocales);
RETURN_IF_EXCEPTION(scope, JSValue());
- PropertyNameArray keys(&vm, PropertyNameMode::Strings, PrivateSymbolMode::Exclude);
+ PropertyNameArray keys(vm, PropertyNameMode::Strings, PrivateSymbolMode::Exclude);
supportedLocales->getOwnPropertyNames(supportedLocales, &state, keys, EnumerationMode());
RETURN_IF_EXCEPTION(scope, JSValue());
@@ -937,7 +937,7 @@
}
for (size_t i = 0; i < length; ++i) {
- localeArray->putDirectIndex(state, i, jsString(state, localeList[i]));
+ localeArray->putDirectIndex(state, i, jsString(vm, localeList[i]));
RETURN_IF_EXCEPTION(scope, encodedJSValue());
}
return JSValue::encode(localeArray);
diff --git a/Source/JavaScriptCore/runtime/IntlPluralRules.cpp b/Source/JavaScriptCore/runtime/IntlPluralRules.cpp
index bb4d8f2..9600102 100644
--- a/Source/JavaScriptCore/runtime/IntlPluralRules.cpp
+++ b/Source/JavaScriptCore/runtime/IntlPluralRules.cpp
@@ -134,34 +134,34 @@
return;
}
- String typeString = intlStringOption(exec, options, Identifier::fromString(&vm, "type"), { "cardinal", "ordinal" }, "type must be \"cardinal\" or \"ordinal\"", "cardinal");
+ String typeString = intlStringOption(exec, options, Identifier::fromString(vm, "type"), { "cardinal", "ordinal" }, "type must be \"cardinal\" or \"ordinal\"", "cardinal");
RETURN_IF_EXCEPTION(scope, void());
m_type = typeString == "ordinal" ? UPLURAL_TYPE_ORDINAL : UPLURAL_TYPE_CARDINAL;
- unsigned minimumIntegerDigits = intlNumberOption(exec, options, Identifier::fromString(&vm, "minimumIntegerDigits"), 1, 21, 1);
+ unsigned minimumIntegerDigits = intlNumberOption(exec, options, Identifier::fromString(vm, "minimumIntegerDigits"), 1, 21, 1);
RETURN_IF_EXCEPTION(scope, void());
m_minimumIntegerDigits = minimumIntegerDigits;
unsigned minimumFractionDigitsDefault = 0;
- unsigned minimumFractionDigits = intlNumberOption(exec, options, Identifier::fromString(&vm, "minimumFractionDigits"), 0, 20, minimumFractionDigitsDefault);
+ unsigned minimumFractionDigits = intlNumberOption(exec, options, Identifier::fromString(vm, "minimumFractionDigits"), 0, 20, minimumFractionDigitsDefault);
RETURN_IF_EXCEPTION(scope, void());
m_minimumFractionDigits = minimumFractionDigits;
unsigned maximumFractionDigitsDefault = std::max(minimumFractionDigits, 3u);
- unsigned maximumFractionDigits = intlNumberOption(exec, options, Identifier::fromString(&vm, "maximumFractionDigits"), minimumFractionDigits, 20, maximumFractionDigitsDefault);
+ unsigned maximumFractionDigits = intlNumberOption(exec, options, Identifier::fromString(vm, "maximumFractionDigits"), minimumFractionDigits, 20, maximumFractionDigitsDefault);
RETURN_IF_EXCEPTION(scope, void());
m_maximumFractionDigits = maximumFractionDigits;
- JSValue minimumSignificantDigitsValue = options->get(&exec, Identifier::fromString(&vm, "minimumSignificantDigits"));
+ JSValue minimumSignificantDigitsValue = options->get(&exec, Identifier::fromString(vm, "minimumSignificantDigits"));
RETURN_IF_EXCEPTION(scope, void());
- JSValue maximumSignificantDigitsValue = options->get(&exec, Identifier::fromString(&vm, "maximumSignificantDigits"));
+ JSValue maximumSignificantDigitsValue = options->get(&exec, Identifier::fromString(vm, "maximumSignificantDigits"));
RETURN_IF_EXCEPTION(scope, void());
if (!minimumSignificantDigitsValue.isUndefined() || !maximumSignificantDigitsValue.isUndefined()) {
- unsigned minimumSignificantDigits = intlNumberOption(exec, options, Identifier::fromString(&vm, "minimumSignificantDigits"), 1, 21, 1);
+ unsigned minimumSignificantDigits = intlNumberOption(exec, options, Identifier::fromString(vm, "minimumSignificantDigits"), 1, 21, 1);
RETURN_IF_EXCEPTION(scope, void());
- unsigned maximumSignificantDigits = intlNumberOption(exec, options, Identifier::fromString(&vm, "maximumSignificantDigits"), minimumSignificantDigits, 21, 21);
+ unsigned maximumSignificantDigits = intlNumberOption(exec, options, Identifier::fromString(vm, "maximumSignificantDigits"), minimumSignificantDigits, 21, 21);
RETURN_IF_EXCEPTION(scope, void());
m_minimumSignificantDigits = minimumSignificantDigits;
m_maximumSignificantDigits = maximumSignificantDigits;
@@ -207,14 +207,14 @@
}
JSObject* options = constructEmptyObject(&exec);
- options->putDirect(vm, vm.propertyNames->locale, jsNontrivialString(&exec, m_locale));
- options->putDirect(vm, Identifier::fromString(&vm, "type"), jsNontrivialString(&exec, m_type == UPLURAL_TYPE_ORDINAL ? "ordinal"_s : "cardinal"_s));
- options->putDirect(vm, Identifier::fromString(&vm, "minimumIntegerDigits"), jsNumber(m_minimumIntegerDigits));
- options->putDirect(vm, Identifier::fromString(&vm, "minimumFractionDigits"), jsNumber(m_minimumFractionDigits));
- options->putDirect(vm, Identifier::fromString(&vm, "maximumFractionDigits"), jsNumber(m_maximumFractionDigits));
+ options->putDirect(vm, vm.propertyNames->locale, jsNontrivialString(vm, m_locale));
+ options->putDirect(vm, Identifier::fromString(vm, "type"), jsNontrivialString(vm, m_type == UPLURAL_TYPE_ORDINAL ? "ordinal"_s : "cardinal"_s));
+ options->putDirect(vm, Identifier::fromString(vm, "minimumIntegerDigits"), jsNumber(m_minimumIntegerDigits));
+ options->putDirect(vm, Identifier::fromString(vm, "minimumFractionDigits"), jsNumber(m_minimumFractionDigits));
+ options->putDirect(vm, Identifier::fromString(vm, "maximumFractionDigits"), jsNumber(m_maximumFractionDigits));
if (m_minimumSignificantDigits) {
- options->putDirect(vm, Identifier::fromString(&vm, "minimumSignificantDigits"), jsNumber(m_minimumSignificantDigits.value()));
- options->putDirect(vm, Identifier::fromString(&vm, "maximumSignificantDigits"), jsNumber(m_maximumSignificantDigits.value()));
+ options->putDirect(vm, Identifier::fromString(vm, "minimumSignificantDigits"), jsNumber(m_minimumSignificantDigits.value()));
+ options->putDirect(vm, Identifier::fromString(vm, "maximumSignificantDigits"), jsNumber(m_maximumSignificantDigits.value()));
}
#if HAVE(ICU_PLURALRULES_KEYWORDS)
@@ -234,10 +234,10 @@
unsigned index = 0;
while (const char* result = uenum_next(keywords.get(), &resultLength, &status)) {
ASSERT(U_SUCCESS(status));
- categories->putDirectIndex(&exec, index++, jsNontrivialString(&exec, String(result, resultLength)));
+ categories->putDirectIndex(&exec, index++, jsNontrivialString(vm, String(result, resultLength)));
RETURN_IF_EXCEPTION(scope, { });
}
- options->putDirect(vm, Identifier::fromString(&vm, "pluralCategories"), categories);
+ options->putDirect(vm, Identifier::fromString(vm, "pluralCategories"), categories);
#endif
RELEASE_AND_RETURN(scope, options);
@@ -254,7 +254,7 @@
return throwTypeError(&exec, scope, "Intl.PluralRules.prototype.select called on value that's not an object initialized as a PluralRules"_s);
if (!std::isfinite(value))
- return jsNontrivialString(&exec, "other"_s);
+ return jsNontrivialString(vm, "other"_s);
#if HAVE(ICU_PLURALRULES_WITH_FORMAT)
UErrorCode status = U_ZERO_ERROR;
@@ -286,7 +286,7 @@
return throwTypeError(&exec, scope, "failed to select plural value"_s);
#endif
- return jsString(&exec, String(result.data(), length));
+ return jsString(vm, String(result.data(), length));
}
} // namespace JSC
diff --git a/Source/JavaScriptCore/runtime/IntlPluralRulesPrototype.cpp b/Source/JavaScriptCore/runtime/IntlPluralRulesPrototype.cpp
index 92a4367..d993df5 100644
--- a/Source/JavaScriptCore/runtime/IntlPluralRulesPrototype.cpp
+++ b/Source/JavaScriptCore/runtime/IntlPluralRulesPrototype.cpp
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2018 Andy VanWagoner (andy@vanwagoner.family)
+ * 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
@@ -74,7 +75,7 @@
{
Base::finishCreation(vm);
- putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(&vm, "Object"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
+ putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(vm, "Object"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
}
EncodedJSValue JSC_HOST_CALL IntlPluralRulesPrototypeFuncSelect(ExecState* state)
diff --git a/Source/JavaScriptCore/runtime/JSArray.h b/Source/JavaScriptCore/runtime/JSArray.h
index 4877eb8..1383b45 100644
--- a/Source/JavaScriptCore/runtime/JSArray.h
+++ b/Source/JavaScriptCore/runtime/JSArray.h
@@ -1,6 +1,6 @@
/*
* Copyright (C) 1999-2000 Harri Porten (porten@kde.org)
- * Copyright (C) 2003-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2003-2019 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -289,7 +289,7 @@
inline JSArray* asArray(JSCell* cell)
{
- ASSERT(cell->inherits<JSArray>(*cell->vm()));
+ ASSERT(cell->inherits<JSArray>(cell->vm()));
return jsCast<JSArray*>(cell);
}
@@ -300,7 +300,7 @@
inline bool isJSArray(JSCell* cell)
{
- ASSERT((cell->classInfo(*cell->vm()) == JSArray::info()) == (cell->type() == ArrayType));
+ ASSERT((cell->classInfo(cell->vm()) == JSArray::info()) == (cell->type() == ArrayType));
return cell->type() == ArrayType;
}
diff --git a/Source/JavaScriptCore/runtime/JSArrayBufferPrototype.cpp b/Source/JavaScriptCore/runtime/JSArrayBufferPrototype.cpp
index bd13325..c978242 100644
--- a/Source/JavaScriptCore/runtime/JSArrayBufferPrototype.cpp
+++ b/Source/JavaScriptCore/runtime/JSArrayBufferPrototype.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013, 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-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
@@ -116,7 +116,7 @@
Base::finishCreation(vm);
JSC_NATIVE_FUNCTION_WITHOUT_TRANSITION(vm.propertyNames->slice, arrayBufferProtoFuncSlice, static_cast<unsigned>(PropertyAttribute::DontEnum), 2);
- putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(&vm, arrayBufferSharingModeName(m_sharingMode)), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
+ putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(vm, arrayBufferSharingModeName(m_sharingMode)), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
if (m_sharingMode == ArrayBufferSharingMode::Default)
JSC_NATIVE_GETTER_WITHOUT_TRANSITION(vm.propertyNames->byteLength, arrayBufferProtoGetterFuncByteLength, PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
else
diff --git a/Source/JavaScriptCore/runtime/JSArrayBufferView.cpp b/Source/JavaScriptCore/runtime/JSArrayBufferView.cpp
index dec82c0..be43b56 100644
--- a/Source/JavaScriptCore/runtime/JSArrayBufferView.cpp
+++ b/Source/JavaScriptCore/runtime/JSArrayBufferView.cpp
@@ -256,7 +256,7 @@
// up. But if you do *anything* to trigger a GC watermark check, it will know
// that you *had* done those allocations and it will GC appropriately.
Heap* heap = Heap::heap(this);
- VM& vm = *heap->vm();
+ VM& vm = heap->vm();
DeferGCForAWhile deferGC(*heap);
RELEASE_ASSERT(!hasIndexingHeader(vm));
diff --git a/Source/JavaScriptCore/runtime/JSCJSValue.cpp b/Source/JavaScriptCore/runtime/JSCJSValue.cpp
index 9288e82..9a58922 100644
--- a/Source/JavaScriptCore/runtime/JSCJSValue.cpp
+++ b/Source/JavaScriptCore/runtime/JSCJSValue.cpp
@@ -1,7 +1,7 @@
/*
* Copyright (C) 1999-2001 Harri Porten (porten@kde.org)
* Copyright (C) 2001 Peter Kelly (pmk@post.com)
- * Copyright (C) 2003-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2003-2019 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -215,7 +215,7 @@
if (propertyName > MAX_ARRAY_INDEX) {
PutPropertySlot slot(*this, shouldThrow);
- return putToPrimitive(exec, Identifier::from(exec, propertyName), value, slot);
+ return putToPrimitive(exec, Identifier::from(vm, propertyName), value, slot);
}
JSObject* prototype = synthesizePrototype(exec);
@@ -315,7 +315,7 @@
else if (isDouble())
out.printf("%lf", asDouble());
else if (isCell()) {
- VM& vm = *asCell()->vm();
+ VM& vm = asCell()->vm();
if (asCell()->inherits<JSString>(vm)) {
JSString* string = asString(asCell());
const StringImpl* impl = string->tryGetValueImpl();
@@ -360,7 +360,7 @@
auto errorValue = [&] () -> JSString* {
if (returnEmptyStringOnError)
- return jsEmptyString(exec);
+ return jsEmptyString(vm);
return nullptr;
};
@@ -369,10 +369,10 @@
auto integer = asInt32();
if (static_cast<unsigned>(integer) <= 9)
return vm.smallStrings.singleCharacterString(integer + '0');
- return jsNontrivialString(&vm, vm.numericStrings.add(integer));
+ return jsNontrivialString(vm, vm.numericStrings.add(integer));
}
if (isDouble())
- return jsString(&vm, vm.numericStrings.add(asDouble()));
+ return jsString(vm, vm.numericStrings.add(asDouble()));
if (isTrue())
return vm.smallStrings.trueString();
if (isFalse())
@@ -389,7 +389,7 @@
JSBigInt* bigInt = asBigInt(*this);
if (auto digit = bigInt->singleDigitValueForString())
return vm.smallStrings.singleCharacterString(*digit + '0');
- JSString* returnString = jsNontrivialString(&vm, bigInt->toString(exec, 10));
+ JSString* returnString = jsNontrivialString(vm, bigInt->toString(exec, 10));
RETURN_IF_EXCEPTION(scope, errorValue());
return returnString;
}
diff --git a/Source/JavaScriptCore/runtime/JSCJSValueInlines.h b/Source/JavaScriptCore/runtime/JSCJSValueInlines.h
index 0d3324a..3c4d8f7 100644
--- a/Source/JavaScriptCore/runtime/JSCJSValueInlines.h
+++ b/Source/JavaScriptCore/runtime/JSCJSValueInlines.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2011-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
@@ -686,7 +686,9 @@
if (primitive.isSymbol())
RELEASE_AND_RETURN(scope, Identifier::fromUid(asSymbol(primitive)->privateName()));
- RELEASE_AND_RETURN(scope, primitive.toString(exec)->toIdentifier(exec));
+ auto string = primitive.toString(exec);
+ RETURN_IF_EXCEPTION(scope, { });
+ RELEASE_AND_RETURN(scope, string->toIdentifier(exec));
}
inline JSValue JSValue::toPrimitive(ExecState* exec, PreferredPrimitiveType preferredType) const
@@ -965,7 +967,7 @@
{
if (LIKELY(propertyName <= std::numeric_limits<unsigned>::max()))
return get(exec, static_cast<unsigned>(propertyName));
- return get(exec, Identifier::from(exec, static_cast<double>(propertyName)));
+ return get(exec, Identifier::from(exec->vm(), static_cast<double>(propertyName)));
}
inline bool JSValue::put(ExecState* exec, PropertyName propertyName, JSValue value, PutPropertySlot& slot)
diff --git a/Source/JavaScriptCore/runtime/JSCast.h b/Source/JavaScriptCore/runtime/JSCast.h
index 495c7e1..f29113d 100644
--- a/Source/JavaScriptCore/runtime/JSCast.h
+++ b/Source/JavaScriptCore/runtime/JSCast.h
@@ -33,7 +33,7 @@
inline To jsCast(From* from)
{
static_assert(std::is_base_of<JSCell, typename std::remove_pointer<To>::type>::value && std::is_base_of<JSCell, typename std::remove_pointer<From>::type>::value, "JS casting expects that the types you are casting to/from are subclasses of JSCell");
- ASSERT_WITH_SECURITY_IMPLICATION(!from || from->JSCell::inherits(*from->JSCell::vm(), std::remove_pointer<To>::type::info()));
+ ASSERT_WITH_SECURITY_IMPLICATION(!from || from->JSCell::inherits(from->JSCell::vm(), std::remove_pointer<To>::type::info()));
return static_cast<To>(from);
}
@@ -41,7 +41,7 @@
inline To jsCast(JSValue from)
{
static_assert(std::is_base_of<JSCell, typename std::remove_pointer<To>::type>::value, "JS casting expects that the types you are casting to is a subclass of JSCell");
- ASSERT_WITH_SECURITY_IMPLICATION(from.isCell() && from.asCell()->JSCell::inherits(*from.asCell()->vm(), std::remove_pointer<To>::type::info()));
+ ASSERT_WITH_SECURITY_IMPLICATION(from.isCell() && from.asCell()->JSCell::inherits(from.asCell()->vm(), std::remove_pointer<To>::type::info()));
return static_cast<To>(from.asCell());
}
diff --git a/Source/JavaScriptCore/runtime/JSCell.cpp b/Source/JavaScriptCore/runtime/JSCell.cpp
index ee2b5aa..e69bbdb 100644
--- a/Source/JavaScriptCore/runtime/JSCell.cpp
+++ b/Source/JavaScriptCore/runtime/JSCell.cpp
@@ -1,7 +1,7 @@
/*
* Copyright (C) 1999-2001 Harri Porten (porten@kde.org)
* Copyright (C) 2001 Peter Kelly (pmk@post.com)
- * Copyright (C) 2003-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2003-2019 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -46,12 +46,12 @@
void JSCell::dump(PrintStream& out) const
{
- methodTable(*vm())->dumpToStream(this, out);
+ methodTable(vm())->dumpToStream(this, out);
}
void JSCell::dumpToStream(const JSCell* cell, PrintStream& out)
{
- out.printf("<%p, %s>", cell, cell->className(*cell->vm()));
+ out.printf("<%p, %s>", cell, cell->className(cell->vm()));
}
size_t JSCell::estimatedSizeInBytes(VM& vm) const
@@ -118,12 +118,13 @@
bool JSCell::putByIndex(JSCell* cell, ExecState* exec, unsigned identifier, JSValue value, bool shouldThrow)
{
+ VM& vm = exec->vm();
if (cell->isString() || cell->isSymbol() || cell->isBigInt()) {
PutPropertySlot slot(cell, shouldThrow);
- return JSValue(cell).putToPrimitive(exec, Identifier::from(exec, identifier), value, slot);
+ return JSValue(cell).putToPrimitive(exec, Identifier::from(vm, identifier), value, slot);
}
JSObject* thisObject = cell->toObject(exec, exec->lexicalGlobalObject());
- return thisObject->methodTable(exec->vm())->putByIndex(thisObject, exec, identifier, value, shouldThrow);
+ return thisObject->methodTable(vm)->putByIndex(thisObject, exec, identifier, value, shouldThrow);
}
bool JSCell::deleteProperty(JSCell* cell, ExecState* exec, PropertyName identifier)
diff --git a/Source/JavaScriptCore/runtime/JSCellInlines.h b/Source/JavaScriptCore/runtime/JSCellInlines.h
index 997b151..d7c7cb1 100644
--- a/Source/JavaScriptCore/runtime/JSCellInlines.h
+++ b/Source/JavaScriptCore/runtime/JSCellInlines.h
@@ -121,7 +121,7 @@
ALWAYS_INLINE Structure* JSCell::structure() const
{
- return structure(*vm());
+ return structure(vm());
}
ALWAYS_INLINE Structure* JSCell::structure(VM& vm) const
@@ -142,10 +142,10 @@
{
JSCell* callee = this->callee().asCell();
ASSERT(callee);
- ASSERT(callee->vm());
+ ASSERT(&callee->vm());
ASSERT(!callee->isLargeAllocation());
// This is an important optimization since we access this so often.
- return *callee->markedBlock().vm();
+ return callee->markedBlock().vm();
}
template<typename CellType, SubspaceAccess>
@@ -167,7 +167,7 @@
template<typename T>
ALWAYS_INLINE void* tryAllocateCellHelper(Heap& heap, size_t size, GCDeferralContext* deferralContext, AllocationFailureMode failureMode)
{
- VM& vm = *heap.vm();
+ VM& vm = heap.vm();
ASSERT(deferralContext || !DisallowGC::isInEffectOnCurrentThread());
ASSERT(size >= sizeof(T));
JSCell* result = static_cast<JSCell*>(subspaceFor<T>(vm)->allocateNonVirtual(vm, size, deferralContext, failureMode));
diff --git a/Source/JavaScriptCore/runtime/JSDataViewPrototype.cpp b/Source/JavaScriptCore/runtime/JSDataViewPrototype.cpp
index df2f676..7a2ec74 100644
--- a/Source/JavaScriptCore/runtime/JSDataViewPrototype.cpp
+++ b/Source/JavaScriptCore/runtime/JSDataViewPrototype.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013, 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-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
@@ -109,7 +109,7 @@
void JSDataViewPrototype::finishCreation(JSC::VM& vm)
{
Base::finishCreation(vm);
- putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(&vm, "DataView"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
+ putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(vm, "DataView"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
}
Structure* JSDataViewPrototype::createStructure(
diff --git a/Source/JavaScriptCore/runtime/JSFixedArray.cpp b/Source/JavaScriptCore/runtime/JSFixedArray.cpp
index b3537ca..eee9b52 100644
--- a/Source/JavaScriptCore/runtime/JSFixedArray.cpp
+++ b/Source/JavaScriptCore/runtime/JSFixedArray.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-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
@@ -54,7 +54,7 @@
void JSFixedArray::dumpToStream(const JSCell* cell, PrintStream& out)
{
- VM& vm = *cell->vm();
+ VM& vm = cell->vm();
const auto* thisObject = jsCast<const JSFixedArray*>(cell);
out.printf("<%p, %s, [%u], [", thisObject, thisObject->className(vm), thisObject->length());
CommaPrinter comma;
diff --git a/Source/JavaScriptCore/runtime/JSFunction.cpp b/Source/JavaScriptCore/runtime/JSFunction.cpp
index c5640cb..92bd1b8 100644
--- a/Source/JavaScriptCore/runtime/JSFunction.cpp
+++ b/Source/JavaScriptCore/runtime/JSFunction.cpp
@@ -1,7 +1,7 @@
/*
* Copyright (C) 1999-2002 Harri Porten (porten@kde.org)
* Copyright (C) 2001 Peter Kelly (pmk@post.com)
- * Copyright (C) 2003-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2003-2019 Apple Inc. All rights reserved.
* Copyright (C) 2007 Cameron Zwarich (cwzwarich@uwaterloo.ca)
* Copyright (C) 2007 Maks Orlovich
* Copyright (C) 2015 Canon Inc. All rights reserved.
@@ -139,7 +139,7 @@
m_executable.set(vm, this, executable);
// Some NativeExecutable functions, like JSBoundFunction, decide to lazily allocate their name string.
if (!name.isNull())
- putDirect(vm, vm.propertyNames->name, jsString(&vm, name), PropertyAttribute::ReadOnly | PropertyAttribute::DontEnum);
+ putDirect(vm, vm.propertyNames->name, jsString(vm, name), PropertyAttribute::ReadOnly | PropertyAttribute::DontEnum);
putDirect(vm, vm.propertyNames->length, jsNumber(length), PropertyAttribute::ReadOnly | PropertyAttribute::DontEnum);
}
@@ -334,7 +334,7 @@
JSCell* callee = visitor->callee().asCell();
- if (callee && callee->inherits<JSBoundFunction>(*callee->vm()))
+ if (callee && callee->inherits<JSBoundFunction>(callee->vm()))
return StackVisitor::Continue;
if (!m_hasFoundFrame && (callee != m_targetCallee))
@@ -752,7 +752,7 @@
name = makeString("set ", name);
rareData->setHasReifiedName();
- putDirect(vm, propID, jsString(exec, name), initialAttributes);
+ putDirect(vm, propID, jsString(vm, name), initialAttributes);
}
JSFunction::PropertyStatus JSFunction::reifyLazyPropertyIfNeeded(VM& vm, ExecState* exec, PropertyName propertyName)
@@ -819,7 +819,7 @@
String name = makeString("bound ", static_cast<NativeExecutable*>(m_executable.get())->name());
unsigned initialAttributes = PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly;
rareData->setHasReifiedName();
- putDirect(vm, nameIdent, jsString(exec, name), initialAttributes);
+ putDirect(vm, nameIdent, jsString(vm, name), initialAttributes);
}
return PropertyStatus::Reified;
}
@@ -828,7 +828,7 @@
void JSFunction::assertTypeInfoFlagInvariants()
{
// If you change this, you'll need to update speculationFromClassInfo.
- const ClassInfo* info = classInfo(*vm());
+ const ClassInfo* info = classInfo(vm());
if (!(inlineTypeFlags() & ImplementsDefaultHasInstance))
RELEASE_ASSERT(info == JSBoundFunction::info());
else
diff --git a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewInlines.h b/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewInlines.h
index 570c32d..1a6398d 100644
--- a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewInlines.h
+++ b/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewInlines.h
@@ -482,18 +482,20 @@
bool JSGenericTypedArrayView<Adaptor>::deletePropertyByIndex(
JSCell* cell, ExecState* exec, unsigned propertyName)
{
- return cell->methodTable(exec->vm())->deleteProperty(cell, exec, Identifier::from(exec, propertyName));
+ VM& vm = exec->vm();
+ return cell->methodTable(vm)->deleteProperty(cell, exec, Identifier::from(vm, propertyName));
}
template<typename Adaptor>
void JSGenericTypedArrayView<Adaptor>::getOwnPropertyNames(
JSObject* object, ExecState* exec, PropertyNameArray& array, EnumerationMode mode)
{
+ VM& vm = exec->vm();
JSGenericTypedArrayView* thisObject = jsCast<JSGenericTypedArrayView*>(object);
if (array.includeStringProperties()) {
for (unsigned i = 0; i < thisObject->m_length; ++i)
- array.add(Identifier::from(exec, i));
+ array.add(Identifier::from(vm, i));
}
return Base::getOwnPropertyNames(object, exec, array, mode);
diff --git a/Source/JavaScriptCore/runtime/JSGlobalObject.cpp b/Source/JavaScriptCore/runtime/JSGlobalObject.cpp
index 08757be..704b3f9 100644
--- a/Source/JavaScriptCore/runtime/JSGlobalObject.cpp
+++ b/Source/JavaScriptCore/runtime/JSGlobalObject.cpp
@@ -766,7 +766,7 @@
m_arrayConstructor.set(vm, this, arrayConstructor);
RegExpConstructor* regExpConstructor = RegExpConstructor::create(vm, RegExpConstructor::createStructure(vm, this, m_functionPrototype.get()), m_regExpPrototype.get(), m_speciesGetterSetter.get());
- m_regExpGlobalData.cachedResult().record(vm, this, nullptr, jsEmptyString(&vm), MatchResult(0, 0));
+ m_regExpGlobalData.cachedResult().record(vm, this, nullptr, jsEmptyString(vm), MatchResult(0, 0));
#if ENABLE(SHARED_ARRAY_BUFFER)
JSSharedArrayBufferConstructor* sharedArrayBufferConstructor = nullptr;
@@ -849,7 +849,7 @@
#if ENABLE(SHARED_ARRAY_BUFFER)
putDirectWithoutTransition(vm, vm.propertyNames->SharedArrayBuffer, sharedArrayBufferConstructor, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectWithoutTransition(vm, Identifier::fromString(exec, "Atomics"), atomicsObject, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectWithoutTransition(vm, Identifier::fromString(vm, "Atomics"), atomicsObject, static_cast<unsigned>(PropertyAttribute::DontEnum));
#endif
#define PUT_CONSTRUCTOR_FOR_SIMPLE_TYPE(capitalName, lowerName, properName, instanceType, jsName, prototypeBase, featureFlag) \
@@ -1103,7 +1103,7 @@
init.set(WebAssemblyToJSCallee::createStructure(init.vm, init.owner, jsNull()));
});
auto* webAssembly = JSWebAssembly::create(vm, this, JSWebAssembly::createStructure(vm, this, m_objectPrototype.get()));
- putDirectWithoutTransition(vm, Identifier::fromString(exec, "WebAssembly"), webAssembly, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectWithoutTransition(vm, Identifier::fromString(vm, "WebAssembly"), webAssembly, static_cast<unsigned>(PropertyAttribute::DontEnum));
#define CREATE_WEBASSEMBLY_PROTOTYPE(capitalName, lowerName, properName, instanceType, jsName, prototypeBase, featureFlag) \
if (featureFlag) {\
@@ -1831,7 +1831,7 @@
};
addStaticGlobals(extraStaticGlobals, WTF_ARRAY_LENGTH(extraStaticGlobals));
- putDirect(vm, Identifier::fromString(globalExec(), "$vm"), dollarVM, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirect(vm, Identifier::fromString(vm, "$vm"), dollarVM, static_cast<unsigned>(PropertyAttribute::DontEnum));
}
void JSGlobalObject::addStaticGlobals(GlobalPropertyInfo* globals, int count)
diff --git a/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp b/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp
index 64a5ef6..f4db7a4 100644
--- a/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp
+++ b/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp
@@ -1,7 +1,7 @@
/*
* Copyright (C) 1999-2002 Harri Porten (porten@kde.org)
* Copyright (C) 2001 Peter Kelly (pmk@post.com)
- * Copyright (C) 2003-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2003-2019 Apple Inc. All rights reserved.
* Copyright (C) 2007 Cameron Zwarich (cwzwarich@uwaterloo.ca)
* Copyright (C) 2007 Maks Orlovich
*
@@ -152,7 +152,7 @@
if (UNLIKELY(builder.hasOverflowed()))
return throwOutOfMemoryError(exec, scope);
- return jsString(exec, builder.toString());
+ return jsString(vm, builder.toString());
}
static JSValue encode(ExecState* exec, const Bitmap<256>& doNotEscape)
@@ -241,7 +241,7 @@
}
if (UNLIKELY(builder.hasOverflowed()))
return throwOutOfMemoryError(exec, scope);
- RELEASE_AND_RETURN(scope, jsString(&vm, builder.toString()));
+ RELEASE_AND_RETURN(scope, jsString(vm, builder.toString()));
}
static JSValue decode(ExecState* exec, const Bitmap<256>& doNotUnescape, bool strict)
@@ -601,6 +601,7 @@
);
return JSValue::encode(toStringView(exec, exec->argument(0), [&] (StringView view) {
+ VM& vm = exec->vm();
StringBuilder builder;
if (view.is8Bit()) {
const LChar* c = view.characters8();
@@ -613,7 +614,7 @@
appendByteAsHex(u, builder);
}
}
- return jsString(exec, builder.toString());
+ return jsString(vm, builder.toString());
}
const UChar* c = view.characters16();
@@ -631,7 +632,7 @@
}
}
- return jsString(exec, builder.toString());
+ return jsString(vm, builder.toString());
}));
}
@@ -687,7 +688,7 @@
}
}
- return jsString(exec, builder.toString());
+ return jsString(exec->vm(), builder.toString());
}));
}
@@ -804,7 +805,7 @@
EncodedJSValue JSC_HOST_CALL globalFuncBuiltinDescribe(ExecState* exec)
{
- return JSValue::encode(jsString(exec, toString(exec->argument(0))));
+ return JSValue::encode(jsString(exec->vm(), toString(exec->argument(0))));
}
EncodedJSValue JSC_HOST_CALL globalFuncImportModule(ExecState* exec)
diff --git a/Source/JavaScriptCore/runtime/JSLexicalEnvironment.cpp b/Source/JavaScriptCore/runtime/JSLexicalEnvironment.cpp
index 8c4fe9a..67c7a1d 100644
--- a/Source/JavaScriptCore/runtime/JSLexicalEnvironment.cpp
+++ b/Source/JavaScriptCore/runtime/JSLexicalEnvironment.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008, 2009, 2014, 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2008-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
@@ -73,6 +73,7 @@
{
ConcurrentJSLocker locker(thisObject->symbolTable()->m_lock);
SymbolTable::Map::iterator end = thisObject->symbolTable()->end(locker);
+ VM& vm = exec->vm();
for (SymbolTable::Map::iterator it = thisObject->symbolTable()->begin(locker); it != end; ++it) {
if (it->value.getAttributes() & PropertyAttribute::DontEnum && !mode.includeDontEnumProperties())
continue;
@@ -80,7 +81,7 @@
continue;
if (it->key->isSymbol() && !propertyNames.includeSymbolProperties())
continue;
- propertyNames.add(Identifier::fromUid(exec, it->key.get()));
+ propertyNames.add(Identifier::fromUid(vm, it->key.get()));
}
}
// Skip the JSSymbolTableObject's implementation of getOwnNonIndexPropertyNames
diff --git a/Source/JavaScriptCore/runtime/JSModuleEnvironment.cpp b/Source/JavaScriptCore/runtime/JSModuleEnvironment.cpp
index a5ced60..f244887 100644
--- a/Source/JavaScriptCore/runtime/JSModuleEnvironment.cpp
+++ b/Source/JavaScriptCore/runtime/JSModuleEnvironment.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-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
@@ -81,7 +81,7 @@
VM& vm = exec->vm();
auto scope = DECLARE_THROW_SCOPE(vm);
JSModuleEnvironment* thisObject = jsCast<JSModuleEnvironment*>(cell);
- AbstractModuleRecord::Resolution resolution = thisObject->moduleRecord()->resolveImport(exec, Identifier::fromUid(exec, propertyName.uid()));
+ AbstractModuleRecord::Resolution resolution = thisObject->moduleRecord()->resolveImport(exec, Identifier::fromUid(vm, propertyName.uid()));
RETURN_IF_EXCEPTION(scope, false);
if (resolution.type == AbstractModuleRecord::Resolution::Type::Resolved) {
// When resolveImport resolves the resolution, the imported module environment must have the binding.
@@ -118,7 +118,7 @@
JSModuleEnvironment* thisObject = jsCast<JSModuleEnvironment*>(cell);
// All imported bindings are immutable.
- AbstractModuleRecord::Resolution resolution = thisObject->moduleRecord()->resolveImport(exec, Identifier::fromUid(exec, propertyName.uid()));
+ AbstractModuleRecord::Resolution resolution = thisObject->moduleRecord()->resolveImport(exec, Identifier::fromUid(vm, propertyName.uid()));
RETURN_IF_EXCEPTION(scope, false);
if (resolution.type == AbstractModuleRecord::Resolution::Type::Resolved) {
throwTypeError(exec, scope, ReadonlyPropertyWriteError);
@@ -134,7 +134,7 @@
JSModuleEnvironment* thisObject = jsCast<JSModuleEnvironment*>(cell);
// All imported bindings are immutable.
- AbstractModuleRecord::Resolution resolution = thisObject->moduleRecord()->resolveImport(exec, Identifier::fromUid(exec, propertyName.uid()));
+ AbstractModuleRecord::Resolution resolution = thisObject->moduleRecord()->resolveImport(exec, Identifier::fromUid(vm, propertyName.uid()));
RETURN_IF_EXCEPTION(scope, false);
if (resolution.type == AbstractModuleRecord::Resolution::Type::Resolved)
return false;
diff --git a/Source/JavaScriptCore/runtime/JSModuleLoader.cpp b/Source/JavaScriptCore/runtime/JSModuleLoader.cpp
index fe5d601..e88780b 100644
--- a/Source/JavaScriptCore/runtime/JSModuleLoader.cpp
+++ b/Source/JavaScriptCore/runtime/JSModuleLoader.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015-2018 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2015-2019 Apple Inc. All Rights Reserved.
* Copyright (C) 2016 Yusuke Suzuki <utatane.tea@gmail.com>.
*
* Redistribution and use in source and binary forms, with or without
@@ -109,7 +109,7 @@
ASSERT(inherits(vm, info()));
JSMap* map = JSMap::create(exec, vm, globalObject->mapStructure());
scope.releaseAssertNoException();
- putDirect(vm, Identifier::fromString(&vm, "registry"), map);
+ putDirect(vm, Identifier::fromString(vm, "registry"), map);
}
// ------------------------------ Functions --------------------------------
@@ -241,7 +241,7 @@
ASSERT(callType != CallType::None);
MarkedArgumentBuffer arguments;
- arguments.append(jsString(exec, moduleKey.impl()));
+ arguments.append(jsString(vm, moduleKey.impl()));
arguments.append(parameters);
arguments.append(scriptFetcher);
ASSERT(!arguments.hasOverflowed());
@@ -420,7 +420,7 @@
ParserError error;
std::unique_ptr<ModuleProgramNode> moduleProgramNode = parse<ModuleProgramNode>(
- &vm, sourceCode, Identifier(), JSParserBuiltinMode::NotBuiltin,
+ vm, sourceCode, Identifier(), JSParserBuiltinMode::NotBuiltin,
JSParserStrictMode::Strict, JSParserScriptMode::Module, SourceParseMode::ModuleAnalyzeMode, SuperBinding::NotNeeded, error);
if (error.isValid())
return reject(error.toErrorObject(exec->lexicalGlobalObject(), sourceCode));
@@ -447,7 +447,7 @@
RETURN_IF_EXCEPTION(scope, encodedJSValue());
size_t i = 0;
for (auto& key : moduleRecord->requestedModules()) {
- result->putDirectIndex(exec, i++, jsString(exec, key.get()));
+ result->putDirectIndex(exec, i++, jsString(vm, key.get()));
RETURN_IF_EXCEPTION(scope, encodedJSValue());
}
return JSValue::encode(result);
diff --git a/Source/JavaScriptCore/runtime/JSModuleNamespaceObject.cpp b/Source/JavaScriptCore/runtime/JSModuleNamespaceObject.cpp
index 5be5c8c..1fa2245 100644
--- a/Source/JavaScriptCore/runtime/JSModuleNamespaceObject.cpp
+++ b/Source/JavaScriptCore/runtime/JSModuleNamespaceObject.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-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
@@ -73,7 +73,7 @@
}
}
- putDirect(vm, vm.propertyNames->toStringTagSymbol, jsString(&vm, "Module"), PropertyAttribute::DontEnum | PropertyAttribute::DontDelete | PropertyAttribute::ReadOnly);
+ putDirect(vm, vm.propertyNames->toStringTagSymbol, jsString(vm, "Module"), PropertyAttribute::DontEnum | PropertyAttribute::DontDelete | PropertyAttribute::ReadOnly);
// http://www.ecma-international.org/ecma-262/6.0/#sec-module-namespace-exotic-objects-getprototypeof
// http://www.ecma-international.org/ecma-262/6.0/#sec-module-namespace-exotic-objects-setprototypeof-v
@@ -173,8 +173,9 @@
bool JSModuleNamespaceObject::getOwnPropertySlotByIndex(JSObject* cell, ExecState* exec, unsigned propertyName, PropertySlot& slot)
{
+ VM& vm = exec->vm();
JSModuleNamespaceObject* thisObject = jsCast<JSModuleNamespaceObject*>(cell);
- return thisObject->getOwnPropertySlotCommon(exec, Identifier::from(exec, propertyName), slot);
+ return thisObject->getOwnPropertySlotCommon(exec, Identifier::from(vm, propertyName), slot);
}
bool JSModuleNamespaceObject::put(JSCell*, ExecState* exec, PropertyName, JSValue, PutPropertySlot& slot)
diff --git a/Source/JavaScriptCore/runtime/JSModuleRecord.cpp b/Source/JavaScriptCore/runtime/JSModuleRecord.cpp
index 9312398..4a7527f0 100644
--- a/Source/JavaScriptCore/runtime/JSModuleRecord.cpp
+++ b/Source/JavaScriptCore/runtime/JSModuleRecord.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015-2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-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
@@ -180,7 +180,7 @@
VarOffset offset = entry.varOffset();
if (!offset.isStack()) {
bool putResult = false;
- symbolTablePutTouchWatchpointSet(moduleEnvironment, exec, Identifier::fromUid(exec, variable.key.get()), jsUndefined(), /* shouldThrowReadOnlyError */ false, /* ignoreReadOnlyErrors */ true, putResult);
+ symbolTablePutTouchWatchpointSet(moduleEnvironment, exec, Identifier::fromUid(vm, variable.key.get()), jsUndefined(), /* shouldThrowReadOnlyError */ false, /* ignoreReadOnlyErrors */ true, putResult);
RETURN_IF_EXCEPTION(scope, void());
}
}
diff --git a/Source/JavaScriptCore/runtime/JSONObject.cpp b/Source/JavaScriptCore/runtime/JSONObject.cpp
index 1813681..ac0529c 100644
--- a/Source/JavaScriptCore/runtime/JSONObject.cpp
+++ b/Source/JavaScriptCore/runtime/JSONObject.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2009-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
@@ -64,7 +64,7 @@
Base::finishCreation(vm);
ASSERT(inherits(vm, info()));
- putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(&vm, "JSON"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
+ putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(vm, "JSON"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
}
// PropertyNameForFunctionCall objects must be on the stack, since the JSValue that they create is not marked.
@@ -205,13 +205,13 @@
JSValue PropertyNameForFunctionCall::value(ExecState* exec) const
{
if (!m_value) {
+ VM& vm = exec->vm();
if (m_identifier)
- m_value = jsString(exec, m_identifier->string());
+ m_value = jsString(vm, m_identifier->string());
else {
- VM& vm = exec->vm();
if (m_number <= 9)
return vm.smallStrings.singleCharacterString(m_number + '0');
- m_value = jsNontrivialString(&vm, vm.numericStrings.add(m_number));
+ m_value = jsNontrivialString(vm, vm.numericStrings.add(m_number));
}
}
return m_value;
@@ -222,7 +222,7 @@
Stringifier::Stringifier(ExecState* exec, JSValue replacer, JSValue space)
: m_exec(exec)
, m_replacer(replacer)
- , m_arrayReplacerPropertyNames(&exec->vm(), PropertyNameMode::Strings, PrivateSymbolMode::Exclude)
+ , m_arrayReplacerPropertyNames(exec->vm(), PropertyNameMode::Strings, PrivateSymbolMode::Exclude)
{
VM& vm = exec->vm();
auto scope = DECLARE_THROW_SCOPE(vm);
@@ -287,7 +287,7 @@
}
if (UNLIKELY(stringifyResult != StringifySucceeded))
return jsUndefined();
- RELEASE_AND_RETURN(scope, jsString(m_exec, result.toString()));
+ RELEASE_AND_RETURN(scope, jsString(vm, result.toString()));
}
ALWAYS_INLINE JSValue Stringifier::toJSON(JSValue baseValue, const PropertyNameForFunctionCall& propertyName)
@@ -496,7 +496,7 @@
if (stringifier.m_usingArrayReplacer)
m_propertyNames = stringifier.m_arrayReplacerPropertyNames.data();
else {
- PropertyNameArray objectPropertyNames(&vm, PropertyNameMode::Strings, PrivateSymbolMode::Exclude);
+ PropertyNameArray objectPropertyNames(vm, PropertyNameMode::Strings, PrivateSymbolMode::Exclude);
m_object->methodTable(vm)->getOwnPropertyNames(m_object, exec, objectPropertyNames, EnumerationMode());
RETURN_IF_EXCEPTION(scope, false);
m_propertyNames = objectPropertyNames.releaseData();
@@ -705,7 +705,7 @@
}
case ArrayEndVisitMember: {
JSArray* array = jsCast<JSArray*>(markedStack.last());
- JSValue filteredValue = callReviver(array, jsString(m_exec, String::number(indexStack.last())), outValue);
+ JSValue filteredValue = callReviver(array, jsString(vm, String::number(indexStack.last())), outValue);
RETURN_IF_EXCEPTION(scope, { });
if (filteredValue.isUndefined())
array->methodTable(vm)->deletePropertyByIndex(array, m_exec, indexStack.last());
@@ -725,7 +725,7 @@
JSObject* object = asObject(inValue);
markedStack.appendWithCrashOnOverflow(object);
indexStack.append(0);
- propertyStack.append(PropertyNameArray(&vm, PropertyNameMode::Strings, PrivateSymbolMode::Exclude));
+ propertyStack.append(PropertyNameArray(vm, PropertyNameMode::Strings, PrivateSymbolMode::Exclude));
object->methodTable(vm)->getOwnPropertyNames(object, m_exec, propertyStack.last(), EnumerationMode());
RETURN_IF_EXCEPTION(scope, { });
}
@@ -762,7 +762,7 @@
JSObject* object = jsCast<JSObject*>(markedStack.last());
Identifier prop = propertyStack.last()[indexStack.last()];
PutPropertySlot slot(object);
- JSValue filteredValue = callReviver(object, jsString(m_exec, prop.string()), outValue);
+ JSValue filteredValue = callReviver(object, jsString(vm, prop.string()), outValue);
RETURN_IF_EXCEPTION(scope, { });
if (filteredValue.isUndefined())
object->methodTable(vm)->deleteProperty(object, m_exec, prop);
@@ -793,7 +793,7 @@
PutPropertySlot slot(finalHolder);
finalHolder->methodTable(vm)->put(finalHolder, m_exec, vm.propertyNames->emptyIdentifier, outValue, slot);
RETURN_IF_EXCEPTION(scope, { });
- RELEASE_AND_RETURN(scope, callReviver(finalHolder, jsEmptyString(m_exec), outValue));
+ RELEASE_AND_RETURN(scope, callReviver(finalHolder, jsEmptyString(vm), outValue));
}
// ECMA-262 v5 15.12.2
diff --git a/Source/JavaScriptCore/runtime/JSObject.cpp b/Source/JavaScriptCore/runtime/JSObject.cpp
index e7231c61..68bca01 100644
--- a/Source/JavaScriptCore/runtime/JSObject.cpp
+++ b/Source/JavaScriptCore/runtime/JSObject.cpp
@@ -1,7 +1,7 @@
/*
* Copyright (C) 1999-2001 Harri Porten (porten@kde.org)
* Copyright (C) 2001 Peter Kelly (pmk@post.com)
- * Copyright (C) 2003-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2003-2019 Apple Inc. All rights reserved.
* Copyright (C) 2007 Eric Seidel (eric@webkit.org)
*
* This library is free software; you can redistribute it and/or
@@ -87,7 +87,7 @@
for (auto iter = table->begin(); iter != table->end(); ++iter) {
if (!(iter->attributes() & PropertyAttribute::DontEnum) || mode.includeDontEnumProperties())
- propertyNames.add(Identifier::fromString(&vm, iter.key()));
+ propertyNames.add(Identifier::fromString(vm, iter.key()));
}
}
}
@@ -598,12 +598,14 @@
bool JSObject::getOwnPropertySlotByIndex(JSObject* thisObject, ExecState* exec, unsigned i, PropertySlot& slot)
{
+ VM& vm = exec->vm();
+
// NB. The fact that we're directly consulting our indexed storage implies that it is not
// legal for anyone to override getOwnPropertySlot() without also overriding
// getOwnPropertySlotByIndex().
if (i > MAX_ARRAY_INDEX)
- return thisObject->methodTable(exec->vm())->getOwnPropertySlot(thisObject, exec, Identifier::from(exec, i), slot);
+ return thisObject->methodTable(vm)->getOwnPropertySlot(thisObject, exec, Identifier::from(vm, i), slot);
switch (thisObject->indexingType()) {
case ALL_BLANK_INDEXING_TYPES:
@@ -862,7 +864,7 @@
if (propertyName > MAX_ARRAY_INDEX) {
PutPropertySlot slot(cell, shouldThrow);
- return thisObject->methodTable(vm)->put(thisObject, exec, Identifier::from(exec, propertyName), value, slot);
+ return thisObject->methodTable(vm)->put(thisObject, exec, Identifier::from(vm, propertyName), value, slot);
}
thisObject->ensureWritable(vm);
@@ -2022,7 +2024,7 @@
JSObject* thisObject = jsCast<JSObject*>(cell);
if (i > MAX_ARRAY_INDEX)
- return thisObject->methodTable(vm)->deleteProperty(thisObject, exec, Identifier::from(exec, i));
+ return thisObject->methodTable(vm)->deleteProperty(thisObject, exec, Identifier::from(vm, i));
switch (thisObject->indexingMode()) {
case ALL_BLANK_INDEXING_TYPES:
@@ -2446,7 +2448,7 @@
VM& vm = exec->vm();
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue primitive = toPrimitive(exec, PreferString);
- RETURN_IF_EXCEPTION(scope, jsEmptyString(exec));
+ RETURN_IF_EXCEPTION(scope, jsEmptyString(vm));
RELEASE_AND_RETURN(scope, primitive.toString(exec));
}
@@ -2519,7 +2521,7 @@
for (auto& value : *hashTable) {
unsigned attributes;
- auto key = Identifier::fromString(&vm, value.m_key);
+ auto key = Identifier::fromString(vm, value.m_key);
PropertyOffset offset = getDirectOffset(vm, key, attributes);
if (!isValidOffset(offset))
reifyStaticProperty(vm, hashTable->classForThis, key, value, *this);
@@ -3064,7 +3066,7 @@
if (!canDoFastPutDirectIndex(vm, this)) {
PropertyDescriptor descriptor;
descriptor.setDescriptor(value, attributes);
- return methodTable(vm)->defineOwnProperty(this, exec, Identifier::from(exec, i), descriptor, mode == PutDirectIndexShouldThrow);
+ return methodTable(vm)->defineOwnProperty(this, exec, Identifier::from(vm, i), descriptor, mode == PutDirectIndexShouldThrow);
}
// i should be a valid array index that is outside of the current vector.
diff --git a/Source/JavaScriptCore/runtime/JSObject.h b/Source/JavaScriptCore/runtime/JSObject.h
index c144c35..e452309 100644
--- a/Source/JavaScriptCore/runtime/JSObject.h
+++ b/Source/JavaScriptCore/runtime/JSObject.h
@@ -198,11 +198,12 @@
// This performs the ECMAScript Set() operation.
ALWAYS_INLINE bool putByIndexInline(ExecState* exec, unsigned propertyName, JSValue value, bool shouldThrow)
{
+ VM& vm = exec->vm();
if (canSetIndexQuickly(propertyName, value)) {
- setIndexQuickly(exec->vm(), propertyName, value);
+ setIndexQuickly(vm, propertyName, value);
return true;
}
- return methodTable(exec->vm())->putByIndex(this, exec, propertyName, value, shouldThrow);
+ return methodTable(vm)->putByIndex(this, exec, propertyName, value, shouldThrow);
}
// This is similar to the putDirect* methods:
@@ -1549,7 +1550,7 @@
inline size_t JSObject::butterflyPreCapacity()
{
- VM& vm = *this->vm();
+ VM& vm = this->vm();
if (UNLIKELY(hasIndexingHeader(vm)))
return butterfly()->indexingHeader()->preCapacity(structure(vm));
return 0;
@@ -1557,7 +1558,7 @@
inline size_t JSObject::butterflyTotalSize()
{
- VM& vm = *this->vm();
+ VM& vm = this->vm();
Structure* structure = this->structure(vm);
Butterfly* butterfly = this->butterfly();
size_t preCapacity;
@@ -1606,12 +1607,12 @@
template<unsigned charactersCount>
ALWAYS_INLINE Identifier makeIdentifier(VM& vm, const char (&characters)[charactersCount])
{
- return Identifier::fromString(&vm, characters);
+ return Identifier::fromString(vm, characters);
}
ALWAYS_INLINE Identifier makeIdentifier(VM& vm, const char* name)
{
- return Identifier::fromString(&vm, name);
+ return Identifier::fromString(vm, name);
}
ALWAYS_INLINE Identifier makeIdentifier(VM&, const Identifier& name)
diff --git a/Source/JavaScriptCore/runtime/JSPromisePrototype.cpp b/Source/JavaScriptCore/runtime/JSPromisePrototype.cpp
index 3a2d569..737f81e 100644
--- a/Source/JavaScriptCore/runtime/JSPromisePrototype.cpp
+++ b/Source/JavaScriptCore/runtime/JSPromisePrototype.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-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
@@ -76,7 +76,7 @@
void JSPromisePrototype::finishCreation(VM& vm, Structure*)
{
Base::finishCreation(vm);
- putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(&vm, "Promise"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
+ putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(vm, "Promise"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
}
void JSPromisePrototype::addOwnInternalSlots(VM& vm, JSGlobalObject* globalObject)
diff --git a/Source/JavaScriptCore/runtime/JSPropertyNameEnumerator.cpp b/Source/JavaScriptCore/runtime/JSPropertyNameEnumerator.cpp
index a6136cd..e079090 100644
--- a/Source/JavaScriptCore/runtime/JSPropertyNameEnumerator.cpp
+++ b/Source/JavaScriptCore/runtime/JSPropertyNameEnumerator.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-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
@@ -68,7 +68,7 @@
ASSERT(m_endGenericPropertyIndex == vector.size());
for (unsigned i = 0; i < vector.size(); ++i) {
const Identifier& identifier = vector[i];
- m_propertyNames.get()[i].set(vm, this, jsString(&vm, identifier.string()));
+ m_propertyNames.get()[i].set(vm, this, jsString(vm, identifier.string()));
}
}
diff --git a/Source/JavaScriptCore/runtime/JSPropertyNameEnumerator.h b/Source/JavaScriptCore/runtime/JSPropertyNameEnumerator.h
index 1079304..96ee221 100644
--- a/Source/JavaScriptCore/runtime/JSPropertyNameEnumerator.h
+++ b/Source/JavaScriptCore/runtime/JSPropertyNameEnumerator.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-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
@@ -110,7 +110,7 @@
uint32_t numberStructureProperties = 0;
- PropertyNameArray propertyNames(&vm, PropertyNameMode::Strings, PrivateSymbolMode::Exclude);
+ PropertyNameArray propertyNames(vm, PropertyNameMode::Strings, PrivateSymbolMode::Exclude);
if (structure->canAccessPropertiesQuicklyForEnumeration() && indexedLength == base->getArrayLength()) {
base->methodTable(vm)->getStructurePropertyNames(base, exec, propertyNames, EnumerationMode());
diff --git a/Source/JavaScriptCore/runtime/JSRunLoopTimer.cpp b/Source/JavaScriptCore/runtime/JSRunLoopTimer.cpp
index 327fed0..2a0c06c 100644
--- a/Source/JavaScriptCore/runtime/JSRunLoopTimer.cpp
+++ b/Source/JavaScriptCore/runtime/JSRunLoopTimer.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-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
@@ -307,8 +307,8 @@
doWork(*vm);
}
-JSRunLoopTimer::JSRunLoopTimer(VM* vm)
- : m_apiLock(vm->apiLock())
+JSRunLoopTimer::JSRunLoopTimer(VM& vm)
+ : m_apiLock(vm.apiLock())
{
}
diff --git a/Source/JavaScriptCore/runtime/JSRunLoopTimer.h b/Source/JavaScriptCore/runtime/JSRunLoopTimer.h
index 1193388..f615b6f 100644
--- a/Source/JavaScriptCore/runtime/JSRunLoopTimer.h
+++ b/Source/JavaScriptCore/runtime/JSRunLoopTimer.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012, 2015-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-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
@@ -103,7 +103,7 @@
HashMap<Ref<JSLock>, std::unique_ptr<PerVMData>> m_mapping;
};
- JSRunLoopTimer(VM*);
+ JSRunLoopTimer(VM&);
JS_EXPORT_PRIVATE virtual ~JSRunLoopTimer();
virtual void doWork(VM&) = 0;
diff --git a/Source/JavaScriptCore/runtime/JSString.cpp b/Source/JavaScriptCore/runtime/JSString.cpp
index bc7cad1..14f9b99 100644
--- a/Source/JavaScriptCore/runtime/JSString.cpp
+++ b/Source/JavaScriptCore/runtime/JSString.cpp
@@ -1,7 +1,7 @@
/*
* Copyright (C) 1999-2002 Harri Porten (porten@kde.org)
* Copyright (C) 2001 Peter Kelly (pmk@post.com)
- * Copyright (C) 2004-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2004-2019 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -71,7 +71,7 @@
void JSString::dumpToStream(const JSCell* cell, PrintStream& out)
{
- VM& vm = *cell->vm();
+ VM& vm = cell->vm();
const JSString* thisObject = jsCast<const JSString*>(cell);
out.printf("<%p, %s, [%u], ", thisObject, thisObject->className(vm), thisObject->length());
uintptr_t pointer = thisObject->m_fiber;
@@ -294,7 +294,7 @@
{
ASSERT(isRope());
- VM& vm = *this->vm();
+ VM& vm = this->vm();
if (isSubstring()) {
ASSERT(!substringBase()->isRope());
auto newImpl = substringBase()->valueInternal().substringSharingImpl(substringOffset(), length());
@@ -502,7 +502,7 @@
if (JSString* string = vm.stringCache.get(&stringImpl))
return string;
- JSString* string = jsString(&vm, String(stringImpl));
+ JSString* string = jsString(vm, String(stringImpl));
vm.lastCachedString.set(vm, string);
return string;
}
diff --git a/Source/JavaScriptCore/runtime/JSString.h b/Source/JavaScriptCore/runtime/JSString.h
index a1644af..4898ebf 100644
--- a/Source/JavaScriptCore/runtime/JSString.h
+++ b/Source/JavaScriptCore/runtime/JSString.h
@@ -41,26 +41,21 @@
class JSRopeString;
class LLIntOffsetsExtractor;
-JSString* jsEmptyString(VM*);
-JSString* jsEmptyString(ExecState*);
-JSString* jsString(VM*, const String&); // returns empty string if passed null string
-JSString* jsString(ExecState*, const String&); // returns empty string if passed null string
+JSString* jsEmptyString(VM&);
+JSString* jsString(VM&, const String&); // returns empty string if passed null string
-JSString* jsSingleCharacterString(VM*, UChar);
-JSString* jsSingleCharacterString(ExecState*, UChar);
-JSString* jsSubstring(VM*, const String&, unsigned offset, unsigned length);
+JSString* jsSingleCharacterString(VM&, UChar);
+JSString* jsSubstring(VM&, const String&, unsigned offset, unsigned length);
// Non-trivial strings are two or more characters long.
// These functions are faster than just calling jsString.
-JSString* jsNontrivialString(VM*, const String&);
-JSString* jsNontrivialString(ExecState*, const String&);
-JSString* jsNontrivialString(ExecState*, String&&);
+JSString* jsNontrivialString(VM&, const String&);
+JSString* jsNontrivialString(VM&, String&&);
// Should be used for strings that are owned by an object that will
// likely outlive the JSValue this makes, such as the parse tree or a
// DOM object that contains a String
-JSString* jsOwnedString(VM*, const String&);
-JSString* jsOwnedString(ExecState*, const String&);
+JSString* jsOwnedString(VM&, const String&);
bool isJSString(JSCell*);
bool isJSString(JSValue);
@@ -238,20 +233,20 @@
StringView unsafeView(ExecState*) const;
- friend JSString* jsString(VM*, const String&);
+ friend JSString* jsString(VM&, const String&);
friend JSString* jsString(ExecState*, JSString*, JSString*);
friend JSString* jsString(ExecState*, const String&, JSString*);
friend JSString* jsString(ExecState*, JSString*, const String&);
friend JSString* jsString(ExecState*, const String&, const String&);
friend JSString* jsString(ExecState*, JSString*, JSString*, JSString*);
friend JSString* jsString(ExecState*, const String&, const String&, const String&);
- friend JSString* jsSingleCharacterString(VM*, UChar);
- friend JSString* jsNontrivialString(VM*, const String&);
- friend JSString* jsNontrivialString(VM*, String&&);
- friend JSString* jsSubstring(VM*, const String&, unsigned, unsigned);
+ friend JSString* jsSingleCharacterString(VM&, UChar);
+ friend JSString* jsNontrivialString(VM&, const String&);
+ friend JSString* jsNontrivialString(VM&, String&&);
+ friend JSString* jsSubstring(VM&, const String&, unsigned, unsigned);
friend JSString* jsSubstring(VM&, ExecState*, JSString*, unsigned, unsigned);
friend JSString* jsSubstringOfResolved(VM&, GCDeferralContext*, JSString*, unsigned, unsigned);
- friend JSString* jsOwnedString(VM*, const String&);
+ friend JSString* jsOwnedString(VM&, const String&);
};
// NOTE: This class cannot override JSString's destructor. JSString's destructor is called directly
@@ -402,7 +397,7 @@
switch (m_strings.size()) {
case 0: {
ASSERT(!m_length);
- result = jsEmptyString(&m_vm);
+ result = jsEmptyString(m_vm);
break;
}
case 1: {
@@ -719,41 +714,45 @@
}
// This MUST NOT GC.
-inline JSString* jsEmptyString(VM* vm)
+inline JSString* jsEmptyString(VM& vm)
{
- return vm->smallStrings.emptyString();
+ return vm.smallStrings.emptyString();
}
-ALWAYS_INLINE JSString* jsSingleCharacterString(VM* vm, UChar c)
+ALWAYS_INLINE JSString* jsSingleCharacterString(VM& vm, UChar c)
{
if (validateDFGDoesGC)
- RELEASE_ASSERT(vm->heap.expectDoesGC());
+ RELEASE_ASSERT(vm.heap.expectDoesGC());
if (c <= maxSingleCharacterString)
- return vm->smallStrings.singleCharacterString(c);
- return JSString::create(*vm, StringImpl::create(&c, 1));
+ return vm.smallStrings.singleCharacterString(c);
+ return JSString::create(vm, StringImpl::create(&c, 1));
}
-inline JSString* jsNontrivialString(VM* vm, const String& s)
+inline JSString* jsNontrivialString(VM& vm, const String& s)
{
ASSERT(s.length() > 1);
- return JSString::create(*vm, *s.impl());
+ return JSString::create(vm, *s.impl());
}
-inline JSString* jsNontrivialString(VM* vm, String&& s)
+inline JSString* jsNontrivialString(VM& vm, String&& s)
{
ASSERT(s.length() > 1);
- return JSString::create(*vm, s.releaseImpl().releaseNonNull());
+ return JSString::create(vm, s.releaseImpl().releaseNonNull());
}
ALWAYS_INLINE Identifier JSString::toIdentifier(ExecState* exec) const
{
- return Identifier::fromString(exec, toAtomString(exec));
+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+ AtomString atomString = toAtomString(exec);
+ RETURN_IF_EXCEPTION(scope, { });
+ return Identifier::fromString(vm, atomString);
}
ALWAYS_INLINE AtomString JSString::toAtomString(ExecState* exec) const
{
if (validateDFGDoesGC)
- RELEASE_ASSERT(vm()->heap.expectDoesGC());
+ RELEASE_ASSERT(vm().heap.expectDoesGC());
if (isRope())
return static_cast<const JSRopeString*>(this)->resolveRopeToAtomString(exec);
return AtomString(valueInternal());
@@ -762,7 +761,7 @@
ALWAYS_INLINE RefPtr<AtomStringImpl> JSString::toExistingAtomString(ExecState* exec) const
{
if (validateDFGDoesGC)
- RELEASE_ASSERT(vm()->heap.expectDoesGC());
+ RELEASE_ASSERT(vm().heap.expectDoesGC());
if (isRope())
return static_cast<const JSRopeString*>(this)->resolveRopeToExistingAtomString(exec);
if (valueInternal().impl()->isAtom())
@@ -773,7 +772,7 @@
inline const String& JSString::value(ExecState* exec) const
{
if (validateDFGDoesGC)
- RELEASE_ASSERT(vm()->heap.expectDoesGC());
+ RELEASE_ASSERT(vm().heap.expectDoesGC());
if (isRope())
return static_cast<const JSRopeString*>(this)->resolveRope(exec);
return valueInternal();
@@ -783,7 +782,7 @@
{
if (allocationAllowed) {
if (validateDFGDoesGC)
- RELEASE_ASSERT(vm()->heap.expectDoesGC());
+ RELEASE_ASSERT(vm().heap.expectDoesGC());
if (isRope()) {
// Pass nullptr for the ExecState so that resolveRope does not throw in the event of an OOM error.
return static_cast<const JSRopeString*>(this)->resolveRope(nullptr);
@@ -800,20 +799,20 @@
ASSERT(canGetIndex(i));
StringView view = unsafeView(exec);
RETURN_IF_EXCEPTION(scope, nullptr);
- return jsSingleCharacterString(exec, view[i]);
+ return jsSingleCharacterString(vm, view[i]);
}
-inline JSString* jsString(VM* vm, const String& s)
+inline JSString* jsString(VM& vm, const String& s)
{
int size = s.length();
if (!size)
- return vm->smallStrings.emptyString();
+ return vm.smallStrings.emptyString();
if (size == 1) {
UChar c = s.characterAt(0);
if (c <= maxSingleCharacterString)
- return vm->smallStrings.singleCharacterString(c);
+ return vm.smallStrings.singleCharacterString(c);
}
- return JSString::create(*vm, *s.impl());
+ return JSString::create(vm, *s.impl());
}
inline JSString* jsSubstring(VM& vm, ExecState* exec, JSString* base, unsigned offset, unsigned length)
@@ -872,50 +871,43 @@
return jsSubstring(exec->vm(), exec, s, offset, length);
}
-inline JSString* jsSubstring(VM* vm, const String& s, unsigned offset, unsigned length)
+inline JSString* jsSubstring(VM& vm, const String& s, unsigned offset, unsigned length)
{
ASSERT(offset <= s.length());
ASSERT(length <= s.length());
ASSERT(offset + length <= s.length());
if (!length)
- return vm->smallStrings.emptyString();
+ return vm.smallStrings.emptyString();
if (length == 1) {
UChar c = s.characterAt(offset);
if (c <= maxSingleCharacterString)
- return vm->smallStrings.singleCharacterString(c);
+ return vm.smallStrings.singleCharacterString(c);
}
auto impl = StringImpl::createSubstringSharingImpl(*s.impl(), offset, length);
if (impl->isSubString())
- return JSString::createHasOtherOwner(*vm, WTFMove(impl));
- return JSString::create(*vm, WTFMove(impl));
+ return JSString::createHasOtherOwner(vm, WTFMove(impl));
+ return JSString::create(vm, WTFMove(impl));
}
-inline JSString* jsOwnedString(VM* vm, const String& s)
+inline JSString* jsOwnedString(VM& vm, const String& s)
{
int size = s.length();
if (!size)
- return vm->smallStrings.emptyString();
+ return vm.smallStrings.emptyString();
if (size == 1) {
UChar c = s.characterAt(0);
if (c <= maxSingleCharacterString)
- return vm->smallStrings.singleCharacterString(c);
+ return vm.smallStrings.singleCharacterString(c);
}
- return JSString::createHasOtherOwner(*vm, *s.impl());
+ return JSString::createHasOtherOwner(vm, *s.impl());
}
-inline JSString* jsEmptyString(ExecState* exec) { return jsEmptyString(&exec->vm()); }
-inline JSString* jsString(ExecState* exec, const String& s) { return jsString(&exec->vm(), s); }
-inline JSString* jsSingleCharacterString(ExecState* exec, UChar c) { return jsSingleCharacterString(&exec->vm(), c); }
-inline JSString* jsNontrivialString(ExecState* exec, const String& s) { return jsNontrivialString(&exec->vm(), s); }
-inline JSString* jsNontrivialString(ExecState* exec, String&& s) { return jsNontrivialString(&exec->vm(), WTFMove(s)); }
-inline JSString* jsOwnedString(ExecState* exec, const String& s) { return jsOwnedString(&exec->vm(), s); }
-
ALWAYS_INLINE JSString* jsStringWithCache(ExecState* exec, const String& s)
{
VM& vm = exec->vm();
StringImpl* stringImpl = s.impl();
if (!stringImpl || !stringImpl->length())
- return jsEmptyString(&vm);
+ return jsEmptyString(vm);
if (stringImpl->length() == 1) {
UChar singleCharacter = (*stringImpl)[0u];
@@ -980,7 +972,7 @@
ALWAYS_INLINE StringView JSRopeString::unsafeView(ExecState* exec) const
{
if (validateDFGDoesGC)
- RELEASE_ASSERT(vm()->heap.expectDoesGC());
+ RELEASE_ASSERT(vm().heap.expectDoesGC());
if (isSubstring()) {
auto& base = substringBase()->valueInternal();
if (base.is8Bit())
@@ -993,7 +985,7 @@
ALWAYS_INLINE StringViewWithUnderlyingString JSRopeString::viewWithUnderlyingString(ExecState* exec) const
{
if (validateDFGDoesGC)
- RELEASE_ASSERT(vm()->heap.expectDoesGC());
+ RELEASE_ASSERT(vm().heap.expectDoesGC());
if (isSubstring()) {
auto& base = substringBase()->valueInternal();
if (base.is8Bit())
@@ -1007,7 +999,7 @@
ALWAYS_INLINE StringView JSString::unsafeView(ExecState* exec) const
{
if (validateDFGDoesGC)
- RELEASE_ASSERT(vm()->heap.expectDoesGC());
+ RELEASE_ASSERT(vm().heap.expectDoesGC());
if (isRope())
return static_cast<const JSRopeString*>(this)->unsafeView(exec);
return valueInternal();
diff --git a/Source/JavaScriptCore/runtime/JSStringInlines.h b/Source/JavaScriptCore/runtime/JSStringInlines.h
index b44a179..05bfa56 100644
--- a/Source/JavaScriptCore/runtime/JSStringInlines.h
+++ b/Source/JavaScriptCore/runtime/JSStringInlines.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-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
@@ -44,9 +44,9 @@
}
template<typename StringType>
-inline JSValue jsMakeNontrivialString(ExecState* exec, StringType&& string)
+inline JSValue jsMakeNontrivialString(VM& vm, StringType&& string)
{
- return jsNontrivialString(exec, std::forward<StringType>(string));
+ return jsNontrivialString(vm, std::forward<StringType>(string));
}
template<typename StringType, typename... StringTypes>
@@ -58,7 +58,7 @@
if (UNLIKELY(!result))
return throwOutOfMemoryError(exec, scope);
ASSERT(result.length() <= JSString::MaxLength);
- return jsNontrivialString(exec, WTFMove(result));
+ return jsNontrivialString(vm, WTFMove(result));
}
template <typename CharacterType>
@@ -76,7 +76,7 @@
std::fill_n(buffer, repeatCount, character);
- RELEASE_AND_RETURN(scope, jsString(&exec, WTFMove(impl)));
+ RELEASE_AND_RETURN(scope, jsString(vm, WTFMove(impl)));
}
} // namespace JSC
diff --git a/Source/JavaScriptCore/runtime/JSStringJoiner.cpp b/Source/JavaScriptCore/runtime/JSStringJoiner.cpp
index ea930b5..11fe483 100644
--- a/Source/JavaScriptCore/runtime/JSStringJoiner.cpp
+++ b/Source/JavaScriptCore/runtime/JSStringJoiner.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-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
@@ -111,7 +111,7 @@
RETURN_IF_EXCEPTION(scope, JSValue());
if (!length)
- return jsEmptyString(&state);
+ return jsEmptyString(vm);
String result;
if (m_isAll8Bit)
@@ -122,7 +122,7 @@
if (result.isNull())
return throwOutOfMemoryError(&state, scope);
- return jsString(&state, WTFMove(result));
+ return jsString(vm, WTFMove(result));
}
}
diff --git a/Source/JavaScriptCore/runtime/JSSymbolTableObject.cpp b/Source/JavaScriptCore/runtime/JSSymbolTableObject.cpp
index c5b163e..d68b237 100644
--- a/Source/JavaScriptCore/runtime/JSSymbolTableObject.cpp
+++ b/Source/JavaScriptCore/runtime/JSSymbolTableObject.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012, 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-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
@@ -55,6 +55,7 @@
void JSSymbolTableObject::getOwnNonIndexPropertyNames(JSObject* object, ExecState* exec, PropertyNameArray& propertyNames, EnumerationMode mode)
{
+ VM& vm = exec->vm();
JSSymbolTableObject* thisObject = jsCast<JSSymbolTableObject*>(object);
{
ConcurrentJSLocker locker(thisObject->symbolTable()->m_lock);
@@ -63,7 +64,7 @@
if (!(it->value.getAttributes() & PropertyAttribute::DontEnum) || mode.includeDontEnumProperties()) {
if (it->key->isSymbol() && !propertyNames.includeSymbolProperties())
continue;
- propertyNames.add(Identifier::fromUid(exec, it->key.get()));
+ propertyNames.add(Identifier::fromUid(vm, it->key.get()));
}
}
}
diff --git a/Source/JavaScriptCore/runtime/JSTemplateObjectDescriptor.cpp b/Source/JavaScriptCore/runtime/JSTemplateObjectDescriptor.cpp
index 99d6a98..5a01805 100644
--- a/Source/JavaScriptCore/runtime/JSTemplateObjectDescriptor.cpp
+++ b/Source/JavaScriptCore/runtime/JSTemplateObjectDescriptor.cpp
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2015 Yusuke Suzuki <utatane.tea@gmail.com>.
- * Copyright (C) 2016 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2016-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
@@ -68,12 +68,12 @@
for (unsigned index = 0; index < count; ++index) {
auto cooked = descriptor().cookedStrings()[index];
if (cooked)
- templateObject->putDirectIndex(exec, index, jsString(exec, cooked.value()), PropertyAttribute::ReadOnly | PropertyAttribute::DontDelete, PutDirectIndexLikePutDirect);
+ templateObject->putDirectIndex(exec, index, jsString(vm, cooked.value()), PropertyAttribute::ReadOnly | PropertyAttribute::DontDelete, PutDirectIndexLikePutDirect);
else
templateObject->putDirectIndex(exec, index, jsUndefined(), PropertyAttribute::ReadOnly | PropertyAttribute::DontDelete, PutDirectIndexLikePutDirect);
RETURN_IF_EXCEPTION(scope, nullptr);
- rawObject->putDirectIndex(exec, index, jsString(exec, descriptor().rawStrings()[index]), PropertyAttribute::ReadOnly | PropertyAttribute::DontDelete, PutDirectIndexLikePutDirect);
+ rawObject->putDirectIndex(exec, index, jsString(vm, descriptor().rawStrings()[index]), PropertyAttribute::ReadOnly | PropertyAttribute::DontDelete, PutDirectIndexLikePutDirect);
RETURN_IF_EXCEPTION(scope, nullptr);
}
diff --git a/Source/JavaScriptCore/runtime/JSTypedArrayViewPrototype.cpp b/Source/JavaScriptCore/runtime/JSTypedArrayViewPrototype.cpp
index ac16dc9..fab6e09 100644
--- a/Source/JavaScriptCore/runtime/JSTypedArrayViewPrototype.cpp
+++ b/Source/JavaScriptCore/runtime/JSTypedArrayViewPrototype.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015-2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-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
@@ -257,23 +257,23 @@
VM& vm = exec->vm();
switch (thisValue.getObject()->classInfo(vm)->typedArrayStorageType) {
case TypeUint8Clamped:
- return JSValue::encode(jsString(&vm, "Uint8ClampedArray"));
+ return JSValue::encode(jsString(vm, "Uint8ClampedArray"));
case TypeInt32:
- return JSValue::encode(jsString(&vm, "Int32Array"));
+ return JSValue::encode(jsString(vm, "Int32Array"));
case TypeUint32:
- return JSValue::encode(jsString(&vm, "Uint32Array"));
+ return JSValue::encode(jsString(vm, "Uint32Array"));
case TypeFloat64:
- return JSValue::encode(jsString(&vm, "Float64Array"));
+ return JSValue::encode(jsString(vm, "Float64Array"));
case TypeFloat32:
- return JSValue::encode(jsString(&vm, "Float32Array"));
+ return JSValue::encode(jsString(vm, "Float32Array"));
case TypeInt8:
- return JSValue::encode(jsString(&vm, "Int8Array"));
+ return JSValue::encode(jsString(vm, "Int8Array"));
case TypeUint8:
- return JSValue::encode(jsString(&vm, "Uint8Array"));
+ return JSValue::encode(jsString(vm, "Uint8Array"));
case TypeInt16:
- return JSValue::encode(jsString(&vm, "Int16Array"));
+ return JSValue::encode(jsString(vm, "Int16Array"));
case TypeUint16:
- return JSValue::encode(jsString(&vm, "Uint16Array"));
+ return JSValue::encode(jsString(vm, "Uint16Array"));
case NotTypedArray:
case TypeDataView:
return JSValue::encode(jsUndefined());
diff --git a/Source/JavaScriptCore/runtime/LazyClassStructure.cpp b/Source/JavaScriptCore/runtime/LazyClassStructure.cpp
index b3baeca..032db8d1 100644
--- a/Source/JavaScriptCore/runtime/LazyClassStructure.cpp
+++ b/Source/JavaScriptCore/runtime/LazyClassStructure.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-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
@@ -84,7 +84,7 @@
else
RELEASE_ASSERT_NOT_REACHED();
- setConstructor(Identifier::fromString(&vm, name), constructor);
+ setConstructor(Identifier::fromString(vm, name), constructor);
}
void LazyClassStructure::visit(SlotVisitor& visitor)
diff --git a/Source/JavaScriptCore/runtime/LazyProperty.h b/Source/JavaScriptCore/runtime/LazyProperty.h
index ff0ac16..ad4f0a5 100644
--- a/Source/JavaScriptCore/runtime/LazyProperty.h
+++ b/Source/JavaScriptCore/runtime/LazyProperty.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-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
@@ -40,7 +40,7 @@
public:
struct Initializer {
Initializer(OwnerType* owner, LazyProperty& property)
- : vm(*Heap::heap(owner)->vm())
+ : vm(Heap::heap(owner)->vm())
, owner(owner)
, property(property)
{
diff --git a/Source/JavaScriptCore/runtime/LiteralParser.cpp b/Source/JavaScriptCore/runtime/LiteralParser.cpp
index b1a994f..b6d8ef9 100644
--- a/Source/JavaScriptCore/runtime/LiteralParser.cpp
+++ b/Source/JavaScriptCore/runtime/LiteralParser.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2009-2019 Apple Inc. All rights reserved.
* Copyright (C) 2012 Mathias Bynens (mathias@qiwi.be)
*
* Redistribution and use in source and binary forms, with or without
@@ -59,17 +59,17 @@
do {
Vector<JSONPPathEntry> path;
// Unguarded next to start off the lexer
- Identifier name = Identifier::fromString(&vm, m_lexer.currentToken()->start, m_lexer.currentToken()->end - m_lexer.currentToken()->start);
+ Identifier name = Identifier::fromString(vm, m_lexer.currentToken()->start, m_lexer.currentToken()->end - m_lexer.currentToken()->start);
JSONPPathEntry entry;
if (name == vm.propertyNames->varKeyword) {
if (m_lexer.next() != TokIdentifier)
return false;
entry.m_type = JSONPPathEntryTypeDeclareVar;
- entry.m_pathEntryName = Identifier::fromString(&vm, m_lexer.currentToken()->start, m_lexer.currentToken()->end - m_lexer.currentToken()->start);
+ entry.m_pathEntryName = Identifier::fromString(vm, m_lexer.currentToken()->start, m_lexer.currentToken()->end - m_lexer.currentToken()->start);
path.append(entry);
} else {
entry.m_type = JSONPPathEntryTypeDot;
- entry.m_pathEntryName = Identifier::fromString(&vm, m_lexer.currentToken()->start, m_lexer.currentToken()->end - m_lexer.currentToken()->start);
+ entry.m_pathEntryName = Identifier::fromString(vm, m_lexer.currentToken()->start, m_lexer.currentToken()->end - m_lexer.currentToken()->start);
path.append(entry);
}
if (isLexerKeyword(entry.m_pathEntryName))
@@ -96,7 +96,7 @@
entry.m_type = JSONPPathEntryTypeDot;
if (m_lexer.next() != TokIdentifier)
return false;
- entry.m_pathEntryName = Identifier::fromString(&vm, m_lexer.currentToken()->start, m_lexer.currentToken()->end - m_lexer.currentToken()->start);
+ entry.m_pathEntryName = Identifier::fromString(vm, m_lexer.currentToken()->start, m_lexer.currentToken()->end - m_lexer.currentToken()->start);
break;
}
case TokLParen: {
@@ -136,40 +136,42 @@
template <typename CharType>
ALWAYS_INLINE const Identifier LiteralParser<CharType>::makeIdentifier(const LChar* characters, size_t length)
{
+ VM& vm = m_exec->vm();
if (!length)
- return m_exec->vm().propertyNames->emptyIdentifier;
+ return vm.propertyNames->emptyIdentifier;
if (characters[0] >= MaximumCachableCharacter)
- return Identifier::fromString(&m_exec->vm(), characters, length);
+ return Identifier::fromString(vm, characters, length);
if (length == 1) {
if (!m_shortIdentifiers[characters[0]].isNull())
return m_shortIdentifiers[characters[0]];
- m_shortIdentifiers[characters[0]] = Identifier::fromString(&m_exec->vm(), characters, length);
+ m_shortIdentifiers[characters[0]] = Identifier::fromString(vm, characters, length);
return m_shortIdentifiers[characters[0]];
}
if (!m_recentIdentifiers[characters[0]].isNull() && Identifier::equal(m_recentIdentifiers[characters[0]].impl(), characters, length))
return m_recentIdentifiers[characters[0]];
- m_recentIdentifiers[characters[0]] = Identifier::fromString(&m_exec->vm(), characters, length);
+ m_recentIdentifiers[characters[0]] = Identifier::fromString(vm, characters, length);
return m_recentIdentifiers[characters[0]];
}
template <typename CharType>
ALWAYS_INLINE const Identifier LiteralParser<CharType>::makeIdentifier(const UChar* characters, size_t length)
{
+ VM& vm = m_exec->vm();
if (!length)
- return m_exec->vm().propertyNames->emptyIdentifier;
+ return vm.propertyNames->emptyIdentifier;
if (characters[0] >= MaximumCachableCharacter)
- return Identifier::fromString(&m_exec->vm(), characters, length);
+ return Identifier::fromString(vm, characters, length);
if (length == 1) {
if (!m_shortIdentifiers[characters[0]].isNull())
return m_shortIdentifiers[characters[0]];
- m_shortIdentifiers[characters[0]] = Identifier::fromString(&m_exec->vm(), characters, length);
+ m_shortIdentifiers[characters[0]] = Identifier::fromString(vm, characters, length);
return m_shortIdentifiers[characters[0]];
}
if (!m_recentIdentifiers[characters[0]].isNull() && Identifier::equal(m_recentIdentifiers[characters[0]].impl(), characters, length))
return m_recentIdentifiers[characters[0]];
- m_recentIdentifiers[characters[0]] = Identifier::fromString(&m_exec->vm(), characters, length);
+ m_recentIdentifiers[characters[0]] = Identifier::fromString(vm, characters, length);
return m_recentIdentifiers[characters[0]];
}
@@ -961,9 +963,9 @@
case TokString: {
typename Lexer::LiteralParserTokenPtr stringToken = m_lexer.currentToken();
if (stringToken->stringIs8Bit)
- lastValue = jsString(m_exec, makeIdentifier(stringToken->stringToken8, stringToken->stringLength).string());
+ lastValue = jsString(vm, makeIdentifier(stringToken->stringToken8, stringToken->stringLength).string());
else
- lastValue = jsString(m_exec, makeIdentifier(stringToken->stringToken16, stringToken->stringLength).string());
+ lastValue = jsString(vm, makeIdentifier(stringToken->stringToken16, stringToken->stringLength).string());
m_lexer.next();
break;
}
diff --git a/Source/JavaScriptCore/runtime/Lookup.h b/Source/JavaScriptCore/runtime/Lookup.h
index c4903fa..eac165a 100644
--- a/Source/JavaScriptCore/runtime/Lookup.h
+++ b/Source/JavaScriptCore/runtime/Lookup.h
@@ -1,6 +1,6 @@
/*
* Copyright (C) 1999-2000 Harri Porten (porten@kde.org)
- * Copyright (C) 2003-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2003-2019 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -399,7 +399,7 @@
for (auto& value : values) {
if (!value.m_key)
continue;
- auto key = Identifier::fromString(&vm, reinterpret_cast<const LChar*>(value.m_key), strlen(value.m_key));
+ auto key = Identifier::fromString(vm, reinterpret_cast<const LChar*>(value.m_key), strlen(value.m_key));
reifyStaticProperty(vm, classInfo, key, value, thisObj);
}
}
diff --git a/Source/JavaScriptCore/runtime/MapIteratorPrototype.cpp b/Source/JavaScriptCore/runtime/MapIteratorPrototype.cpp
index 825b789..a92f968 100644
--- a/Source/JavaScriptCore/runtime/MapIteratorPrototype.cpp
+++ b/Source/JavaScriptCore/runtime/MapIteratorPrototype.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013, 2016 Apple, Inc. All rights reserved.
+ * Copyright (C) 2013-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
@@ -38,7 +38,7 @@
Base::finishCreation(vm);
ASSERT(inherits(vm, info()));
- putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(&vm, "Map Iterator"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
+ putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(vm, "Map Iterator"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
JSC_BUILTIN_FUNCTION_WITHOUT_TRANSITION(vm.propertyNames->next, mapIteratorPrototypeNextCodeGenerator, static_cast<unsigned>(PropertyAttribute::DontEnum));
}
diff --git a/Source/JavaScriptCore/runtime/MapPrototype.cpp b/Source/JavaScriptCore/runtime/MapPrototype.cpp
index 4f0ba9b..c22905e 100644
--- a/Source/JavaScriptCore/runtime/MapPrototype.cpp
+++ b/Source/JavaScriptCore/runtime/MapPrototype.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013, 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-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
@@ -73,7 +73,7 @@
JSFunction* entries = JSFunction::create(vm, mapPrototypeEntriesCodeGenerator(vm), globalObject);
putDirectWithoutTransition(vm, vm.propertyNames->builtinNames().entriesPublicName(), entries, static_cast<unsigned>(PropertyAttribute::DontEnum));
putDirectWithoutTransition(vm, vm.propertyNames->iteratorSymbol, entries, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(&vm, "Map"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
+ putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(vm, "Map"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
JSC_NATIVE_GETTER_WITHOUT_TRANSITION(vm.propertyNames->size, mapProtoFuncSize, PropertyAttribute::DontEnum | PropertyAttribute::Accessor);
}
diff --git a/Source/JavaScriptCore/runtime/MathObject.cpp b/Source/JavaScriptCore/runtime/MathObject.cpp
index 71ce38b..2b06d66 100644
--- a/Source/JavaScriptCore/runtime/MathObject.cpp
+++ b/Source/JavaScriptCore/runtime/MathObject.cpp
@@ -1,6 +1,6 @@
/*
* Copyright (C) 1999-2000 Harri Porten (porten@kde.org)
- * Copyright (C) 2007-2008, 2013, 2015-2016 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2007-2019 Apple Inc. All Rights Reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -78,51 +78,51 @@
Base::finishCreation(vm);
ASSERT(inherits(vm, info()));
- putDirectWithoutTransition(vm, Identifier::fromString(&vm, "E"), jsNumber(Math::exp(1.0)), PropertyAttribute::DontDelete | PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
- putDirectWithoutTransition(vm, Identifier::fromString(&vm, "LN2"), jsNumber(Math::log(2.0)), PropertyAttribute::DontDelete | PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
- putDirectWithoutTransition(vm, Identifier::fromString(&vm, "LN10"), jsNumber(Math::log(10.0)), PropertyAttribute::DontDelete | PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
- putDirectWithoutTransition(vm, Identifier::fromString(&vm, "LOG2E"), jsNumber(1.0 / Math::log(2.0)), PropertyAttribute::DontDelete | PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
- putDirectWithoutTransition(vm, Identifier::fromString(&vm, "LOG10E"), jsNumber(0.4342944819032518), PropertyAttribute::DontDelete | PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
- putDirectWithoutTransition(vm, Identifier::fromString(&vm, "PI"), jsNumber(piDouble), PropertyAttribute::DontDelete | PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
- putDirectWithoutTransition(vm, Identifier::fromString(&vm, "SQRT1_2"), jsNumber(sqrt(0.5)), PropertyAttribute::DontDelete | PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
- putDirectWithoutTransition(vm, Identifier::fromString(&vm, "SQRT2"), jsNumber(sqrt(2.0)), PropertyAttribute::DontDelete | PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
- putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(&vm, "Math"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
+ putDirectWithoutTransition(vm, Identifier::fromString(vm, "E"), jsNumber(Math::exp(1.0)), PropertyAttribute::DontDelete | PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
+ putDirectWithoutTransition(vm, Identifier::fromString(vm, "LN2"), jsNumber(Math::log(2.0)), PropertyAttribute::DontDelete | PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
+ putDirectWithoutTransition(vm, Identifier::fromString(vm, "LN10"), jsNumber(Math::log(10.0)), PropertyAttribute::DontDelete | PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
+ putDirectWithoutTransition(vm, Identifier::fromString(vm, "LOG2E"), jsNumber(1.0 / Math::log(2.0)), PropertyAttribute::DontDelete | PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
+ putDirectWithoutTransition(vm, Identifier::fromString(vm, "LOG10E"), jsNumber(0.4342944819032518), PropertyAttribute::DontDelete | PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
+ putDirectWithoutTransition(vm, Identifier::fromString(vm, "PI"), jsNumber(piDouble), PropertyAttribute::DontDelete | PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
+ putDirectWithoutTransition(vm, Identifier::fromString(vm, "SQRT1_2"), jsNumber(sqrt(0.5)), PropertyAttribute::DontDelete | PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
+ putDirectWithoutTransition(vm, Identifier::fromString(vm, "SQRT2"), jsNumber(sqrt(2.0)), PropertyAttribute::DontDelete | PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
+ putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(vm, "Math"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
- putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(&vm, "abs"), 1, mathProtoFuncAbs, AbsIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(&vm, "acos"), 1, mathProtoFuncACos, ACosIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(&vm, "asin"), 1, mathProtoFuncASin, ASinIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(&vm, "atan"), 1, mathProtoFuncATan, ATanIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(&vm, "acosh"), 1, mathProtoFuncACosh, ACoshIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(&vm, "asinh"), 1, mathProtoFuncASinh, ASinhIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(&vm, "atanh"), 1, mathProtoFuncATanh, ATanhIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(&vm, "atan2"), 2, mathProtoFuncATan2, NoIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(&vm, "cbrt"), 1, mathProtoFuncCbrt, CbrtIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(&vm, "ceil"), 1, mathProtoFuncCeil, CeilIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(&vm, "clz32"), 1, mathProtoFuncClz32, Clz32Intrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(&vm, "cos"), 1, mathProtoFuncCos, CosIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(&vm, "cosh"), 1, mathProtoFuncCosh, CoshIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(&vm, "exp"), 1, mathProtoFuncExp, ExpIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(&vm, "expm1"), 1, mathProtoFuncExpm1, Expm1Intrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(&vm, "floor"), 1, mathProtoFuncFloor, FloorIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(&vm, "fround"), 1, mathProtoFuncFround, FRoundIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(&vm, "hypot"), 2, mathProtoFuncHypot, NoIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(&vm, "log"), 1, mathProtoFuncLog, LogIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(&vm, "log10"), 1, mathProtoFuncLog10, Log10Intrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(&vm, "log1p"), 1, mathProtoFuncLog1p, Log1pIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(&vm, "log2"), 1, mathProtoFuncLog2, Log2Intrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(&vm, "max"), 2, mathProtoFuncMax, MaxIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(&vm, "min"), 2, mathProtoFuncMin, MinIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(&vm, "pow"), 2, mathProtoFuncPow, PowIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(&vm, "random"), 0, mathProtoFuncRandom, RandomIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(&vm, "round"), 1, mathProtoFuncRound, RoundIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(&vm, "sign"), 1, mathProtoFuncSign, NoIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(&vm, "sin"), 1, mathProtoFuncSin, SinIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(&vm, "sinh"), 1, mathProtoFuncSinh, SinhIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(&vm, "sqrt"), 1, mathProtoFuncSqrt, SqrtIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(&vm, "tan"), 1, mathProtoFuncTan, TanIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(&vm, "tanh"), 1, mathProtoFuncTanh, TanhIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(&vm, "trunc"), 1, mathProtoFuncTrunc, TruncIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(&vm, "imul"), 2, mathProtoFuncIMul, IMulIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(vm, "abs"), 1, mathProtoFuncAbs, AbsIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(vm, "acos"), 1, mathProtoFuncACos, ACosIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(vm, "asin"), 1, mathProtoFuncASin, ASinIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(vm, "atan"), 1, mathProtoFuncATan, ATanIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(vm, "acosh"), 1, mathProtoFuncACosh, ACoshIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(vm, "asinh"), 1, mathProtoFuncASinh, ASinhIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(vm, "atanh"), 1, mathProtoFuncATanh, ATanhIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(vm, "atan2"), 2, mathProtoFuncATan2, NoIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(vm, "cbrt"), 1, mathProtoFuncCbrt, CbrtIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(vm, "ceil"), 1, mathProtoFuncCeil, CeilIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(vm, "clz32"), 1, mathProtoFuncClz32, Clz32Intrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(vm, "cos"), 1, mathProtoFuncCos, CosIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(vm, "cosh"), 1, mathProtoFuncCosh, CoshIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(vm, "exp"), 1, mathProtoFuncExp, ExpIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(vm, "expm1"), 1, mathProtoFuncExpm1, Expm1Intrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(vm, "floor"), 1, mathProtoFuncFloor, FloorIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(vm, "fround"), 1, mathProtoFuncFround, FRoundIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(vm, "hypot"), 2, mathProtoFuncHypot, NoIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(vm, "log"), 1, mathProtoFuncLog, LogIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(vm, "log10"), 1, mathProtoFuncLog10, Log10Intrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(vm, "log1p"), 1, mathProtoFuncLog1p, Log1pIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(vm, "log2"), 1, mathProtoFuncLog2, Log2Intrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(vm, "max"), 2, mathProtoFuncMax, MaxIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(vm, "min"), 2, mathProtoFuncMin, MinIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(vm, "pow"), 2, mathProtoFuncPow, PowIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(vm, "random"), 0, mathProtoFuncRandom, RandomIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(vm, "round"), 1, mathProtoFuncRound, RoundIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(vm, "sign"), 1, mathProtoFuncSign, NoIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(vm, "sin"), 1, mathProtoFuncSin, SinIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(vm, "sinh"), 1, mathProtoFuncSinh, SinhIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(vm, "sqrt"), 1, mathProtoFuncSqrt, SqrtIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(vm, "tan"), 1, mathProtoFuncTan, TanIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(vm, "tanh"), 1, mathProtoFuncTanh, TanhIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(vm, "trunc"), 1, mathProtoFuncTrunc, TruncIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunctionWithoutTransition(vm, globalObject, Identifier::fromString(vm, "imul"), 2, mathProtoFuncIMul, IMulIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
}
// ------------------------------ Functions --------------------------------
diff --git a/Source/JavaScriptCore/runtime/NumberConstructor.cpp b/Source/JavaScriptCore/runtime/NumberConstructor.cpp
index a499d9e..e82a8fb 100644
--- a/Source/JavaScriptCore/runtime/NumberConstructor.cpp
+++ b/Source/JavaScriptCore/runtime/NumberConstructor.cpp
@@ -1,6 +1,6 @@
/*
* Copyright (C) 1999-2000,2003 Harri Porten (porten@kde.org)
- * Copyright (C) 2007, 2008, 2011, 2015-2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2007-2019 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -70,19 +70,19 @@
putDirectWithoutTransition(vm, vm.propertyNames->prototype, numberPrototype, PropertyAttribute::DontEnum | PropertyAttribute::DontDelete | PropertyAttribute::ReadOnly);
putDirectWithoutTransition(vm, vm.propertyNames->length, jsNumber(1), PropertyAttribute::ReadOnly | PropertyAttribute::DontEnum);
- putDirectWithoutTransition(vm, Identifier::fromString(&vm, "EPSILON"), jsDoubleNumber(std::numeric_limits<double>::epsilon()), PropertyAttribute::DontDelete | PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
- putDirectWithoutTransition(vm, Identifier::fromString(&vm, "MAX_VALUE"), jsDoubleNumber(1.7976931348623157E+308), PropertyAttribute::DontDelete | PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
- putDirectWithoutTransition(vm, Identifier::fromString(&vm, "MIN_VALUE"), jsDoubleNumber(5E-324), PropertyAttribute::DontDelete | PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
- putDirectWithoutTransition(vm, Identifier::fromString(&vm, "MAX_SAFE_INTEGER"), jsDoubleNumber(maxSafeInteger()), PropertyAttribute::DontDelete | PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
- putDirectWithoutTransition(vm, Identifier::fromString(&vm, "MIN_SAFE_INTEGER"), jsDoubleNumber(minSafeInteger()), PropertyAttribute::DontDelete | PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
- putDirectWithoutTransition(vm, Identifier::fromString(&vm, "NEGATIVE_INFINITY"), jsDoubleNumber(-std::numeric_limits<double>::infinity()), PropertyAttribute::DontDelete | PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
- putDirectWithoutTransition(vm, Identifier::fromString(&vm, "POSITIVE_INFINITY"), jsDoubleNumber(std::numeric_limits<double>::infinity()), PropertyAttribute::DontDelete | PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
+ putDirectWithoutTransition(vm, Identifier::fromString(vm, "EPSILON"), jsDoubleNumber(std::numeric_limits<double>::epsilon()), PropertyAttribute::DontDelete | PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
+ putDirectWithoutTransition(vm, Identifier::fromString(vm, "MAX_VALUE"), jsDoubleNumber(1.7976931348623157E+308), PropertyAttribute::DontDelete | PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
+ putDirectWithoutTransition(vm, Identifier::fromString(vm, "MIN_VALUE"), jsDoubleNumber(5E-324), PropertyAttribute::DontDelete | PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
+ putDirectWithoutTransition(vm, Identifier::fromString(vm, "MAX_SAFE_INTEGER"), jsDoubleNumber(maxSafeInteger()), PropertyAttribute::DontDelete | PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
+ putDirectWithoutTransition(vm, Identifier::fromString(vm, "MIN_SAFE_INTEGER"), jsDoubleNumber(minSafeInteger()), PropertyAttribute::DontDelete | PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
+ putDirectWithoutTransition(vm, Identifier::fromString(vm, "NEGATIVE_INFINITY"), jsDoubleNumber(-std::numeric_limits<double>::infinity()), PropertyAttribute::DontDelete | PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
+ putDirectWithoutTransition(vm, Identifier::fromString(vm, "POSITIVE_INFINITY"), jsDoubleNumber(std::numeric_limits<double>::infinity()), PropertyAttribute::DontDelete | PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
putDirectWithoutTransition(vm, vm.propertyNames->NaN, jsNaN(), PropertyAttribute::DontDelete | PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
putDirectWithoutTransition(vm, vm.propertyNames->parseInt, numberPrototype->globalObject(vm)->parseIntFunction(), static_cast<unsigned>(PropertyAttribute::DontEnum));
putDirectWithoutTransition(vm, vm.propertyNames->parseFloat, numberPrototype->globalObject(vm)->parseFloatFunction(), static_cast<unsigned>(PropertyAttribute::DontEnum));
- JSC_NATIVE_INTRINSIC_FUNCTION_WITHOUT_TRANSITION(Identifier::fromString(&vm, "isInteger"), numberConstructorFuncIsInteger, static_cast<unsigned>(PropertyAttribute::DontEnum), 1, NumberIsIntegerIntrinsic);
+ JSC_NATIVE_INTRINSIC_FUNCTION_WITHOUT_TRANSITION(Identifier::fromString(vm, "isInteger"), numberConstructorFuncIsInteger, static_cast<unsigned>(PropertyAttribute::DontEnum), 1, NumberIsIntegerIntrinsic);
}
// ECMA 15.7.1
diff --git a/Source/JavaScriptCore/runtime/NumberPrototype.cpp b/Source/JavaScriptCore/runtime/NumberPrototype.cpp
index f69e68b..4b97b83 100644
--- a/Source/JavaScriptCore/runtime/NumberPrototype.cpp
+++ b/Source/JavaScriptCore/runtime/NumberPrototype.cpp
@@ -1,6 +1,6 @@
/*
* Copyright (C) 1999-2000,2003 Harri Porten (porten@kde.org)
- * Copyright (C) 2007, 2008, 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2007-2019 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -422,7 +422,7 @@
// Handle NaN and Infinity.
if (!std::isfinite(x))
- return JSValue::encode(jsNontrivialString(exec, String::number(x)));
+ return JSValue::encode(jsNontrivialString(vm, String::number(x)));
if (!inRange)
return throwVMError(exec, scope, createRangeError(exec, "toExponential() argument must be between 0 and 20"_s));
@@ -435,7 +435,7 @@
isUndefined
? converter.ToExponential(x, -1, &builder)
: converter.ToExponential(x, decimalPlacesInExponent, &builder);
- return JSValue::encode(jsString(exec, builder.Finalize()));
+ return JSValue::encode(jsString(vm, builder.Finalize()));
}
// toFixed converts a number to a string, always formatting as an a decimal fraction.
@@ -463,13 +463,13 @@
// This also covers Ininity, and structure the check so that NaN
// values are also handled by numberToString
if (!(fabs(x) < 1e+21))
- return JSValue::encode(jsString(exec, String::number(x)));
+ return JSValue::encode(jsString(vm, String::number(x)));
// The check above will return false for NaN or Infinity, these will be
// handled by numberToString.
ASSERT(std::isfinite(x));
- return JSValue::encode(jsString(exec, String::numberToStringFixedWidth(x, decimalPlaces)));
+ return JSValue::encode(jsString(vm, String::numberToStringFixedWidth(x, decimalPlaces)));
}
// toPrecision converts a number to a string, taking an argument specifying a
@@ -496,16 +496,16 @@
// To precision called with no argument is treated as ToString.
if (isUndefined)
- return JSValue::encode(jsString(exec, String::number(x)));
+ return JSValue::encode(jsString(vm, String::number(x)));
// Handle NaN and Infinity.
if (!std::isfinite(x))
- return JSValue::encode(jsNontrivialString(exec, String::number(x)));
+ return JSValue::encode(jsNontrivialString(vm, String::number(x)));
if (!inRange)
return throwVMError(exec, scope, createRangeError(exec, "toPrecision() argument must be between 1 and 21"_s));
- return JSValue::encode(jsString(exec, String::numberToStringFixedPrecision(x, significantFigures, KeepTrailingZeros)));
+ return JSValue::encode(jsString(vm, String::numberToStringFixedPrecision(x, significantFigures, KeepTrailingZeros)));
}
static ALWAYS_INLINE JSString* int32ToStringInternal(VM& vm, int32_t value, int32_t radix)
@@ -519,9 +519,9 @@
}
if (radix == 10)
- return jsNontrivialString(&vm, vm.numericStrings.add(value));
+ return jsNontrivialString(vm, vm.numericStrings.add(value));
- return jsNontrivialString(&vm, toStringWithRadixInternal(value, radix));
+ return jsNontrivialString(vm, toStringWithRadixInternal(value, radix));
}
@@ -534,13 +534,13 @@
return int32ToStringInternal(vm, integerValue, radix);
if (radix == 10)
- return jsString(&vm, vm.numericStrings.add(doubleValue));
+ return jsString(vm, vm.numericStrings.add(doubleValue));
if (!std::isfinite(doubleValue))
- return jsNontrivialString(&vm, String::number(doubleValue));
+ return jsNontrivialString(vm, String::number(doubleValue));
RadixBuffer buffer;
- return jsString(&vm, toStringWithRadixInternal(buffer, doubleValue, radix));
+ return jsString(vm, toStringWithRadixInternal(buffer, doubleValue, radix));
}
JSString* int32ToString(VM& vm, int32_t value, int32_t radix)
@@ -559,7 +559,7 @@
}
if (radix == 10)
- return jsNontrivialString(&vm, vm.numericStrings.add(static_cast<double>(value)));
+ return jsNontrivialString(vm, vm.numericStrings.add(static_cast<double>(value)));
// Position the decimal point at the center of the string, set
// the startOfResultString pointer to point at the decimal point.
@@ -568,7 +568,7 @@
char* startOfResultString = decimalPoint;
*decimalPoint = '\0';
- return jsNontrivialString(&vm, int52ToStringWithRadix(startOfResultString, value, radix));
+ return jsNontrivialString(vm, int52ToStringWithRadix(startOfResultString, value, radix));
}
JSString* numberToString(VM& vm, double doubleValue, int32_t radix)
diff --git a/Source/JavaScriptCore/runtime/ObjectConstructor.cpp b/Source/JavaScriptCore/runtime/ObjectConstructor.cpp
index 472f110..884d9fff 100644
--- a/Source/JavaScriptCore/runtime/ObjectConstructor.cpp
+++ b/Source/JavaScriptCore/runtime/ObjectConstructor.cpp
@@ -1,6 +1,6 @@
/*
* Copyright (C) 1999-2000 Harri Porten (porten@kde.org)
- * Copyright (C) 2008-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2008-2019 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -204,7 +204,7 @@
{
VM& vm = exec->vm();
auto scope = DECLARE_THROW_SCOPE(vm);
- PropertyNameArray properties(&vm, PropertyNameMode::StringsAndSymbols, PrivateSymbolMode::Exclude);
+ PropertyNameArray properties(vm, PropertyNameMode::StringsAndSymbols, PrivateSymbolMode::Exclude);
object->methodTable(vm)->getOwnPropertyNames(object, exec, properties, EnumerationMode(DontEnumPropertiesMode::Include));
RETURN_IF_EXCEPTION(scope, { });
@@ -373,7 +373,7 @@
// For example, [[Get]] of source object could configure setter to target object. So disable the fast path.
targetCanPerformFastPut = false;
- PropertyNameArray properties(&vm, PropertyNameMode::StringsAndSymbols, PrivateSymbolMode::Exclude);
+ PropertyNameArray properties(vm, PropertyNameMode::StringsAndSymbols, PrivateSymbolMode::Exclude);
source->methodTable(vm)->getOwnPropertyNames(source, exec, properties, EnumerationMode(DontEnumPropertiesMode::Include));
RETURN_IF_EXCEPTION(scope, { });
@@ -440,7 +440,7 @@
JSArray* values = constructEmptyArray(exec, nullptr);
RETURN_IF_EXCEPTION(scope, { });
- PropertyNameArray properties(&vm, PropertyNameMode::Strings, PrivateSymbolMode::Exclude);
+ PropertyNameArray properties(vm, PropertyNameMode::Strings, PrivateSymbolMode::Exclude);
target->methodTable(vm)->getOwnPropertyNames(target, exec, properties, EnumerationMode(DontEnumPropertiesMode::Include));
RETURN_IF_EXCEPTION(scope, { });
@@ -600,7 +600,7 @@
VM& vm = exec->vm();
auto scope = DECLARE_THROW_SCOPE(vm);
- PropertyNameArray propertyNames(&vm, PropertyNameMode::StringsAndSymbols, PrivateSymbolMode::Exclude);
+ PropertyNameArray propertyNames(vm, PropertyNameMode::StringsAndSymbols, PrivateSymbolMode::Exclude);
asObject(properties)->methodTable(vm)->getOwnPropertyNames(asObject(properties), exec, propertyNames, EnumerationMode(DontEnumPropertiesMode::Exclude));
RETURN_IF_EXCEPTION(scope, { });
size_t numProperties = propertyNames.size();
@@ -691,7 +691,7 @@
if (UNLIKELY(!success))
return false;
- PropertyNameArray properties(&vm, PropertyNameMode::StringsAndSymbols, PrivateSymbolMode::Exclude);
+ PropertyNameArray properties(vm, PropertyNameMode::StringsAndSymbols, PrivateSymbolMode::Exclude);
object->methodTable(vm)->getOwnPropertyNames(object, exec, properties, EnumerationMode(DontEnumPropertiesMode::Include));
RETURN_IF_EXCEPTION(scope, false);
@@ -738,7 +738,7 @@
return false;
// 6. Let keys be ? O.[[OwnPropertyKeys]]().
- PropertyNameArray keys(&vm, PropertyNameMode::StringsAndSymbols, PrivateSymbolMode::Exclude);
+ PropertyNameArray keys(vm, PropertyNameMode::StringsAndSymbols, PrivateSymbolMode::Exclude);
object->methodTable(vm)->getOwnPropertyNames(object, exec, keys, EnumerationMode(DontEnumPropertiesMode::Include));
RETURN_IF_EXCEPTION(scope, { });
@@ -917,7 +917,7 @@
}
}
- PropertyNameArray properties(&vm, propertyNameMode, PrivateSymbolMode::Exclude);
+ PropertyNameArray properties(vm, propertyNameMode, PrivateSymbolMode::Exclude);
object->methodTable(vm)->getOwnPropertyNames(object, exec, properties, EnumerationMode(dontEnumPropertiesMode));
RETURN_IF_EXCEPTION(scope, nullptr);
@@ -935,7 +935,7 @@
for (size_t i = 0; i < numProperties; i++) {
const auto& identifier = properties[i];
ASSERT(!identifier.isSymbol());
- newButterfly->setIndex(vm, i, jsOwnedString(&vm, identifier.string()));
+ newButterfly->setIndex(vm, i, jsOwnedString(vm, identifier.string()));
}
structure->setCachedOwnKeys(vm, newButterfly);
@@ -955,7 +955,7 @@
const auto& identifier = properties[i];
if (propertyNameMode == PropertyNameMode::Strings) {
ASSERT(!identifier.isSymbol());
- buffer[i].set(vm, keys, jsOwnedString(&vm, identifier.string()));
+ buffer[i].set(vm, keys, jsOwnedString(vm, identifier.string()));
} else {
ASSERT(identifier.isSymbol());
buffer[i].set(vm, keys, Symbol::create(vm, static_cast<SymbolImpl&>(*identifier.impl())));
@@ -980,7 +980,7 @@
for (size_t i = 0; i < numProperties; i++) {
const auto& identifier = properties[i];
ASSERT(!identifier.isSymbol());
- pushDirect(exec, keys, jsOwnedString(exec, identifier.string()));
+ pushDirect(exec, keys, jsOwnedString(vm, identifier.string()));
RETURN_IF_EXCEPTION(scope, nullptr);
}
break;
@@ -1009,7 +1009,7 @@
continue;
}
- pushDirect(exec, keys, jsOwnedString(exec, identifier.string()));
+ pushDirect(exec, keys, jsOwnedString(vm, identifier.string()));
RETURN_IF_EXCEPTION(scope, nullptr);
}
diff --git a/Source/JavaScriptCore/runtime/ObjectPrototype.cpp b/Source/JavaScriptCore/runtime/ObjectPrototype.cpp
index a00fc5a..000866f 100644
--- a/Source/JavaScriptCore/runtime/ObjectPrototype.cpp
+++ b/Source/JavaScriptCore/runtime/ObjectPrototype.cpp
@@ -1,6 +1,6 @@
/*
* Copyright (C) 1999-2000 Harri Porten (porten@kde.org)
- * Copyright (C) 2008-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2008-2019 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -344,7 +344,7 @@
if (!newString)
return throwOutOfMemoryError(exec, scope);
- auto result = jsNontrivialString(&vm, newString);
+ auto result = jsNontrivialString(vm, newString);
thisObject->structure(vm)->setObjectToStringValue(exec, vm, result, toStringTagSlot);
return result;
})));
diff --git a/Source/JavaScriptCore/runtime/Operations.h b/Source/JavaScriptCore/runtime/Operations.h
index e3b17c0..ac98ce8 100644
--- a/Source/JavaScriptCore/runtime/Operations.h
+++ b/Source/JavaScriptCore/runtime/Operations.h
@@ -47,7 +47,7 @@
return s2;
unsigned length2 = s2->length();
if (!length2)
- return jsString(&vm, u1);
+ return jsString(vm, u1);
static_assert(JSString::MaxLength == std::numeric_limits<int32_t>::max(), "");
if (sumOverflows<int32_t>(length1, length2)) {
throwOutOfMemoryError(exec, scope);
@@ -60,7 +60,7 @@
// We conservatively consider the cost of u1. Currently, we are not considering about is8Bit() case because 16-bit
// strings are relatively rare. But we can do that if we need to consider it.
if (s2->isRope() || (StringImpl::headerSize<LChar>() + length1 + length2) >= sizeof(JSRopeString))
- return JSRopeString::create(vm, jsString(&vm, u1), s2);
+ return JSRopeString::create(vm, jsString(vm, u1), s2);
ASSERT(!s2->isRope());
const String& u2 = s2->value(exec);
@@ -80,7 +80,7 @@
unsigned length1 = s1->length();
if (!length1)
- return jsString(&vm, u2);
+ return jsString(vm, u2);
unsigned length2 = u2.length();
if (!length2)
return s1;
@@ -93,7 +93,7 @@
// (1) Cost of making JSString : sizeof(JSString) (for new string) + sizeof(StringImpl header) + length1 + length2
// (2) Cost of making JSRopeString: sizeof(JSString) (for u2) + sizeof(JSRopeString)
if (s1->isRope() || (StringImpl::headerSize<LChar>() + length1 + length2) >= sizeof(JSRopeString))
- return JSRopeString::create(vm, s1, jsString(&vm, u2));
+ return JSRopeString::create(vm, s1, jsString(vm, u2));
ASSERT(!s1->isRope());
const String& u1 = s1->value(exec);
@@ -159,10 +159,10 @@
unsigned length1 = u1.length();
if (!length1)
- return jsString(&vm, u2);
+ return jsString(vm, u2);
unsigned length2 = u2.length();
if (!length2)
- return jsString(&vm, u1);
+ return jsString(vm, u1);
static_assert(JSString::MaxLength == std::numeric_limits<int32_t>::max(), "");
if (sumOverflows<int32_t>(length1, length2)) {
throwOutOfMemoryError(exec, scope);
@@ -172,7 +172,7 @@
// (1) Cost of making JSString : sizeof(JSString) (for new string) + sizeof(StringImpl header) + length1 + length2
// (2) Cost of making JSRopeString: sizeof(JSString) (for u1) + sizeof(JSString) (for u2) + sizeof(JSRopeString)
if ((StringImpl::headerSize<LChar>() + length1 + length2) >= (sizeof(JSRopeString) + sizeof(JSString)))
- return JSRopeString::create(vm, jsString(&vm, u1), jsString(&vm, u2));
+ return JSRopeString::create(vm, jsString(vm, u1), jsString(vm, u2));
String newString = tryMakeString(u1, u2);
if (!newString) {
@@ -184,8 +184,8 @@
ALWAYS_INLINE JSString* jsString(ExecState* exec, const String& u1, const String& u2, const String& u3)
{
- VM* vm = &exec->vm();
- auto scope = DECLARE_THROW_SCOPE(*vm);
+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
unsigned length1 = u1.length();
unsigned length2 = u2.length();
@@ -212,21 +212,21 @@
// (1) Cost of making JSString : sizeof(JSString) (for new string) + sizeof(StringImpl header) + length1 + length2 + length3
// (2) Cost of making JSRopeString: sizeof(JSString) (for u1) + sizeof(JSString) (for u2) + sizeof(JSString) (for u3) + sizeof(JSRopeString)
if ((StringImpl::headerSize<LChar>() + length1 + length2 + length3) >= (sizeof(JSRopeString) + sizeof(JSString) * 2))
- return JSRopeString::create(*vm, jsString(vm, u1), jsString(vm, u2), jsString(vm, u3));
+ return JSRopeString::create(vm, jsString(vm, u1), jsString(vm, u2), jsString(vm, u3));
String newString = tryMakeString(u1, u2, u3);
if (!newString) {
throwOutOfMemoryError(exec, scope);
return nullptr;
}
- return JSString::create(*vm, newString.releaseImpl().releaseNonNull());
+ return JSString::create(vm, newString.releaseImpl().releaseNonNull());
}
ALWAYS_INLINE JSValue jsStringFromRegisterArray(ExecState* exec, Register* strings, unsigned count)
{
- VM* vm = &exec->vm();
- auto scope = DECLARE_THROW_SCOPE(*vm);
- JSRopeString::RopeBuilder<RecordOverflow> ropeBuilder(*vm);
+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+ JSRopeString::RopeBuilder<RecordOverflow> ropeBuilder(vm);
for (unsigned i = 0; i < count; ++i) {
JSValue v = strings[-static_cast<int>(i)].jsValue();
@@ -241,9 +241,9 @@
ALWAYS_INLINE JSValue jsStringFromArguments(ExecState* exec, JSValue thisValue)
{
- VM* vm = &exec->vm();
- auto scope = DECLARE_THROW_SCOPE(*vm);
- JSRopeString::RopeBuilder<RecordOverflow> ropeBuilder(*vm);
+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+ JSRopeString::RopeBuilder<RecordOverflow> ropeBuilder(vm);
JSString* str = thisValue.toString(exec);
RETURN_IF_EXCEPTION(scope, { });
ropeBuilder.append(str);
diff --git a/Source/JavaScriptCore/runtime/ProgramExecutable.cpp b/Source/JavaScriptCore/runtime/ProgramExecutable.cpp
index 234db8e..6d6f1cc 100644
--- a/Source/JavaScriptCore/runtime/ProgramExecutable.cpp
+++ b/Source/JavaScriptCore/runtime/ProgramExecutable.cpp
@@ -179,7 +179,7 @@
for (auto& entry : variableDeclarations) {
ASSERT(entry.value.isVar());
- globalObject->addVar(callFrame, Identifier::fromUid(&vm, entry.key.get()));
+ globalObject->addVar(callFrame, Identifier::fromUid(vm, entry.key.get()));
throwScope.assertNoException();
}
diff --git a/Source/JavaScriptCore/runtime/PromiseDeferredTimer.cpp b/Source/JavaScriptCore/runtime/PromiseDeferredTimer.cpp
index e63d31b..6a64431 100644
--- a/Source/JavaScriptCore/runtime/PromiseDeferredTimer.cpp
+++ b/Source/JavaScriptCore/runtime/PromiseDeferredTimer.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2017-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2017-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
@@ -39,7 +39,7 @@
}
PromiseDeferredTimer::PromiseDeferredTimer(VM& vm)
- : Base(&vm)
+ : Base(vm)
{
}
@@ -121,13 +121,13 @@
bool PromiseDeferredTimer::hasPendingPromise(JSPromiseDeferred* ticket)
{
- ASSERT(ticket->vm()->currentThreadIsHoldingAPILock());
+ ASSERT(ticket->vm().currentThreadIsHoldingAPILock());
return m_pendingPromises.contains(ticket);
}
bool PromiseDeferredTimer::hasDependancyInPendingPromise(JSPromiseDeferred* ticket, JSCell* dependency)
{
- ASSERT(ticket->vm()->currentThreadIsHoldingAPILock());
+ ASSERT(ticket->vm().currentThreadIsHoldingAPILock());
ASSERT(m_pendingPromises.contains(ticket));
auto result = m_pendingPromises.get(ticket);
@@ -136,7 +136,7 @@
bool PromiseDeferredTimer::cancelPendingPromise(JSPromiseDeferred* ticket)
{
- ASSERT(ticket->vm()->currentThreadIsHoldingAPILock());
+ ASSERT(ticket->vm().currentThreadIsHoldingAPILock());
bool result = m_pendingPromises.remove(ticket);
if (result)
diff --git a/Source/JavaScriptCore/runtime/PropertyNameArray.h b/Source/JavaScriptCore/runtime/PropertyNameArray.h
index 5e93b79..18fa4f9 100644
--- a/Source/JavaScriptCore/runtime/PropertyNameArray.h
+++ b/Source/JavaScriptCore/runtime/PropertyNameArray.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006, 2008, 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2006-2019 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -47,7 +47,7 @@
// FIXME: Rename to PropertyNameArrayBuilder.
class PropertyNameArray {
public:
- PropertyNameArray(VM* vm, PropertyNameMode propertyNameMode, PrivateSymbolMode privateSymbolMode)
+ PropertyNameArray(VM& vm, PropertyNameMode propertyNameMode, PrivateSymbolMode privateSymbolMode)
: m_data(PropertyNameArrayData::create())
, m_vm(vm)
, m_propertyNameMode(propertyNameMode)
@@ -55,7 +55,7 @@
{
}
- VM* vm() { return m_vm; }
+ VM& vm() { return m_vm; }
void add(uint32_t index)
{
@@ -91,7 +91,7 @@
RefPtr<PropertyNameArrayData> m_data;
HashSet<UniquedStringImpl*> m_set;
- VM* m_vm;
+ VM& m_vm;
PropertyNameMode m_propertyNameMode;
PrivateSymbolMode m_privateSymbolMode;
};
diff --git a/Source/JavaScriptCore/runtime/PropertySlot.h b/Source/JavaScriptCore/runtime/PropertySlot.h
index 2f2f90c..fb04b0a 100644
--- a/Source/JavaScriptCore/runtime/PropertySlot.h
+++ b/Source/JavaScriptCore/runtime/PropertySlot.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2005-2019 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -416,13 +416,14 @@
ALWAYS_INLINE JSValue PropertySlot::getValue(ExecState* exec, unsigned propertyName) const
{
+ VM& vm = exec->vm();
if (m_propertyType == TypeValue)
return JSValue::decode(m_data.value);
if (m_propertyType == TypeGetter)
return functionGetter(exec);
if (m_propertyType == TypeCustomAccessor)
- return customAccessorGetter(exec, Identifier::from(exec, propertyName));
- return customGetter(exec, Identifier::from(exec, propertyName));
+ return customAccessorGetter(exec, Identifier::from(vm, propertyName));
+ return customGetter(exec, Identifier::from(vm, propertyName));
}
} // namespace JSC
diff --git a/Source/JavaScriptCore/runtime/ProxyObject.cpp b/Source/JavaScriptCore/runtime/ProxyObject.cpp
index a0c4c0a..d045e5e 100644
--- a/Source/JavaScriptCore/runtime/ProxyObject.cpp
+++ b/Source/JavaScriptCore/runtime/ProxyObject.cpp
@@ -166,7 +166,7 @@
MarkedArgumentBuffer arguments;
arguments.append(target);
- arguments.append(identifierToSafePublicJSValue(vm, Identifier::fromUid(&vm, propertyName.uid())));
+ arguments.append(identifierToSafePublicJSValue(vm, Identifier::fromUid(vm, propertyName.uid())));
arguments.append(receiver);
ASSERT(!arguments.hasOverflowed());
JSValue trapResult = call(exec, getHandler, callType, callData, handler, arguments);
@@ -238,7 +238,7 @@
MarkedArgumentBuffer arguments;
arguments.append(target);
- arguments.append(identifierToSafePublicJSValue(vm, Identifier::fromUid(&vm, propertyName.uid())));
+ arguments.append(identifierToSafePublicJSValue(vm, Identifier::fromUid(vm, propertyName.uid())));
ASSERT(!arguments.hasOverflowed());
JSValue trapResult = call(exec, getOwnPropertyDescriptorMethod, callType, callData, handler, arguments);
RETURN_IF_EXCEPTION(scope, false);
@@ -347,7 +347,7 @@
MarkedArgumentBuffer arguments;
arguments.append(target);
- arguments.append(identifierToSafePublicJSValue(vm, Identifier::fromUid(&vm, propertyName.uid())));
+ arguments.append(identifierToSafePublicJSValue(vm, Identifier::fromUid(vm, propertyName.uid())));
ASSERT(!arguments.hasOverflowed());
JSValue trapResult = call(exec, hasMethod, callType, callData, handler, arguments);
RETURN_IF_EXCEPTION(scope, false);
@@ -413,8 +413,9 @@
bool ProxyObject::getOwnPropertySlotByIndex(JSObject* object, ExecState* exec, unsigned propertyName, PropertySlot& slot)
{
+ VM& vm = exec->vm();
ProxyObject* thisObject = jsCast<ProxyObject*>(object);
- Identifier ident = Identifier::from(exec, propertyName);
+ Identifier ident = Identifier::from(vm, propertyName);
return thisObject->getOwnPropertySlotCommon(exec, ident.impl(), slot);
}
@@ -450,7 +451,7 @@
MarkedArgumentBuffer arguments;
arguments.append(target);
- arguments.append(identifierToSafePublicJSValue(vm, Identifier::fromUid(&vm, propertyName.uid())));
+ arguments.append(identifierToSafePublicJSValue(vm, Identifier::fromUid(vm, propertyName.uid())));
arguments.append(putValue);
arguments.append(thisValue);
ASSERT(!arguments.hasOverflowed());
@@ -498,7 +499,7 @@
{
VM& vm = exec->vm();
auto scope = DECLARE_THROW_SCOPE(vm);
- Identifier ident = Identifier::from(exec, propertyName);
+ Identifier ident = Identifier::from(vm, propertyName);
RETURN_IF_EXCEPTION(scope, false);
auto performDefaultPut = [&] () {
JSObject* target = this->target();
@@ -653,7 +654,7 @@
MarkedArgumentBuffer arguments;
arguments.append(target);
- arguments.append(identifierToSafePublicJSValue(vm, Identifier::fromUid(&vm, propertyName.uid())));
+ arguments.append(identifierToSafePublicJSValue(vm, Identifier::fromUid(vm, propertyName.uid())));
ASSERT(!arguments.hasOverflowed());
JSValue trapResult = call(exec, deletePropertyMethod, callType, callData, handler, arguments);
RETURN_IF_EXCEPTION(scope, false);
@@ -697,11 +698,12 @@
bool ProxyObject::deletePropertyByIndex(JSCell* cell, ExecState* exec, unsigned propertyName)
{
+ VM& vm = exec->vm();
ProxyObject* thisObject = jsCast<ProxyObject*>(cell);
- Identifier ident = Identifier::from(exec, propertyName);
+ Identifier ident = Identifier::from(vm, propertyName);
auto performDefaultDelete = [&] () -> bool {
JSObject* target = thisObject->target();
- return target->methodTable(exec->vm())->deletePropertyByIndex(target, exec, propertyName);
+ return target->methodTable(vm)->deletePropertyByIndex(target, exec, propertyName);
};
return thisObject->performDelete(exec, ident.impl(), performDefaultDelete);
}
@@ -855,7 +857,7 @@
MarkedArgumentBuffer arguments;
arguments.append(target);
- arguments.append(identifierToSafePublicJSValue(vm, Identifier::fromUid(&vm, propertyName.uid())));
+ arguments.append(identifierToSafePublicJSValue(vm, Identifier::fromUid(vm, propertyName.uid())));
arguments.append(descriptorObject);
ASSERT(!arguments.hasOverflowed());
JSValue trapResult = call(exec, definePropertyMethod, callType, callData, handler, arguments);
@@ -952,7 +954,7 @@
JSValue arrayLikeObject = call(exec, ownKeysMethod, callType, callData, handler, arguments);
RETURN_IF_EXCEPTION(scope, void());
- PropertyNameArray trapResult(&vm, propertyNames.propertyNameMode(), propertyNames.privateSymbolMode());
+ PropertyNameArray trapResult(vm, propertyNames.propertyNameMode(), propertyNames.privateSymbolMode());
HashSet<UniquedStringImpl*> uncheckedResultKeys;
{
HashSet<RefPtr<UniquedStringImpl>> seenKeys;
@@ -1006,7 +1008,7 @@
bool targetIsExensible = target->isExtensible(exec);
RETURN_IF_EXCEPTION(scope, void());
- PropertyNameArray targetKeys(&vm, propertyNames.propertyNameMode(), propertyNames.privateSymbolMode());
+ PropertyNameArray targetKeys(vm, propertyNames.propertyNameMode(), propertyNames.privateSymbolMode());
target->methodTable(vm)->getOwnPropertyNames(target, exec, targetKeys, enumerationMode);
RETURN_IF_EXCEPTION(scope, void());
Vector<UniquedStringImpl*> targetConfigurableKeys;
diff --git a/Source/JavaScriptCore/runtime/RegExpGlobalData.cpp b/Source/JavaScriptCore/runtime/RegExpGlobalData.cpp
index 2ac6830..fa998a7 100644
--- a/Source/JavaScriptCore/runtime/RegExpGlobalData.cpp
+++ b/Source/JavaScriptCore/runtime/RegExpGlobalData.cpp
@@ -51,7 +51,7 @@
if (!result.isUndefined())
return result;
}
- return jsEmptyString(&vm);
+ return jsEmptyString(vm);
}
JSValue RegExpGlobalData::getLastParen(ExecState* exec, JSGlobalObject* owner)
@@ -70,7 +70,7 @@
if (!result.isUndefined())
return result;
}
- return jsEmptyString(&vm);
+ return jsEmptyString(vm);
}
JSValue RegExpGlobalData::getLeftContext(ExecState* exec, JSGlobalObject* owner)
diff --git a/Source/JavaScriptCore/runtime/RegExpMatchesArray.cpp b/Source/JavaScriptCore/runtime/RegExpMatchesArray.cpp
index 412e5f7..dce1f37 100644
--- a/Source/JavaScriptCore/runtime/RegExpMatchesArray.cpp
+++ b/Source/JavaScriptCore/runtime/RegExpMatchesArray.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-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
@@ -47,7 +47,7 @@
// https://bugs.webkit.org/show_bug.cgi?id=169786
RELEASE_ASSERT(array);
- array->initializeIndexWithoutBarrier(scope, 0, jsEmptyString(&vm));
+ array->initializeIndexWithoutBarrier(scope, 0, jsEmptyString(vm));
if (unsigned numSubpatterns = regExp->numSubpatterns()) {
for (unsigned i = 1; i <= numSubpatterns; ++i)
@@ -58,7 +58,7 @@
array = tryCreateUninitializedRegExpMatchesArray(scope, &deferralContext, globalObject->regExpMatchesArrayStructure(), regExp->numSubpatterns() + 1);
RELEASE_ASSERT(array);
- array->initializeIndexWithoutBarrier(scope, 0, jsEmptyString(&vm), ArrayWithContiguous);
+ array->initializeIndexWithoutBarrier(scope, 0, jsEmptyString(vm), ArrayWithContiguous);
if (unsigned numSubpatterns = regExp->numSubpatterns()) {
for (unsigned i = 1; i <= numSubpatterns; ++i)
diff --git a/Source/JavaScriptCore/runtime/RegExpMatchesArray.h b/Source/JavaScriptCore/runtime/RegExpMatchesArray.h
index 02a9e3a..e0913d5 100644
--- a/Source/JavaScriptCore/runtime/RegExpMatchesArray.h
+++ b/Source/JavaScriptCore/runtime/RegExpMatchesArray.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2018 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2008-2019 Apple Inc. All Rights Reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -159,7 +159,7 @@
for (unsigned i = 1; i <= numSubpatterns; ++i) {
String groupName = regExp->getCaptureGroupName(i);
if (!groupName.isEmpty())
- groups->putDirect(vm, Identifier::fromString(&vm, groupName), array->getIndexQuickly(i));
+ groups->putDirect(vm, Identifier::fromString(vm, groupName), array->getIndexQuickly(i));
}
}
return array;
diff --git a/Source/JavaScriptCore/runtime/RegExpPrototype.cpp b/Source/JavaScriptCore/runtime/RegExpPrototype.cpp
index ed8049b..8d0e5a9 100644
--- a/Source/JavaScriptCore/runtime/RegExpPrototype.cpp
+++ b/Source/JavaScriptCore/runtime/RegExpPrototype.cpp
@@ -1,6 +1,6 @@
/*
* Copyright (C) 1999-2000 Harri Porten (porten@kde.org)
- * Copyright (C) 2003-2017 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2003-2019 Apple Inc. All Rights Reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -344,7 +344,7 @@
auto flags = flagsString(exec, asObject(thisValue));
RETURN_IF_EXCEPTION(scope, encodedJSValue());
- return JSValue::encode(jsString(exec, flags.data()));
+ return JSValue::encode(jsString(vm, flags.data()));
}
template <typename CharacterType>
@@ -375,6 +375,7 @@
template <typename CharacterType>
static inline JSValue regExpProtoGetterSourceInternal(ExecState* exec, const String& pattern, const CharacterType* characters, unsigned length)
{
+ VM& vm = exec->vm();
bool previousCharacterWasBackslash = false;
bool inBrackets = false;
bool shouldEscape = false;
@@ -385,7 +386,7 @@
// source cannot ever validly be "". If the source is empty, return a different Pattern
// that would match the same thing.
if (!length)
- return jsNontrivialString(exec, "(?:)"_s);
+ return jsNontrivialString(vm, "(?:)"_s);
// early return for strings that don't contain a forwards slash and LineTerminator
for (unsigned i = 0; i < length; ++i) {
@@ -416,7 +417,7 @@
}
if (!shouldEscape)
- return jsString(exec, pattern);
+ return jsString(vm, pattern);
previousCharacterWasBackslash = false;
inBrackets = false;
@@ -450,7 +451,7 @@
previousCharacterWasBackslash = ch == '\\';
}
- return jsString(exec, result.toString());
+ return jsString(vm, result.toString());
}
EncodedJSValue JSC_HOST_CALL regExpProtoGetterSource(ExecState* exec)
@@ -462,7 +463,7 @@
auto* regexp = jsDynamicCast<RegExpObject*>(vm, thisValue);
if (UNLIKELY(!regexp)) {
if (thisValue.inherits<RegExpPrototype>(vm))
- return JSValue::encode(jsString(exec, "(?:)"_s));
+ return JSValue::encode(jsString(vm, "(?:)"_s));
return throwVMTypeError(exec, scope, "The RegExp.prototype.source getter can only be called on a RegExp object"_s);
}
diff --git a/Source/JavaScriptCore/runtime/RegExpStringIteratorPrototype.cpp b/Source/JavaScriptCore/runtime/RegExpStringIteratorPrototype.cpp
index 315e177..6cd4d0a 100644
--- a/Source/JavaScriptCore/runtime/RegExpStringIteratorPrototype.cpp
+++ b/Source/JavaScriptCore/runtime/RegExpStringIteratorPrototype.cpp
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2019 Alexey Shvayka <shvaikalesh@gmail.com>.
+ * 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
@@ -43,7 +44,7 @@
{
Base::finishCreation(vm);
ASSERT(inherits(vm, info()));
- putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(&vm, "RegExp String Iterator"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
+ putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(vm, "RegExp String Iterator"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
JSC_BUILTIN_FUNCTION_WITHOUT_TRANSITION(vm.propertyNames->next, regExpStringIteratorPrototypeNextCodeGenerator, static_cast<unsigned>(PropertyAttribute::DontEnum));
}
diff --git a/Source/JavaScriptCore/runtime/SamplingProfiler.cpp b/Source/JavaScriptCore/runtime/SamplingProfiler.cpp
index 2205519..3d1067c 100644
--- a/Source/JavaScriptCore/runtime/SamplingProfiler.cpp
+++ b/Source/JavaScriptCore/runtime/SamplingProfiler.cpp
@@ -549,7 +549,7 @@
};
if (calleeCell->type() != JSFunctionType) {
- if (JSObject* object = jsDynamicCast<JSObject*>(*calleeCell->vm(), calleeCell))
+ if (JSObject* object = jsDynamicCast<JSObject*>(calleeCell->vm(), calleeCell))
addCallee(object);
if (!alreadyHasExecutable)
diff --git a/Source/JavaScriptCore/runtime/ScriptExecutable.cpp b/Source/JavaScriptCore/runtime/ScriptExecutable.cpp
index ee6e18c..d30c4aa 100644
--- a/Source/JavaScriptCore/runtime/ScriptExecutable.cpp
+++ b/Source/JavaScriptCore/runtime/ScriptExecutable.cpp
@@ -113,7 +113,7 @@
void ScriptExecutable::installCode(CodeBlock* codeBlock)
{
- installCode(*codeBlock->vm(), codeBlock, codeBlock->codeType(), codeBlock->specializationKind());
+ installCode(codeBlock->vm(), codeBlock, codeBlock->codeType(), codeBlock->specializationKind());
}
void ScriptExecutable::installCode(VM& vm, CodeBlock* genericCodeBlock, CodeType codeType, CodeSpecializationKind kind)
@@ -249,16 +249,16 @@
CodeBlock* ScriptExecutable::newCodeBlockFor(
CodeSpecializationKind kind, JSFunction* function, JSScope* scope, Exception*& exception)
{
- VM* vm = scope->vm();
- auto throwScope = DECLARE_THROW_SCOPE(*vm);
+ VM& vm = scope->vm();
+ auto throwScope = DECLARE_THROW_SCOPE(vm);
- ASSERT(vm->heap.isDeferred());
+ ASSERT(vm.heap.isDeferred());
ASSERT(endColumn() != UINT_MAX);
- JSGlobalObject* globalObject = scope->globalObject(*vm);
+ JSGlobalObject* globalObject = scope->globalObject(vm);
ExecState* exec = globalObject->globalExec();
- if (classInfo(*vm) == EvalExecutable::info()) {
+ if (classInfo(vm) == EvalExecutable::info()) {
EvalExecutable* executable = jsCast<EvalExecutable*>(this);
RELEASE_ASSERT(kind == CodeForCall);
RELEASE_ASSERT(!executable->m_evalCodeBlock);
@@ -275,7 +275,7 @@
return codeBlock;
}
- if (classInfo(*vm) == ProgramExecutable::info()) {
+ if (classInfo(vm) == ProgramExecutable::info()) {
ProgramExecutable* executable = jsCast<ProgramExecutable*>(this);
RELEASE_ASSERT(kind == CodeForCall);
RELEASE_ASSERT(!executable->m_programCodeBlock);
@@ -292,7 +292,7 @@
return codeBlock;
}
- if (classInfo(*vm) == ModuleProgramExecutable::info()) {
+ if (classInfo(vm) == ModuleProgramExecutable::info()) {
ModuleProgramExecutable* executable = jsCast<ModuleProgramExecutable*>(this);
RELEASE_ASSERT(kind == CodeForCall);
RELEASE_ASSERT(!executable->m_moduleProgramCodeBlock);
@@ -309,7 +309,7 @@
return codeBlock;
}
- RELEASE_ASSERT(classInfo(*vm) == FunctionExecutable::info());
+ RELEASE_ASSERT(classInfo(vm) == FunctionExecutable::info());
RELEASE_ASSERT(function);
FunctionExecutable* executable = jsCast<FunctionExecutable*>(this);
RELEASE_ASSERT(!executable->codeBlockFor(kind));
@@ -326,7 +326,7 @@
}
UnlinkedFunctionCodeBlock* unlinkedCodeBlock =
executable->m_unlinkedExecutable->unlinkedCodeBlockFor(
- *vm, executable->source(), kind, codeGenerationMode, error,
+ vm, executable->source(), kind, codeGenerationMode, error,
executable->parseMode());
recordParse(
executable->m_unlinkedExecutable->features(),
@@ -345,13 +345,13 @@
CodeBlock* ScriptExecutable::newReplacementCodeBlockFor(
CodeSpecializationKind kind)
{
- VM& vm = *this->vm();
+ VM& vm = this->vm();
if (classInfo(vm) == EvalExecutable::info()) {
RELEASE_ASSERT(kind == CodeForCall);
EvalExecutable* executable = jsCast<EvalExecutable*>(this);
EvalCodeBlock* baseline = static_cast<EvalCodeBlock*>(
executable->codeBlock()->baselineVersion());
- EvalCodeBlock* result = EvalCodeBlock::create(&vm,
+ EvalCodeBlock* result = EvalCodeBlock::create(vm,
CodeBlock::CopyParsedBlock, *baseline);
result->setAlternative(vm, baseline);
return result;
@@ -362,7 +362,7 @@
ProgramExecutable* executable = jsCast<ProgramExecutable*>(this);
ProgramCodeBlock* baseline = static_cast<ProgramCodeBlock*>(
executable->codeBlock()->baselineVersion());
- ProgramCodeBlock* result = ProgramCodeBlock::create(&vm,
+ ProgramCodeBlock* result = ProgramCodeBlock::create(vm,
CodeBlock::CopyParsedBlock, *baseline);
result->setAlternative(vm, baseline);
return result;
@@ -373,7 +373,7 @@
ModuleProgramExecutable* executable = jsCast<ModuleProgramExecutable*>(this);
ModuleProgramCodeBlock* baseline = static_cast<ModuleProgramCodeBlock*>(
executable->codeBlock()->baselineVersion());
- ModuleProgramCodeBlock* result = ModuleProgramCodeBlock::create(&vm,
+ ModuleProgramCodeBlock* result = ModuleProgramCodeBlock::create(vm,
CodeBlock::CopyParsedBlock, *baseline);
result->setAlternative(vm, baseline);
return result;
@@ -383,7 +383,7 @@
FunctionExecutable* executable = jsCast<FunctionExecutable*>(this);
FunctionCodeBlock* baseline = static_cast<FunctionCodeBlock*>(
executable->codeBlockFor(kind)->baselineVersion());
- FunctionCodeBlock* result = FunctionCodeBlock::create(&vm,
+ FunctionCodeBlock* result = FunctionCodeBlock::create(vm,
CodeBlock::CopyParsedBlock, *baseline);
result->setAlternative(vm, baseline);
return result;
@@ -397,7 +397,7 @@
static void setupJIT(VM& vm, CodeBlock* codeBlock)
{
#if ENABLE(JIT)
- CompilationResult result = JIT::compile(&vm, codeBlock, JITCompilationMustSucceed);
+ CompilationResult result = JIT::compile(vm, codeBlock, JITCompilationMustSucceed);
RELEASE_ASSERT(result == CompilationSuccessful);
#else
UNUSED_PARAM(vm);
diff --git a/Source/JavaScriptCore/runtime/SetIteratorPrototype.cpp b/Source/JavaScriptCore/runtime/SetIteratorPrototype.cpp
index c4ddce3..17cfdcb 100644
--- a/Source/JavaScriptCore/runtime/SetIteratorPrototype.cpp
+++ b/Source/JavaScriptCore/runtime/SetIteratorPrototype.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013, 2016 Apple, Inc. All rights reserved.
+ * Copyright (C) 2013-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
@@ -39,7 +39,7 @@
ASSERT(inherits(vm, info()));
JSC_BUILTIN_FUNCTION_WITHOUT_TRANSITION("next", setIteratorPrototypeNextCodeGenerator, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(&vm, "Set Iterator"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
+ putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(vm, "Set Iterator"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
}
}
diff --git a/Source/JavaScriptCore/runtime/SetPrototype.cpp b/Source/JavaScriptCore/runtime/SetPrototype.cpp
index cd2f071..46f4bcd 100644
--- a/Source/JavaScriptCore/runtime/SetPrototype.cpp
+++ b/Source/JavaScriptCore/runtime/SetPrototype.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013, 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-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
@@ -71,7 +71,7 @@
putDirectWithoutTransition(vm, vm.propertyNames->builtinNames().valuesPublicName(), values, static_cast<unsigned>(PropertyAttribute::DontEnum));
putDirectWithoutTransition(vm, vm.propertyNames->builtinNames().keysPublicName(), values, static_cast<unsigned>(PropertyAttribute::DontEnum));
putDirectWithoutTransition(vm, vm.propertyNames->iteratorSymbol, values, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(&vm, "Set"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
+ putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(vm, "Set"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
JSC_NATIVE_GETTER_WITHOUT_TRANSITION(vm.propertyNames->size, setProtoFuncSize, PropertyAttribute::DontEnum | PropertyAttribute::Accessor);
}
diff --git a/Source/JavaScriptCore/runtime/StackFrame.cpp b/Source/JavaScriptCore/runtime/StackFrame.cpp
index 94b7dc4..24ea0ec 100644
--- a/Source/JavaScriptCore/runtime/StackFrame.cpp
+++ b/Source/JavaScriptCore/runtime/StackFrame.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-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
@@ -114,7 +114,7 @@
m_codeBlock->expressionRangeForBytecodeOffset(m_bytecodeOffset, divot, unusedStartOffset, unusedEndOffset, line, column);
ScriptExecutable* executable = m_codeBlock->ownerExecutable();
- if (Optional<int> overrideLineNumber = executable->overrideLineNumber(*m_codeBlock->vm()))
+ if (Optional<int> overrideLineNumber = executable->overrideLineNumber(m_codeBlock->vm()))
line = overrideLineNumber.value();
}
diff --git a/Source/JavaScriptCore/runtime/StringConstructor.cpp b/Source/JavaScriptCore/runtime/StringConstructor.cpp
index 5557374..62c422c 100644
--- a/Source/JavaScriptCore/runtime/StringConstructor.cpp
+++ b/Source/JavaScriptCore/runtime/StringConstructor.cpp
@@ -1,6 +1,6 @@
/*
* Copyright (C) 1999-2001 Harri Porten (porten@kde.org)
- * Copyright (C) 2004-2008, 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2004-2019 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -80,7 +80,7 @@
scope.release();
unsigned code = exec->uncheckedArgument(0).toUInt32(exec);
// Not checking for an exception here is ok because jsSingleCharacterString will just fetch an unused string if there's an exception.
- return JSValue::encode(jsSingleCharacterString(exec, code));
+ return JSValue::encode(jsSingleCharacterString(vm, code));
}
LChar* buf8Bit;
@@ -98,16 +98,16 @@
buf16Bit[i] = static_cast<UChar>(exec->uncheckedArgument(i).toUInt32(exec));
RETURN_IF_EXCEPTION(scope, encodedJSValue());
}
- RELEASE_AND_RETURN(scope, JSValue::encode(jsString(exec, WTFMove(impl16Bit))));
+ RELEASE_AND_RETURN(scope, JSValue::encode(jsString(vm, WTFMove(impl16Bit))));
}
buf8Bit[i] = static_cast<LChar>(character);
}
- RELEASE_AND_RETURN(scope, JSValue::encode(jsString(exec, WTFMove(impl8Bit))));
+ RELEASE_AND_RETURN(scope, JSValue::encode(jsString(vm, WTFMove(impl8Bit))));
}
JSString* JSC_HOST_CALL stringFromCharCode(ExecState* exec, int32_t arg)
{
- return jsSingleCharacterString(exec, arg);
+ return jsSingleCharacterString(exec->vm(), arg);
}
static EncodedJSValue JSC_HOST_CALL stringFromCodePoint(ExecState* exec)
@@ -136,7 +136,7 @@
}
}
- RELEASE_AND_RETURN(scope, JSValue::encode(jsString(exec, builder.toString())));
+ RELEASE_AND_RETURN(scope, JSValue::encode(jsString(vm, builder.toString())));
}
static EncodedJSValue JSC_HOST_CALL constructWithStringConstructor(ExecState* exec)
@@ -157,15 +157,17 @@
JSString* stringConstructor(ExecState* exec, JSValue argument)
{
+ VM& vm = exec->vm();
if (argument.isSymbol())
- return jsNontrivialString(exec, asSymbol(argument)->descriptiveString());
+ return jsNontrivialString(vm, asSymbol(argument)->descriptiveString());
return argument.toString(exec);
}
static EncodedJSValue JSC_HOST_CALL callStringConstructor(ExecState* exec)
{
+ VM& vm = exec->vm();
if (!exec->argumentCount())
- return JSValue::encode(jsEmptyString(exec));
+ return JSValue::encode(jsEmptyString(vm));
return JSValue::encode(stringConstructor(exec, exec->uncheckedArgument(0)));
}
diff --git a/Source/JavaScriptCore/runtime/StringIteratorPrototype.cpp b/Source/JavaScriptCore/runtime/StringIteratorPrototype.cpp
index 622a789..59469c1 100644
--- a/Source/JavaScriptCore/runtime/StringIteratorPrototype.cpp
+++ b/Source/JavaScriptCore/runtime/StringIteratorPrototype.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013 Apple, Inc. All rights reserved.
+ * Copyright (C) 2013-2019 Apple, Inc. All rights reserved.
* Copyright (C) 2015 Yusuke Suzuki <utatane.tea@gmail.com>.
*
* Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,7 @@
{
Base::finishCreation(vm);
ASSERT(inherits(vm, info()));
- putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(&vm, "String Iterator"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
+ putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(vm, "String Iterator"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
JSC_BUILTIN_FUNCTION_WITHOUT_TRANSITION(vm.propertyNames->next, stringIteratorPrototypeNextCodeGenerator, static_cast<unsigned>(PropertyAttribute::DontEnum));
}
diff --git a/Source/JavaScriptCore/runtime/StringObject.cpp b/Source/JavaScriptCore/runtime/StringObject.cpp
index 8c6ffa7..033f9e0 100644
--- a/Source/JavaScriptCore/runtime/StringObject.cpp
+++ b/Source/JavaScriptCore/runtime/StringObject.cpp
@@ -1,6 +1,6 @@
/*
* Copyright (C) 1999-2001 Harri Porten (porten@kde.org)
- * Copyright (C) 2004-2008, 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2004-2019 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -57,7 +57,8 @@
StringObject* thisObject = jsCast<StringObject*>(object);
if (thisObject->internalValue()->getStringPropertySlot(exec, propertyName, slot))
return true;
- return JSObject::getOwnPropertySlot(thisObject, exec, Identifier::from(exec, propertyName), slot);
+ VM& vm = exec->vm();
+ return JSObject::getOwnPropertySlot(thisObject, exec, Identifier::from(vm, propertyName), slot);
}
bool StringObject::put(JSCell* cell, ExecState* exec, PropertyName propertyName, JSValue value, PutPropertySlot& slot)
@@ -146,11 +147,12 @@
void StringObject::getOwnPropertyNames(JSObject* object, ExecState* exec, PropertyNameArray& propertyNames, EnumerationMode mode)
{
+ VM& vm = exec->vm();
StringObject* thisObject = jsCast<StringObject*>(object);
if (propertyNames.includeStringProperties()) {
int size = thisObject->internalValue()->length();
for (int i = 0; i < size; ++i)
- propertyNames.add(Identifier::from(exec, i));
+ propertyNames.add(Identifier::from(vm, i));
}
return JSObject::getOwnPropertyNames(thisObject, exec, propertyNames, mode);
}
diff --git a/Source/JavaScriptCore/runtime/StringObject.h b/Source/JavaScriptCore/runtime/StringObject.h
index 6f2b909..5ceed89 100644
--- a/Source/JavaScriptCore/runtime/StringObject.h
+++ b/Source/JavaScriptCore/runtime/StringObject.h
@@ -1,6 +1,6 @@
/*
* Copyright (C) 1999-2000 Harri Porten (porten@kde.org)
- * Copyright (C) 2007-2008, 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2007-2019 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -32,7 +32,7 @@
static StringObject* create(VM& vm, Structure* structure)
{
- JSString* string = jsEmptyString(&vm);
+ JSString* string = jsEmptyString(vm);
StringObject* object = new (NotNull, allocateCell<StringObject>(vm.heap)) StringObject(vm, structure);
object->finishCreation(vm, string);
return object;
@@ -85,7 +85,7 @@
ASSERT(asString(originalValue)->value(exec) == string);
return asString(originalValue);
}
- return jsString(&exec->vm(), string);
+ return jsString(exec->vm(), string);
}
// Helper that tries to use the JSString substring sharing mechanism if 'originalValue' is a JSString.
@@ -99,7 +99,7 @@
ASSERT(asString(originalValue)->value(exec) == string);
return jsSubstring(exec, asString(originalValue), offset, length);
}
- return jsSubstring(&exec->vm(), string, offset, length);
+ return jsSubstring(exec->vm(), string, offset, length);
}
} // namespace JSC
diff --git a/Source/JavaScriptCore/runtime/StringPrototype.cpp b/Source/JavaScriptCore/runtime/StringPrototype.cpp
index c1766ba..1681996 100644
--- a/Source/JavaScriptCore/runtime/StringPrototype.cpp
+++ b/Source/JavaScriptCore/runtime/StringPrototype.cpp
@@ -163,10 +163,10 @@
JSFunction* trimStartFunction = JSFunction::create(vm, globalObject, 0, "trimStart"_s, stringProtoFuncTrimStart, NoIntrinsic);
JSFunction* trimEndFunction = JSFunction::create(vm, globalObject, 0, "trimEnd"_s, stringProtoFuncTrimEnd, NoIntrinsic);
- putDirectWithoutTransition(vm, Identifier::fromString(&vm, "trimStart"), trimStartFunction, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectWithoutTransition(vm, Identifier::fromString(&vm, "trimLeft"), trimStartFunction, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectWithoutTransition(vm, Identifier::fromString(&vm, "trimEnd"), trimEndFunction, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectWithoutTransition(vm, Identifier::fromString(&vm, "trimRight"), trimEndFunction, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectWithoutTransition(vm, Identifier::fromString(vm, "trimStart"), trimStartFunction, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectWithoutTransition(vm, Identifier::fromString(vm, "trimLeft"), trimStartFunction, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectWithoutTransition(vm, Identifier::fromString(vm, "trimEnd"), trimEndFunction, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectWithoutTransition(vm, Identifier::fromString(vm, "trimRight"), trimEndFunction, static_cast<unsigned>(PropertyAttribute::DontEnum));
JSFunction* iteratorFunction = JSFunction::create(vm, globalObject, 0, "[Symbol.iterator]"_s, stringProtoFuncIterator, NoIntrinsic);
putDirectWithoutTransition(vm, vm.propertyNames->iteratorSymbol, iteratorFunction, static_cast<unsigned>(PropertyAttribute::DontEnum));
@@ -177,7 +177,7 @@
StringPrototype* StringPrototype::create(VM& vm, JSGlobalObject* globalObject, Structure* structure)
{
- JSString* empty = jsEmptyString(&vm);
+ JSString* empty = jsEmptyString(vm);
StringPrototype* prototype = new (NotNull, allocateCell<StringPrototype>(vm.heap)) StringPrototype(vm, structure);
prototype->finishCreation(vm, globalObject, empty);
return prototype;
@@ -323,7 +323,7 @@
if (position <= 0 && length >= sourceSize)
return sourceVal;
// We could call String::substringSharingImpl(), but this would result in redundant checks.
- RELEASE_AND_RETURN(scope, jsString(exec, StringImpl::createSubstringSharingImpl(*source.impl(), std::max(0, position), std::min(sourceSize, length))));
+ RELEASE_AND_RETURN(scope, jsString(vm, StringImpl::createSubstringSharingImpl(*source.impl(), std::max(0, position), std::min(sourceSize, length))));
}
// We know that the sum of substringRanges lengths cannot exceed length of
@@ -336,7 +336,7 @@
ASSERT(totalLength <= String::MaxLength);
if (!totalLength)
- return jsEmptyString(exec);
+ return jsEmptyString(vm);
if (source.is8Bit()) {
LChar* buffer;
@@ -355,7 +355,7 @@
}
}
- RELEASE_AND_RETURN(scope, jsString(exec, WTFMove(impl)));
+ RELEASE_AND_RETURN(scope, jsString(vm, WTFMove(impl)));
}
UChar* buffer;
@@ -375,7 +375,7 @@
}
}
- RELEASE_AND_RETURN(scope, jsString(exec, WTFMove(impl)));
+ RELEASE_AND_RETURN(scope, jsString(vm, WTFMove(impl)));
}
static ALWAYS_INLINE JSString* jsSpliceSubstringsWithSeparators(ExecState* exec, JSString* sourceVal, const String& source, const StringRange* substringRanges, int rangeCount, const String* separators, int separatorCount)
@@ -390,7 +390,7 @@
if (position <= 0 && length >= sourceSize)
return sourceVal;
// We could call String::substringSharingImpl(), but this would result in redundant checks.
- RELEASE_AND_RETURN(scope, jsString(exec, StringImpl::createSubstringSharingImpl(*source.impl(), std::max(0, position), std::min(sourceSize, length))));
+ RELEASE_AND_RETURN(scope, jsString(vm, StringImpl::createSubstringSharingImpl(*source.impl(), std::max(0, position), std::min(sourceSize, length))));
}
Checked<int, RecordOverflow> totalLength = 0;
@@ -408,7 +408,7 @@
}
if (!totalLength)
- return jsEmptyString(exec);
+ return jsEmptyString(vm);
if (source.is8Bit() && allSeparators8Bit) {
LChar* buffer;
@@ -437,7 +437,7 @@
}
}
- RELEASE_AND_RETURN(scope, jsString(exec, WTFMove(impl)));
+ RELEASE_AND_RETURN(scope, jsString(vm, WTFMove(impl)));
}
UChar* buffer;
@@ -470,7 +470,7 @@
}
}
- RELEASE_AND_RETURN(scope, jsString(exec, WTFMove(impl)));
+ RELEASE_AND_RETURN(scope, jsString(vm, WTFMove(impl)));
}
#define OUT_OF_MEMORY(exec__, scope__) \
@@ -593,14 +593,14 @@
if (matchStart < 0)
patternValue = jsUndefined();
else
- patternValue = jsSubstring(&vm, source, matchStart, matchLen);
+ patternValue = jsSubstring(vm, source, matchStart, matchLen);
cachedCall.appendArgument(patternValue);
if (i && hasNamedCaptures) {
String groupName = regExp->getCaptureGroupName(i);
if (!groupName.isEmpty())
- groups->putDirect(vm, Identifier::fromString(&vm, groupName), patternValue);
+ groups->putDirect(vm, Identifier::fromString(vm, groupName), patternValue);
}
}
@@ -659,7 +659,7 @@
if (matchStart < 0)
patternValue = jsUndefined();
else {
- patternValue = jsSubstring(&vm, source, matchStart, matchLen);
+ patternValue = jsSubstring(vm, source, matchStart, matchLen);
RETURN_IF_EXCEPTION(scope, nullptr);
}
@@ -668,7 +668,7 @@
if (i && hasNamedCaptures) {
String groupName = regExp->getCaptureGroupName(i);
if (!groupName.isEmpty())
- groups->putDirect(vm, Identifier::fromString(&vm, groupName), patternValue);
+ groups->putDirect(vm, Identifier::fromString(vm, groupName), patternValue);
}
}
@@ -731,7 +731,7 @@
ExecState* exec, JSString* thisValue, RegExpObject* searchValue)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
RegExp* regExp = searchValue->regExp();
@@ -754,7 +754,7 @@
ExecState* exec, JSString* thisValue, RegExpObject* searchValue, JSString* replaceString)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
CallData callData;
@@ -798,7 +798,7 @@
CallType callType = getCallData(vm, replaceValue, callData);
if (callType != CallType::None) {
MarkedArgumentBuffer args;
- auto* substring = jsSubstring(&vm, string, matchStart, searchString.impl()->length());
+ auto* substring = jsSubstring(vm, string, matchStart, searchString.impl()->length());
RETURN_IF_EXCEPTION(scope, nullptr);
args.append(substring);
args.append(jsNumber(matchStart));
@@ -933,7 +933,7 @@
EncodedJSValue replaceValue)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return replace(
vm, exec, JSValue::decode(thisValue), JSValue::decode(searchValue),
@@ -974,14 +974,14 @@
if (a0.isUInt32()) {
uint32_t i = a0.asUInt32();
if (i < view.length())
- return JSValue::encode(jsSingleCharacterString(exec, view[i]));
- return JSValue::encode(jsEmptyString(exec));
+ return JSValue::encode(jsSingleCharacterString(vm, view[i]));
+ return JSValue::encode(jsEmptyString(vm));
}
double dpos = a0.toInteger(exec);
RETURN_IF_EXCEPTION(scope, encodedJSValue());
if (dpos >= 0 && dpos < view.length())
- return JSValue::encode(jsSingleCharacterString(exec, view[static_cast<unsigned>(dpos)]));
- return JSValue::encode(jsEmptyString(exec));
+ return JSValue::encode(jsSingleCharacterString(vm, view[static_cast<unsigned>(dpos)]));
+ return JSValue::encode(jsEmptyString(vm));
}
EncodedJSValue JSC_HOST_CALL stringProtoFuncCharCodeAt(ExecState* exec)
@@ -1270,7 +1270,7 @@
ASSERT(limit);
do {
- result->putDirectIndex(exec, position, jsSingleCharacterString(exec, input[position]));
+ result->putDirectIndex(exec, position, jsSingleCharacterString(vm, input[position]));
RETURN_IF_EXCEPTION(scope, encodedJSValue());
} while (++position < limit);
@@ -1366,7 +1366,7 @@
double length = a1.isUndefined() ? len : a1.toInteger(exec);
RETURN_IF_EXCEPTION(scope, encodedJSValue());
if (start >= len || length <= 0)
- return JSValue::encode(jsEmptyString(exec));
+ return JSValue::encode(jsEmptyString(vm));
if (start < 0) {
start += len;
if (start < 0)
@@ -1379,7 +1379,7 @@
scope.release();
if (jsString)
return JSValue::encode(jsSubstring(exec, jsString, substringStart, substringLength));
- return JSValue::encode(jsSubstring(&vm, uString, substringStart, substringLength));
+ return JSValue::encode(jsSubstring(vm, uString, substringStart, substringLength));
}
EncodedJSValue JSC_HOST_CALL builtinStringSubstrInternal(ExecState* exec)
@@ -1455,7 +1455,7 @@
String lowercasedString = s.convertToLowercaseWithoutLocale();
if (lowercasedString.impl() == s.impl())
return JSValue::encode(sVal);
- RELEASE_AND_RETURN(scope, JSValue::encode(jsString(exec, lowercasedString)));
+ RELEASE_AND_RETURN(scope, JSValue::encode(jsString(vm, lowercasedString)));
}
EncodedJSValue JSC_HOST_CALL stringProtoFuncToUpperCase(ExecState* exec)
@@ -1473,7 +1473,7 @@
String uppercasedString = s.convertToUppercaseWithoutLocale();
if (uppercasedString.impl() == s.impl())
return JSValue::encode(sVal);
- RELEASE_AND_RETURN(scope, JSValue::encode(jsString(exec, uppercasedString)));
+ RELEASE_AND_RETURN(scope, JSValue::encode(jsString(vm, uppercasedString)));
}
EncodedJSValue JSC_HOST_CALL stringProtoFuncLocaleCompare(ExecState* exec)
@@ -1601,7 +1601,7 @@
return throwVMTypeError(state, scope, u_errorName(error));
// 18. Return L.
- RELEASE_AND_RETURN(scope, JSValue::encode(jsString(state, lower)));
+ RELEASE_AND_RETURN(scope, JSValue::encode(jsString(vm, lower)));
}
EncodedJSValue JSC_HOST_CALL stringProtoFuncToLocaleLowerCase(ExecState* state)
@@ -1650,7 +1650,7 @@
if (left == 0 && right == str.length() && thisValue.isString())
return thisValue;
- RELEASE_AND_RETURN(scope, jsString(exec, str.substringSharingImpl(left, right - left)));
+ RELEASE_AND_RETURN(scope, jsString(vm, str.substringSharingImpl(left, right - left)));
}
EncodedJSValue JSC_HOST_CALL stringProtoFuncTrim(ExecState* exec)
@@ -1901,7 +1901,7 @@
unorm2_normalize(normalizer, characters, view.length(), buffer, normalizedStringLength, &status);
ASSERT(U_SUCCESS(status));
- RELEASE_AND_RETURN(scope, jsString(&vm, WTFMove(result)));
+ RELEASE_AND_RETURN(scope, jsString(vm, WTFMove(result)));
}
EncodedJSValue JSC_HOST_CALL stringProtoFuncNormalize(ExecState* exec)
diff --git a/Source/JavaScriptCore/runtime/StringPrototypeInlines.h b/Source/JavaScriptCore/runtime/StringPrototypeInlines.h
index c51d890..1a360e4 100644
--- a/Source/JavaScriptCore/runtime/StringPrototypeInlines.h
+++ b/Source/JavaScriptCore/runtime/StringPrototypeInlines.h
@@ -41,7 +41,7 @@
to = length;
return jsSubstring(vm, exec, string, static_cast<unsigned>(from), static_cast<unsigned>(to) - static_cast<unsigned>(from));
}
- return jsEmptyString(&vm);
+ return jsEmptyString(vm);
}
} // namespace JSC
diff --git a/Source/JavaScriptCore/runtime/StringRecursionChecker.cpp b/Source/JavaScriptCore/runtime/StringRecursionChecker.cpp
index 33e45a6..b36d241 100644
--- a/Source/JavaScriptCore/runtime/StringRecursionChecker.cpp
+++ b/Source/JavaScriptCore/runtime/StringRecursionChecker.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011-2012, 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2011-2019 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -35,7 +35,7 @@
JSValue StringRecursionChecker::emptyString()
{
- return jsEmptyString(m_exec);
+ return jsEmptyString(m_exec->vm());
}
}
diff --git a/Source/JavaScriptCore/runtime/Structure.cpp b/Source/JavaScriptCore/runtime/Structure.cpp
index 4ad6a92..39d3866 100644
--- a/Source/JavaScriptCore/runtime/Structure.cpp
+++ b/Source/JavaScriptCore/runtime/Structure.cpp
@@ -1026,9 +1026,9 @@
if (deferred) {
ASSERT(deferred->structure() == this);
- m_transitionWatchpointSet.fireAll(*vm(), deferred);
+ m_transitionWatchpointSet.fireAll(vm(), deferred);
} else
- m_transitionWatchpointSet.fireAll(*vm(), StructureFireDetail(this));
+ m_transitionWatchpointSet.fireAll(vm(), StructureFireDetail(this));
}
void Structure::visitChildren(JSCell* cell, SlotVisitor& visitor)
diff --git a/Source/JavaScriptCore/runtime/StructureInlines.h b/Source/JavaScriptCore/runtime/StructureInlines.h
index e3fcaef..5fab293 100644
--- a/Source/JavaScriptCore/runtime/StructureInlines.h
+++ b/Source/JavaScriptCore/runtime/StructureInlines.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-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
@@ -329,7 +329,7 @@
WatchpointSet* set = map->get(offset);
if (LIKELY(!set))
return;
- set->fireAll(*vm(), "Property did get replaced");
+ set->fireAll(vm(), "Property did get replaced");
}
inline WatchpointSet* Structure::propertyReplacementWatchpointSet(PropertyOffset offset)
@@ -559,7 +559,7 @@
if (a->storedPrototype() == b->storedPrototype())
return false;
- VM& vm = *a->vm();
+ VM& vm = a->vm();
JSObject* aObj = a->storedPrototypeObject();
JSObject* bObj = b->storedPrototypeObject();
while (aObj && bObj) {
diff --git a/Source/JavaScriptCore/runtime/SymbolConstructor.cpp b/Source/JavaScriptCore/runtime/SymbolConstructor.cpp
index 0bec27c..ed9fa80 100644
--- a/Source/JavaScriptCore/runtime/SymbolConstructor.cpp
+++ b/Source/JavaScriptCore/runtime/SymbolConstructor.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012, 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-2019 Apple Inc. All rights reserved.
* Copyright (C) 2015 Yusuke Suzuki <utatane.tea@gmail.com>.
*
* Redistribution and use in source and binary forms, with or without
@@ -64,7 +64,7 @@
}
#define INITIALIZE_WELL_KNOWN_SYMBOLS(name) \
-putDirectWithoutTransition(vm, Identifier::fromString(&vm, #name), Symbol::create(vm, static_cast<SymbolImpl&>(*vm.propertyNames->name##Symbol.impl())), PropertyAttribute::DontEnum | PropertyAttribute::DontDelete | PropertyAttribute::ReadOnly);
+putDirectWithoutTransition(vm, Identifier::fromString(vm, #name), Symbol::create(vm, static_cast<SymbolImpl&>(*vm.propertyNames->name##Symbol.impl())), PropertyAttribute::DontEnum | PropertyAttribute::DontDelete | PropertyAttribute::ReadOnly);
void SymbolConstructor::finishCreation(VM& vm, SymbolPrototype* prototype)
{
@@ -121,7 +121,7 @@
return JSValue::encode(jsUndefined());
ASSERT(uid.symbolRegistry() == &vm.symbolRegistry());
- return JSValue::encode(jsString(exec, &uid));
+ return JSValue::encode(jsString(vm, &uid));
}
} // namespace JSC
diff --git a/Source/JavaScriptCore/runtime/SymbolPrototype.cpp b/Source/JavaScriptCore/runtime/SymbolPrototype.cpp
index cb99945..42a07c6 100644
--- a/Source/JavaScriptCore/runtime/SymbolPrototype.cpp
+++ b/Source/JavaScriptCore/runtime/SymbolPrototype.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012, 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-2019 Apple Inc. All rights reserved.
* Copyright (C) 2015 Yusuke Suzuki <utatane.tea@gmail.com>.
*
* Redistribution and use in source and binary forms, with or without
@@ -62,7 +62,7 @@
void SymbolPrototype::finishCreation(VM& vm, JSGlobalObject* globalObject)
{
Base::finishCreation(vm);
- putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(&vm, "Symbol"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
+ putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(vm, "Symbol"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
ASSERT(inherits(vm, info()));
JSFunction* toPrimitiveFunction = JSFunction::create(vm, globalObject, 1, "[Symbol.toPrimitive]"_s, symbolProtoFuncValueOf, NoIntrinsic);
@@ -98,7 +98,7 @@
return throwVMTypeError(exec, scope, SymbolDescriptionTypeError);
scope.release();
const auto description = symbol->description();
- return JSValue::encode(description.isNull() ? jsUndefined() : jsString(&vm, description));
+ return JSValue::encode(description.isNull() ? jsUndefined() : jsString(vm, description));
}
EncodedJSValue JSC_HOST_CALL symbolProtoFuncToString(ExecState* exec)
@@ -109,7 +109,7 @@
Symbol* symbol = tryExtractSymbol(vm, exec->thisValue());
if (!symbol)
return throwVMTypeError(exec, scope, SymbolToStringTypeError);
- RELEASE_AND_RETURN(scope, JSValue::encode(jsNontrivialString(&vm, symbol->descriptiveString())));
+ RELEASE_AND_RETURN(scope, JSValue::encode(jsNontrivialString(vm, symbol->descriptiveString())));
}
EncodedJSValue JSC_HOST_CALL symbolProtoFuncValueOf(ExecState* exec)
diff --git a/Source/JavaScriptCore/runtime/SymbolTable.cpp b/Source/JavaScriptCore/runtime/SymbolTable.cpp
index a4a870f..b036377 100644
--- a/Source/JavaScriptCore/runtime/SymbolTable.cpp
+++ b/Source/JavaScriptCore/runtime/SymbolTable.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012, 2014, 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-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
@@ -213,7 +213,7 @@
m_rareData = makeUnique<SymbolTableRareData>();
ASSERT(!m_rareData->m_codeBlock);
- m_rareData->m_codeBlock.set(*codeBlock->vm(), this, codeBlock);
+ m_rareData->m_codeBlock.set(codeBlock->vm(), this, codeBlock);
}
GlobalVariableID SymbolTable::uniqueIDForVariable(const ConcurrentJSLocker&, UniquedStringImpl* key, VM& vm)
diff --git a/Source/JavaScriptCore/runtime/TestRunnerUtils.cpp b/Source/JavaScriptCore/runtime/TestRunnerUtils.cpp
index 34eeca7..e21eee3 100644
--- a/Source/JavaScriptCore/runtime/TestRunnerUtils.cpp
+++ b/Source/JavaScriptCore/runtime/TestRunnerUtils.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-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
@@ -38,7 +38,7 @@
if (!theFunctionValue.isCell())
return nullptr;
- VM& vm = *theFunctionValue.asCell()->vm();
+ VM& vm = theFunctionValue.asCell()->vm();
JSFunction* theFunction = jsDynamicCast<JSFunction*>(vm, theFunctionValue);
if (!theFunction)
return nullptr;
diff --git a/Source/JavaScriptCore/runtime/VM.cpp b/Source/JavaScriptCore/runtime/VM.cpp
index eb5d949..f852dd2 100644
--- a/Source/JavaScriptCore/runtime/VM.cpp
+++ b/Source/JavaScriptCore/runtime/VM.cpp
@@ -251,7 +251,7 @@
#if USE(CF)
, m_runLoop(CFRunLoopGetCurrent())
#endif // USE(CF)
- , heap(this, heapType)
+ , heap(*this, heapType)
, fastMallocAllocator(makeUnique<FastMallocAlignedMemoryAllocator>())
, primitiveGigacageAllocator(makeUnique<GigacageAlignedMemoryAllocator>(Gigacage::Primitive))
, jsValueGigacageAllocator(makeUnique<GigacageAlignedMemoryAllocator>(Gigacage::JSValue))
@@ -337,7 +337,7 @@
smallStrings.initializeCommonStrings(*this);
- propertyNames = new CommonIdentifiers(this);
+ propertyNames = new CommonIdentifiers(*this);
terminatedExecutionErrorStructure.set(*this, TerminatedExecutionError::createStructure(*this, 0, jsNull()));
propertyNameEnumeratorStructure.set(*this, JSPropertyNameEnumerator::createStructure(*this, 0, jsNull()));
customGetterSetterStructure.set(*this, CustomGetterSetter::createStructure(*this, 0, jsNull()));
@@ -703,7 +703,7 @@
#if ENABLE(JIT)
if (canUseJIT()) {
return jitStubs->hostFunctionStub(
- this, function, constructor,
+ *this, function, constructor,
intrinsic != NoIntrinsic ? thunkGeneratorForIntrinsic(intrinsic) : 0,
intrinsic, signature, name);
}
@@ -718,8 +718,8 @@
#if ENABLE(JIT)
if (canUseJIT()) {
if (kind == CodeForCall)
- return jitStubs->ctiInternalFunctionCall(this).retagged<JSEntryPtrTag>();
- return jitStubs->ctiInternalFunctionConstruct(this).retagged<JSEntryPtrTag>();
+ return jitStubs->ctiInternalFunctionCall(*this).retagged<JSEntryPtrTag>();
+ return jitStubs->ctiInternalFunctionConstruct(*this).retagged<JSEntryPtrTag>();
}
#endif
if (kind == CodeForCall)
@@ -771,7 +771,7 @@
void VM::shrinkFootprintWhenIdle()
{
whenIdle([=] () {
- sanitizeStackForVM(this);
+ sanitizeStackForVM(*this);
deleteAllCode(DeleteAllCodeIfNotCollecting);
heap.collectNow(Synchronousness::Sync, CollectionScope::Full);
// FIXME: Consider stopping various automatic threads here.
@@ -925,16 +925,16 @@
}
#endif
-void logSanitizeStack(VM* vm)
+void logSanitizeStack(VM& vm)
{
- if (Options::verboseSanitizeStack() && vm->topCallFrame) {
+ if (Options::verboseSanitizeStack() && vm.topCallFrame) {
int dummy;
auto& stackBounds = Thread::current().stack();
dataLog(
- "Sanitizing stack for VM = ", RawPointer(vm), " with top call frame at ", RawPointer(vm->topCallFrame),
+ "Sanitizing stack for VM = ", RawPointer(&vm), " with top call frame at ", RawPointer(vm.topCallFrame),
", current stack pointer at ", RawPointer(&dummy), ", in ",
- pointerDump(vm->topCallFrame->codeBlock()), ", last code origin = ",
- vm->topCallFrame->codeOrigin(), ", last stack top = ", RawPointer(vm->lastStackTop()), ", in stack range [", RawPointer(stackBounds.origin()), ", ", RawPointer(stackBounds.end()), "]\n");
+ pointerDump(vm.topCallFrame->codeBlock()), ", last code origin = ",
+ vm.topCallFrame->codeOrigin(), ", last stack top = ", RawPointer(vm.lastStackTop()), ", in stack range [", RawPointer(stackBounds.origin()), ", ", RawPointer(stackBounds.end()), "]\n");
}
}
@@ -1143,18 +1143,18 @@
m_microtask->run(m_globalObject->globalExec());
}
-void sanitizeStackForVM(VM* vm)
+void sanitizeStackForVM(VM& vm)
{
logSanitizeStack(vm);
- if (vm->topCallFrame) {
+ if (vm.topCallFrame) {
auto& stackBounds = Thread::current().stack();
- ASSERT(vm->currentThreadIsHoldingAPILock());
- ASSERT_UNUSED(stackBounds, stackBounds.contains(vm->lastStackTop()));
+ ASSERT(vm.currentThreadIsHoldingAPILock());
+ ASSERT_UNUSED(stackBounds, stackBounds.contains(vm.lastStackTop()));
}
#if ENABLE(C_LOOP)
- vm->interpreter->cloopStack().sanitizeStack();
+ vm.interpreter->cloopStack().sanitizeStack();
#else
- sanitizeStackForVMImpl(vm);
+ sanitizeStackForVMImpl(&vm);
#endif
}
@@ -1350,7 +1350,7 @@
JSPropertyNameEnumerator* VM::emptyPropertyNameEnumeratorSlow()
{
ASSERT(!m_emptyPropertyNameEnumerator);
- PropertyNameArray propertyNames(this, PropertyNameMode::Strings, PrivateSymbolMode::Exclude);
+ PropertyNameArray propertyNames(*this, PropertyNameMode::Strings, PrivateSymbolMode::Exclude);
auto* enumerator = JSPropertyNameEnumerator::create(*this, nullptr, 0, 0, WTFMove(propertyNames));
m_emptyPropertyNameEnumerator.set(*this, enumerator);
return enumerator;
diff --git a/Source/JavaScriptCore/runtime/VM.h b/Source/JavaScriptCore/runtime/VM.h
index 64389e9..3bb8752 100644
--- a/Source/JavaScriptCore/runtime/VM.h
+++ b/Source/JavaScriptCore/runtime/VM.h
@@ -674,7 +674,7 @@
std::unique_ptr<JITThunks> jitStubs;
MacroAssemblerCodeRef<JITThunkPtrTag> getCTIStub(ThunkGenerator generator)
{
- return jitStubs->ctiStub(this, generator);
+ return jitStubs->ctiStub(*this, generator);
}
#endif // ENABLE(JIT)
@@ -1108,14 +1108,14 @@
inline Heap* WeakSet::heap() const
{
- return &m_vm->heap;
+ return &m_vm.heap;
}
#if !ENABLE(C_LOOP)
extern "C" void sanitizeStackForVMImpl(VM*);
#endif
-JS_EXPORT_PRIVATE void sanitizeStackForVM(VM*);
-void logSanitizeStack(VM*);
+JS_EXPORT_PRIVATE void sanitizeStackForVM(VM&);
+void logSanitizeStack(VM&);
} // namespace JSC
diff --git a/Source/JavaScriptCore/runtime/VMTraps.cpp b/Source/JavaScriptCore/runtime/VMTraps.cpp
index e66866c..47914c2 100644
--- a/Source/JavaScriptCore/runtime/VMTraps.cpp
+++ b/Source/JavaScriptCore/runtime/VMTraps.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2017-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2017-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
@@ -215,7 +215,7 @@
return SignalAction::NotHandled;
}
ASSERT(currentCodeBlock->hasInstalledVMTrapBreakpoints());
- VM& vm = *currentCodeBlock->vm();
+ VM& vm = currentCodeBlock->vm();
// We are in JIT code so it's safe to acquire this lock.
auto codeBlockSetLocker = holdLock(vm.heap.codeBlockSet().getLock());
diff --git a/Source/JavaScriptCore/runtime/WeakMapPrototype.cpp b/Source/JavaScriptCore/runtime/WeakMapPrototype.cpp
index 6072bfd..c73fd3e 100644
--- a/Source/JavaScriptCore/runtime/WeakMapPrototype.cpp
+++ b/Source/JavaScriptCore/runtime/WeakMapPrototype.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013, 2016 Apple, Inc. All rights reserved.
+ * Copyright (C) 2013-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
@@ -48,7 +48,7 @@
JSC_NATIVE_INTRINSIC_FUNCTION_WITHOUT_TRANSITION(vm.propertyNames->has, protoFuncWeakMapHas, static_cast<unsigned>(PropertyAttribute::DontEnum), 1, JSWeakMapHasIntrinsic);
JSC_NATIVE_INTRINSIC_FUNCTION_WITHOUT_TRANSITION(vm.propertyNames->set, protoFuncWeakMapSet, static_cast<unsigned>(PropertyAttribute::DontEnum), 2, JSWeakMapSetIntrinsic);
- putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(&vm, "WeakMap"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
+ putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(vm, "WeakMap"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
}
ALWAYS_INLINE static JSWeakMap* getWeakMap(CallFrame* callFrame, JSValue value)
diff --git a/Source/JavaScriptCore/runtime/WeakObjectRefPrototype.cpp b/Source/JavaScriptCore/runtime/WeakObjectRefPrototype.cpp
index ce155f7..52f9eac 100644
--- a/Source/JavaScriptCore/runtime/WeakObjectRefPrototype.cpp
+++ b/Source/JavaScriptCore/runtime/WeakObjectRefPrototype.cpp
@@ -44,7 +44,7 @@
// FIXME: It wouldn't be hard to make this an intrinsic.
JSC_NATIVE_FUNCTION_WITHOUT_TRANSITION(vm.propertyNames->deref, protoFuncWeakRefDeref, static_cast<unsigned>(PropertyAttribute::DontEnum), 0);
- putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(&vm, "WeakRef"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
+ putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(vm, "WeakRef"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
}
ALWAYS_INLINE static JSWeakObjectRef* getWeakRef(CallFrame* callFrame, JSValue value)
diff --git a/Source/JavaScriptCore/runtime/WeakSetPrototype.cpp b/Source/JavaScriptCore/runtime/WeakSetPrototype.cpp
index 2b2530d..f5e0780 100644
--- a/Source/JavaScriptCore/runtime/WeakSetPrototype.cpp
+++ b/Source/JavaScriptCore/runtime/WeakSetPrototype.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015-2016 Apple, Inc. All rights reserved.
+ * Copyright (C) 2015-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
@@ -46,7 +46,7 @@
JSC_NATIVE_INTRINSIC_FUNCTION_WITHOUT_TRANSITION(vm.propertyNames->has, protoFuncWeakSetHas, static_cast<unsigned>(PropertyAttribute::DontEnum), 1, JSWeakSetHasIntrinsic);
JSC_NATIVE_INTRINSIC_FUNCTION_WITHOUT_TRANSITION(vm.propertyNames->add, protoFuncWeakSetAdd, static_cast<unsigned>(PropertyAttribute::DontEnum), 1, JSWeakSetAddIntrinsic);
- putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(&vm, "WeakSet"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
+ putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(vm, "WeakSet"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
}
ALWAYS_INLINE static JSWeakSet* getWeakSet(CallFrame* callFrame, JSValue value)
diff --git a/Source/JavaScriptCore/tools/HeapVerifier.cpp b/Source/JavaScriptCore/tools/HeapVerifier.cpp
index 05e4099b..80c8d5b 100644
--- a/Source/JavaScriptCore/tools/HeapVerifier.cpp
+++ b/Source/JavaScriptCore/tools/HeapVerifier.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-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
@@ -144,12 +144,12 @@
CollectionScope scope = currentCycle().scope;
MonotonicTime gcCycleTimestamp = currentCycle().timestamp;
dataLog("Verifying heap in [p", getCurrentProcessID(), ", ", Thread::current(), "] vm ",
- RawPointer(m_heap->vm()), " on ", scope, " GC @ ", gcCycleTimestamp, "\n");
+ RawPointer(&m_heap->vm()), " on ", scope, " GC @ ", gcCycleTimestamp, "\n");
}
bool HeapVerifier::verifyCellList(Phase phase, CellList& list)
{
- VM& vm = *m_heap->vm();
+ VM& vm = m_heap->vm();
auto& liveCells = list.cells();
bool listNamePrinted = false;
@@ -222,7 +222,7 @@
if (expectedVM) {
VM& vm = *expectedVM;
- VM* cellVM = cell->vm();
+ VM* cellVM = &cell->vm();
if (cellVM != expectedVM) {
printHeaderAndCell();
dataLog(" is from a different VM: expected:", RawPointer(expectedVM), " actual:", RawPointer(cellVM), "\n");
@@ -255,7 +255,7 @@
return false;
}
- VM* structureVM = structure->vm();
+ VM* structureVM = &structure->vm();
if (structureVM != expectedVM) {
printHeaderAndCell();
dataLog(" has structure ", RawPointer(structure), " from a different VM: expected:", RawPointer(expectedVM), " actual:", RawPointer(structureVM), "\n");
@@ -305,7 +305,7 @@
return false;
}
- VM* structureStructureVM = structureStructure->vm();
+ VM* structureStructureVM = &structureStructure->vm();
if (structureStructureVM != expectedVM) {
printHeaderAndCell();
dataLog(" has structure ", RawPointer(structure), " whose structure ", RawPointer(structureStructure), " is from a different VM: expected:", RawPointer(expectedVM), " actual:", RawPointer(structureStructureVM), "\n");
@@ -365,7 +365,7 @@
void HeapVerifier::reportCell(CellProfile& profile, int cycleIndex, HeapVerifier::GCCycle& cycle, CellList& list, const char* prefix)
{
HeapCell* cell = profile.cell();
- VM* vm = m_heap->vm();
+ VM& vm = m_heap->vm();
if (prefix)
dataLog(prefix);
@@ -387,7 +387,7 @@
if (profile.isLive() && profile.isJSCell()) {
JSCell* jsCell = profile.jsCell();
- Structure* structure = jsCell->structure(*vm);
+ Structure* structure = jsCell->structure(vm);
dataLog(" structure:", RawPointer(structure));
if (jsCell->isObject()) {
JSObject* obj = static_cast<JSObject*>(cell);
@@ -399,7 +399,7 @@
}
dataLog(" in ", cycle.scope, " GC[", cycleIndex, "] in '", list.name(), "' list in VM ",
- RawPointer(vm), " recorded at time ", profile.timestamp(), "\n");
+ RawPointer(&vm), " recorded at time ", profile.timestamp(), "\n");
if (profile.stackTrace())
dataLog(*profile.stackTrace());
}
diff --git a/Source/JavaScriptCore/tools/JSDollarVM.cpp b/Source/JavaScriptCore/tools/JSDollarVM.cpp
index 8113f80..92ffb85 100644
--- a/Source/JavaScriptCore/tools/JSDollarVM.cpp
+++ b/Source/JavaScriptCore/tools/JSDollarVM.cpp
@@ -99,7 +99,7 @@
if (frameIndex++ != requestedFrameIndex)
return StackVisitor::Continue;
- addProperty(vm, "name", jsString(&vm, visitor->functionName()));
+ addProperty(vm, "name", jsString(vm, visitor->functionName()));
if (visitor->callee().isCell())
addProperty(vm, "callee", visitor->callee().asCell());
@@ -123,7 +123,7 @@
private:
void addProperty(VM& vm, const char* name, JSValue value)
{
- Identifier identifier = Identifier::fromString(&vm, name);
+ Identifier identifier = Identifier::fromString(vm, name);
putDirect(vm, identifier, value);
}
};
@@ -369,13 +369,14 @@
static bool getOwnPropertySlot(JSObject* object, ExecState* exec, PropertyName propertyName, PropertySlot& slot)
{
+ VM& vm = exec->vm();
CustomGetter* thisObject = jsCast<CustomGetter*>(object);
- if (propertyName == PropertyName(Identifier::fromString(exec, "customGetter"))) {
+ if (propertyName == PropertyName(Identifier::fromString(vm, "customGetter"))) {
slot.setCacheableCustom(thisObject, PropertyAttribute::DontDelete | PropertyAttribute::ReadOnly | PropertyAttribute::DontEnum, thisObject->customGetter);
return true;
}
- if (propertyName == PropertyName(Identifier::fromString(exec, "customGetterAccessor"))) {
+ if (propertyName == PropertyName(Identifier::fromString(vm, "customGetterAccessor"))) {
slot.setCacheableCustom(thisObject, PropertyAttribute::DontDelete | PropertyAttribute::ReadOnly | PropertyAttribute::DontEnum | PropertyAttribute::CustomAccessor, thisObject->customGetterAcessor);
return true;
}
@@ -392,7 +393,7 @@
CustomGetter* thisObject = jsDynamicCast<CustomGetter*>(vm, JSValue::decode(thisValue));
if (!thisObject)
return throwVMTypeError(exec, scope);
- bool shouldThrow = thisObject->get(exec, PropertyName(Identifier::fromString(exec, "shouldThrow"))).toBoolean(exec);
+ bool shouldThrow = thisObject->get(exec, PropertyName(Identifier::fromString(vm, "shouldThrow"))).toBoolean(exec);
RETURN_IF_EXCEPTION(scope, encodedJSValue());
if (shouldThrow)
return throwVMTypeError(exec, scope);
@@ -407,7 +408,7 @@
JSObject* thisObject = jsDynamicCast<JSObject*>(vm, JSValue::decode(thisValue));
if (!thisObject)
return throwVMTypeError(exec, scope);
- bool shouldThrow = thisObject->get(exec, PropertyName(Identifier::fromString(exec, "shouldThrow"))).toBoolean(exec);
+ bool shouldThrow = thisObject->get(exec, PropertyName(Identifier::fromString(vm, "shouldThrow"))).toBoolean(exec);
RETURN_IF_EXCEPTION(scope, encodedJSValue());
if (shouldThrow)
return throwVMTypeError(exec, scope);
@@ -612,7 +613,7 @@
static EncodedJSValue JIT_OPERATION slowCall(ExecState* exec, void* pointer)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return JSValue::encode(jsNumber(static_cast<DOMJITGetter*>(pointer)->value()));
}
@@ -651,7 +652,7 @@
Base::finishCreation(vm);
const DOMJIT::GetterSetter* domJIT = &DOMJITGetterDOMJIT;
auto* customGetterSetter = DOMAttributeGetterSetter::create(vm, domJIT->getter(), nullptr, DOMAttributeAnnotation { DOMJITNode::info(), domJIT });
- putDirectCustomAccessor(vm, Identifier::fromString(&vm, "customGetter"), customGetterSetter, PropertyAttribute::ReadOnly | PropertyAttribute::CustomAccessor);
+ putDirectCustomAccessor(vm, Identifier::fromString(vm, "customGetter"), customGetterSetter, PropertyAttribute::ReadOnly | PropertyAttribute::CustomAccessor);
}
class DOMJITGetterComplex : public DOMJITNode {
@@ -695,7 +696,7 @@
static EncodedJSValue JIT_OPERATION slowCall(ExecState* exec, void* pointer)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
auto scope = DECLARE_THROW_SCOPE(vm);
auto* object = static_cast<DOMJITNode*>(pointer);
auto* domjitGetterComplex = jsDynamicCast<DOMJITGetterComplex*>(vm, object);
@@ -761,8 +762,8 @@
Base::finishCreation(vm);
const DOMJIT::GetterSetter* domJIT = &DOMJITGetterComplexDOMJIT;
auto* customGetterSetter = DOMAttributeGetterSetter::create(vm, domJIT->getter(), nullptr, DOMAttributeAnnotation { DOMJITGetterComplex::info(), domJIT });
- putDirectCustomAccessor(vm, Identifier::fromString(&vm, "customGetter"), customGetterSetter, PropertyAttribute::ReadOnly | PropertyAttribute::CustomAccessor);
- putDirectNativeFunction(vm, globalObject, Identifier::fromString(&vm, "enableException"), 0, functionEnableException, NoIntrinsic, 0);
+ putDirectCustomAccessor(vm, Identifier::fromString(vm, "customGetter"), customGetterSetter, PropertyAttribute::ReadOnly | PropertyAttribute::CustomAccessor);
+ putDirectNativeFunction(vm, globalObject, Identifier::fromString(vm, "enableException"), 0, functionEnableException, NoIntrinsic, 0);
}
class DOMJITFunctionObject : public DOMJITNode {
@@ -803,7 +804,7 @@
static EncodedJSValue JIT_OPERATION functionWithoutTypeCheck(ExecState* exec, DOMJITNode* node)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return JSValue::encode(jsNumber(node->value()));
}
@@ -833,7 +834,7 @@
void DOMJITFunctionObject::finishCreation(VM& vm, JSGlobalObject* globalObject)
{
Base::finishCreation(vm);
- putDirectNativeFunction(vm, globalObject, Identifier::fromString(&vm, "func"), 0, functionWithTypeCheck, NoIntrinsic, &DOMJITFunctionObjectSignature, static_cast<unsigned>(PropertyAttribute::ReadOnly));
+ putDirectNativeFunction(vm, globalObject, Identifier::fromString(vm, "func"), 0, functionWithTypeCheck, NoIntrinsic, &DOMJITFunctionObjectSignature, static_cast<unsigned>(PropertyAttribute::ReadOnly));
}
class DOMJITCheckSubClassObject : public DOMJITNode {
@@ -874,7 +875,7 @@
static EncodedJSValue JIT_OPERATION functionWithoutTypeCheck(ExecState* exec, DOMJITNode* node)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
return JSValue::encode(jsNumber(node->value()));
}
@@ -887,7 +888,7 @@
void DOMJITCheckSubClassObject::finishCreation(VM& vm, JSGlobalObject* globalObject)
{
Base::finishCreation(vm);
- putDirectNativeFunction(vm, globalObject, Identifier::fromString(&vm, "func"), 0, functionWithTypeCheck, NoIntrinsic, &DOMJITCheckSubClassObjectSignature, static_cast<unsigned>(PropertyAttribute::ReadOnly));
+ putDirectNativeFunction(vm, globalObject, Identifier::fromString(vm, "func"), 0, functionWithTypeCheck, NoIntrinsic, &DOMJITCheckSubClassObjectSignature, static_cast<unsigned>(PropertyAttribute::ReadOnly));
}
class DOMJITGetterBaseJSObject : public DOMJITNode {
@@ -931,7 +932,7 @@
static EncodedJSValue JIT_OPERATION slowCall(ExecState* exec, void* pointer)
{
VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
+ NativeCallFrameTracer tracer(vm, exec);
JSObject* object = static_cast<JSObject*>(pointer);
return JSValue::encode(object->getPrototypeDirect(vm));
}
@@ -971,7 +972,7 @@
Base::finishCreation(vm);
const DOMJIT::GetterSetter* domJIT = &DOMJITGetterBaseJSObjectDOMJIT;
auto* customGetterSetter = DOMAttributeGetterSetter::create(vm, domJIT->getter(), nullptr, DOMAttributeAnnotation { JSObject::info(), domJIT });
- putDirectCustomAccessor(vm, Identifier::fromString(&vm, "customGetter"), customGetterSetter, PropertyAttribute::ReadOnly | PropertyAttribute::CustomAccessor);
+ putDirectCustomAccessor(vm, Identifier::fromString(vm, "customGetter"), customGetterSetter, PropertyAttribute::ReadOnly | PropertyAttribute::CustomAccessor);
}
class Message : public ThreadSafeRefCounted<Message> {
@@ -1035,7 +1036,7 @@
RELEASE_ASSERT(value.isObject());
JSObject* object = asObject(value);
PutPropertySlot slot(object);
- object->put(object, exec, Identifier::fromString(&vm, "result"), JSValue::decode(thisObject), slot);
+ object->put(object, exec, Identifier::fromString(vm, "result"), JSValue::decode(thisObject), slot);
return true;
}
@@ -1050,7 +1051,7 @@
RELEASE_ASSERT(value.isObject());
JSObject* object = asObject(value);
PutPropertySlot slot(object);
- object->put(object, exec, Identifier::fromString(&vm, "result"), JSValue::decode(slotValue), slot);
+ object->put(object, exec, Identifier::fromString(vm, "result"), JSValue::decode(slotValue), slot);
return true;
}
@@ -1059,9 +1060,9 @@
{
Base::finishCreation(vm);
- putDirectCustomAccessor(vm, Identifier::fromString(&vm, "customValue"),
+ putDirectCustomAccessor(vm, Identifier::fromString(vm, "customValue"),
CustomGetterSetter::create(vm, customGetValue, customSetValue), 0);
- putDirectCustomAccessor(vm, Identifier::fromString(&vm, "customAccessor"),
+ putDirectCustomAccessor(vm, Identifier::fromString(vm, "customAccessor"),
CustomGetterSetter::create(vm, customGetAccessor, customSetAccessor), static_cast<unsigned>(PropertyAttribute::CustomAccessor));
}
@@ -1138,8 +1139,8 @@
Base::finishCreation(vm);
JSGlobalObject* globalObject = this->globalObject(vm);
- putDirectNativeFunction(vm, globalObject, Identifier::fromString(&vm, "addBytes"), 0, functionWasmStreamingParserAddBytes, NoIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunction(vm, globalObject, Identifier::fromString(&vm, "finalize"), 0, functionWasmStreamingParserFinalize, NoIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunction(vm, globalObject, Identifier::fromString(vm, "addBytes"), 0, functionWasmStreamingParserAddBytes, NoIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunction(vm, globalObject, Identifier::fromString(vm, "finalize"), 0, functionWasmStreamingParserFinalize, NoIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
}
DECLARE_INFO;
@@ -1330,7 +1331,7 @@
if (!theFunctionValue.isCell())
return nullptr;
- VM& vm = *theFunctionValue.asCell()->vm();
+ VM& vm = theFunctionValue.asCell()->vm();
JSFunction* theFunction = jsDynamicCast<JSFunction*>(vm, theFunctionValue);
if (!theFunction)
return nullptr;
@@ -1498,7 +1499,7 @@
WTF::StringPrintStream stream;
if (codeBlock) {
stream.print(*codeBlock);
- return JSValue::encode(jsString(exec, stream.toString()));
+ return JSValue::encode(jsString(exec->vm(), stream.toString()));
}
return JSValue::encode(jsUndefined());
}
@@ -1631,7 +1632,7 @@
WTF::StringPrintStream stream;
stream.print(IndexingTypeDump(exec->uncheckedArgument(0).getObject()->indexingMode()));
- return JSValue::encode(jsString(exec, stream.toString()));
+ return JSValue::encode(jsString(exec->vm(), stream.toString()));
}
static EncodedJSValue JSC_HOST_CALL functionInlineCapacity(ExecState* exec)
@@ -1654,7 +1655,7 @@
stream.print(exec->uncheckedArgument(i));
}
- return JSValue::encode(jsString(exec, stream.toString()));
+ return JSValue::encode(jsString(exec->vm(), stream.toString()));
}
// Gets the pid of the current process.
@@ -1860,7 +1861,7 @@
RETURN_IF_EXCEPTION(scope, encodedJSValue());
const SourceCode& source = makeSource(functionText, { });
- JSFunction* func = JSFunction::create(vm, createBuiltinExecutable(vm, source, Identifier::fromString(&vm, "foo"), ConstructorKind::None, ConstructAbility::CannotConstruct)->link(vm, nullptr, source), exec->lexicalGlobalObject());
+ JSFunction* func = JSFunction::create(vm, createBuiltinExecutable(vm, source, Identifier::fromString(vm, "foo"), ConstructorKind::None, ConstructAbility::CannotConstruct)->link(vm, nullptr, source), exec->lexicalGlobalObject());
return JSValue::encode(func);
}
@@ -1875,7 +1876,7 @@
String str = asString(exec->argument(1))->value(exec);
- SymbolImpl* symbol = vm.propertyNames->lookUpPrivateName(Identifier::fromString(exec, str));
+ SymbolImpl* symbol = vm.propertyNames->lookUpPrivateName(Identifier::fromString(vm, str));
if (!symbol)
return throwVMError(exec, scope, "Unknown private name.");
@@ -2229,13 +2230,13 @@
addFunction(vm, "crash", functionCrash, 0);
addFunction(vm, "breakpoint", functionBreakpoint, 0);
- putDirectNativeFunction(vm, globalObject, Identifier::fromString(&vm, "dfgTrue"), 0, functionDFGTrue, DFGTrueIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunction(vm, globalObject, Identifier::fromString(&vm, "ftlTrue"), 0, functionFTLTrue, FTLTrueIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunction(vm, globalObject, Identifier::fromString(vm, "dfgTrue"), 0, functionDFGTrue, DFGTrueIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectNativeFunction(vm, globalObject, Identifier::fromString(vm, "ftlTrue"), 0, functionFTLTrue, FTLTrueIntrinsic, static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectNativeFunction(vm, globalObject, Identifier::fromString(&vm, "cpuMfence"), 0, functionCpuMfence, CPUMfenceIntrinsic, 0);
- putDirectNativeFunction(vm, globalObject, Identifier::fromString(&vm, "cpuRdtsc"), 0, functionCpuRdtsc, CPURdtscIntrinsic, 0);
- putDirectNativeFunction(vm, globalObject, Identifier::fromString(&vm, "cpuCpuid"), 0, functionCpuCpuid, CPUCpuidIntrinsic, 0);
- putDirectNativeFunction(vm, globalObject, Identifier::fromString(&vm, "cpuPause"), 0, functionCpuPause, CPUPauseIntrinsic, 0);
+ putDirectNativeFunction(vm, globalObject, Identifier::fromString(vm, "cpuMfence"), 0, functionCpuMfence, CPUMfenceIntrinsic, 0);
+ putDirectNativeFunction(vm, globalObject, Identifier::fromString(vm, "cpuRdtsc"), 0, functionCpuRdtsc, CPURdtscIntrinsic, 0);
+ putDirectNativeFunction(vm, globalObject, Identifier::fromString(vm, "cpuCpuid"), 0, functionCpuCpuid, CPUCpuidIntrinsic, 0);
+ putDirectNativeFunction(vm, globalObject, Identifier::fromString(vm, "cpuPause"), 0, functionCpuPause, CPUPauseIntrinsic, 0);
addFunction(vm, "cpuClflush", functionCpuClflush, 2);
addFunction(vm, "llintTrue", functionLLintTrue, 0);
@@ -2334,13 +2335,13 @@
void JSDollarVM::addFunction(VM& vm, JSGlobalObject* globalObject, const char* name, NativeFunction function, unsigned arguments)
{
- Identifier identifier = Identifier::fromString(&vm, name);
+ Identifier identifier = Identifier::fromString(vm, name);
putDirect(vm, identifier, JSFunction::create(vm, globalObject, arguments, identifier.string(), function));
}
void JSDollarVM::addConstructibleFunction(VM& vm, JSGlobalObject* globalObject, const char* name, NativeFunction function, unsigned arguments)
{
- Identifier identifier = Identifier::fromString(&vm, name);
+ Identifier identifier = Identifier::fromString(vm, name);
putDirect(vm, identifier, JSFunction::create(vm, globalObject, arguments, identifier.string(), function, NoIntrinsic, function));
}
diff --git a/Source/JavaScriptCore/tools/VMInspector.cpp b/Source/JavaScriptCore/tools/VMInspector.cpp
index 792cdb7..9e29f87 100644
--- a/Source/JavaScriptCore/tools/VMInspector.cpp
+++ b/Source/JavaScriptCore/tools/VMInspector.cpp
@@ -374,7 +374,7 @@
dataLog("Dumping host frame registers not supported.\n");
return;
}
- VM& vm = *codeBlock->vm();
+ VM& vm = codeBlock->vm();
auto valueAsString = [&] (JSValue v) -> CString {
if (!v.isCell() || VMInspector::isValidCell(&vm.heap, reinterpret_cast<JSCell*>(JSValue::encode(v))))
return toCString(v);
@@ -497,7 +497,7 @@
void VMInspector::dumpCellMemoryToStream(JSCell* cell, PrintStream& out)
{
- VM& vm = *cell->vm();
+ VM& vm = cell->vm();
StructureID structureID = cell->structureID();
Structure* structure = cell->structure(vm);
IndexingType indexingTypeAndMisc = cell->indexingTypeAndMisc();
diff --git a/Source/JavaScriptCore/wasm/WasmInstance.cpp b/Source/JavaScriptCore/wasm/WasmInstance.cpp
index ec15d86..0789c9e 100644
--- a/Source/JavaScriptCore/wasm/WasmInstance.cpp
+++ b/Source/JavaScriptCore/wasm/WasmInstance.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2017-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
@@ -79,7 +79,7 @@
void Instance::setGlobal(unsigned i, JSValue value)
{
ASSERT(m_owner);
- m_globals.get()[i].anyref.set(*owner<JSWebAssemblyInstance>()->vm(), owner<JSWebAssemblyInstance>(), value);
+ m_globals.get()[i].anyref.set(owner<JSWebAssemblyInstance>()->vm(), owner<JSWebAssemblyInstance>(), value);
}
JSValue Instance::getFunctionWrapper(unsigned i) const
@@ -93,10 +93,10 @@
void Instance::setFunctionWrapper(unsigned i, JSValue value)
{
ASSERT(m_owner);
- ASSERT(value.isFunction(*owner<JSWebAssemblyInstance>()->vm()));
+ ASSERT(value.isFunction(owner<JSWebAssemblyInstance>()->vm()));
ASSERT(!m_functionWrappers.contains(i));
auto locker = holdLock(owner<JSWebAssemblyInstance>()->cellLock());
- m_functionWrappers.set(i, WriteBarrier<Unknown>(*owner<JSWebAssemblyInstance>()->vm(), owner<JSWebAssemblyInstance>(), value));
+ m_functionWrappers.set(i, WriteBarrier<Unknown>(owner<JSWebAssemblyInstance>()->vm(), owner<JSWebAssemblyInstance>(), value));
ASSERT(getFunctionWrapper(i) == value);
}
@@ -143,7 +143,7 @@
WebAssemblyFunction* wasmFunction;
WebAssemblyWrapperFunction* wasmWrapperFunction;
- if (isWebAssemblyHostFunction(*instance->owner<JSObject>()->vm(), value, wasmFunction, wasmWrapperFunction)) {
+ if (isWebAssemblyHostFunction(instance->owner<JSObject>()->vm(), value, wasmFunction, wasmWrapperFunction)) {
ASSERT(!!wasmFunction || !!wasmWrapperFunction);
if (wasmFunction)
instance->table(tableIndex)->asFuncrefTable()->setFunction(index, jsCast<JSObject*>(value), wasmFunction->importableFunction(), &wasmFunction->instance()->instance());
@@ -196,7 +196,7 @@
EncodedJSValue doWasmRefFunc(Instance* instance, uint32_t index)
{
JSValue value = instance->getFunctionWrapper(index);
- ASSERT(value.isFunction(*instance->owner<JSObject>()->vm()));
+ ASSERT(value.isFunction(instance->owner<JSObject>()->vm()));
return JSValue::encode(value);
}
diff --git a/Source/JavaScriptCore/wasm/WasmTable.cpp b/Source/JavaScriptCore/wasm/WasmTable.cpp
index b54645c..23ea95b 100644
--- a/Source/JavaScriptCore/wasm/WasmTable.cpp
+++ b/Source/JavaScriptCore/wasm/WasmTable.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2017-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2017-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
@@ -149,7 +149,7 @@
RELEASE_ASSERT(isAnyrefTable());
RELEASE_ASSERT(m_owner);
clear(index);
- m_jsValues.get()[index & m_mask].set(*m_owner->vm(), m_owner, value);
+ m_jsValues.get()[index & m_mask].set(m_owner->vm(), m_owner, value);
}
JSValue Table::get(uint32_t index) const
@@ -193,7 +193,7 @@
RELEASE_ASSERT(m_owner);
clear(index);
if (optionalWrapper)
- m_jsValues.get()[index & m_mask].set(*m_owner->vm(), m_owner, optionalWrapper);
+ m_jsValues.get()[index & m_mask].set(m_owner->vm(), m_owner, optionalWrapper);
m_importableFunctions.get()[index & m_mask] = function;
m_instances.get()[index & m_mask] = instance;
}
diff --git a/Source/JavaScriptCore/wasm/js/JSWebAssembly.cpp b/Source/JavaScriptCore/wasm/js/JSWebAssembly.cpp
index ee8347e..d1b38a1 100644
--- a/Source/JavaScriptCore/wasm/js/JSWebAssembly.cpp
+++ b/Source/JavaScriptCore/wasm/js/JSWebAssembly.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-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
@@ -196,8 +196,8 @@
promise->resolve(exec, moduleRecord);
} else {
JSObject* result = constructEmptyObject(exec);
- result->putDirect(vm, Identifier::fromString(&vm, "module"_s), module);
- result->putDirect(vm, Identifier::fromString(&vm, "instance"_s), instance);
+ result->putDirect(vm, Identifier::fromString(vm, "module"_s), module);
+ result->putDirect(vm, Identifier::fromString(vm, "instance"_s), instance);
promise->resolve(exec, result);
}
CLEAR_AND_RETURN_IF_EXCEPTION(scope, void());
diff --git a/Source/JavaScriptCore/wasm/js/JSWebAssemblyInstance.cpp b/Source/JavaScriptCore/wasm/js/JSWebAssemblyInstance.cpp
index 99afa1a..0c8e4af 100644
--- a/Source/JavaScriptCore/wasm/js/JSWebAssemblyInstance.cpp
+++ b/Source/JavaScriptCore/wasm/js/JSWebAssemblyInstance.cpp
@@ -200,8 +200,8 @@
// For each import i in module.imports:
for (auto& import : moduleInformation.imports) {
- Identifier moduleName = Identifier::fromString(&vm, String::fromUTF8(import.module));
- Identifier fieldName = Identifier::fromString(&vm, String::fromUTF8(import.field));
+ Identifier moduleName = Identifier::fromString(vm, String::fromUTF8(import.module));
+ Identifier fieldName = Identifier::fromString(vm, String::fromUTF8(import.field));
moduleRecord->appendRequestedModule(moduleName);
moduleRecord->addImportEntry(WebAssemblyModuleRecord::ImportEntry {
WebAssemblyModuleRecord::ImportEntryType::Single,
diff --git a/Source/JavaScriptCore/wasm/js/WasmToJS.cpp b/Source/JavaScriptCore/wasm/js/WasmToJS.cpp
index 355094e..5166a68 100644
--- a/Source/JavaScriptCore/wasm/js/WasmToJS.cpp
+++ b/Source/JavaScriptCore/wasm/js/WasmToJS.cpp
@@ -92,18 +92,18 @@
jit.jumpToExceptionHandler(*vm);
void (*throwBadI64)(ExecState*, JSWebAssemblyInstance*) = [] (ExecState* exec, JSWebAssemblyInstance* instance) -> void {
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
{
- auto throwScope = DECLARE_THROW_SCOPE(*vm);
- JSGlobalObject* globalObject = instance->globalObject(*vm);
- auto* error = ErrorInstance::create(exec, *vm, globalObject->errorStructure(ErrorType::TypeError), "i64 not allowed as return type or argument to an imported function"_s);
+ auto throwScope = DECLARE_THROW_SCOPE(vm);
+ JSGlobalObject* globalObject = instance->globalObject(vm);
+ auto* error = ErrorInstance::create(exec, vm, globalObject->errorStructure(ErrorType::TypeError), "i64 not allowed as return type or argument to an imported function"_s);
throwException(exec, throwScope, error);
}
genericUnwind(vm, exec);
- ASSERT(!!vm->callFrameForCatch);
+ ASSERT(!!vm.callFrameForCatch);
};
LinkBuffer linkBuffer(jit, GLOBAL_THUNK_ID, JITCompilationCanFail);
@@ -226,9 +226,9 @@
uint64_t (*callFunc)(ExecState*, JSObject*, SignatureIndex, uint64_t*) =
[] (ExecState* exec, JSObject* callee, SignatureIndex signatureIndex, uint64_t* buffer) -> uint64_t {
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
- auto throwScope = DECLARE_THROW_SCOPE(*vm);
+ auto throwScope = DECLARE_THROW_SCOPE(vm);
const Signature& signature = SignatureInformation::get(signatureIndex);
MarkedArgumentBuffer args;
for (unsigned argNum = 0; argNum < signature.argumentCount(); ++argNum) {
@@ -244,7 +244,7 @@
break;
case Funcref: {
arg = JSValue::decode(buffer[argNum]);
- ASSERT(isWebAssemblyHostFunction(*vm, arg) || arg.isNull());
+ ASSERT(isWebAssemblyHostFunction(vm, arg) || arg.isNull());
break;
}
case Anyref:
@@ -263,7 +263,7 @@
}
CallData callData;
- CallType callType = callee->methodTable(*vm)->getCallData(callee, callData);
+ CallType callType = callee->methodTable(vm)->getCallData(callee, callData);
RELEASE_ASSERT(callType != CallType::None);
JSValue result = call(exec, callee, callType, callData, jsUndefined(), args);
RETURN_IF_EXCEPTION(throwScope, 0);
@@ -282,7 +282,7 @@
}
case Funcref: {
realResult = JSValue::encode(result);
- ASSERT(result.isFunction(*vm) || result.isNull());
+ ASSERT(result.isFunction(vm) || result.isNull());
break;
}
case Anyref: {
@@ -317,10 +317,10 @@
jit.copyCalleeSavesToEntryFrameCalleeSavesBuffer(vm->topEntryFrame);
jit.move(GPRInfo::callFrameRegister, GPRInfo::argumentGPR0);
void (*doUnwinding)(ExecState*) = [] (ExecState* exec) -> void {
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
genericUnwind(vm, exec);
- ASSERT(!!vm->callFrameForCatch);
+ ASSERT(!!vm.callFrameForCatch);
};
auto exceptionCall = jit.call(OperationPtrTag);
jit.jumpToExceptionHandler(*vm);
@@ -536,7 +536,7 @@
CCallHelpers::JumpList slowPath;
int32_t (*convertToI32)(ExecState*, JSValue) = [] (ExecState* exec, JSValue v) -> int32_t {
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
return v.toInt32(exec);
};
@@ -565,7 +565,7 @@
CCallHelpers::JumpList done;
float (*convertToF32)(ExecState*, JSValue) = [] (ExecState* exec, JSValue v) -> float {
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
return static_cast<float>(v.toNumber(exec));
};
@@ -600,7 +600,7 @@
CCallHelpers::JumpList done;
double (*convertToF64)(ExecState*, JSValue) = [] (ExecState* exec, JSValue v) -> double {
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
return v.toNumber(exec);
};
@@ -643,10 +643,10 @@
jit.jumpToExceptionHandler(*vm);
void (*doUnwinding)(ExecState*) = [] (ExecState* exec) -> void {
- VM* vm = &exec->vm();
+ VM& vm = exec->vm();
NativeCallFrameTracer tracer(vm, exec);
genericUnwind(vm, exec);
- ASSERT(!!vm->callFrameForCatch);
+ ASSERT(!!vm.callFrameForCatch);
};
jit.addLinkTask([=] (LinkBuffer& linkBuffer) {
@@ -687,7 +687,7 @@
throwException(exec, throwScope, error);
}
- genericUnwind(&vm, exec);
+ genericUnwind(vm, exec);
ASSERT(!!vm.callFrameForCatch);
ASSERT(!!vm.targetMachinePCForThrow);
// FIXME: We could make this better:
diff --git a/Source/JavaScriptCore/wasm/js/WebAssemblyFunction.cpp b/Source/JavaScriptCore/wasm/js/WebAssemblyFunction.cpp
index d99b1de..057aa70 100644
--- a/Source/JavaScriptCore/wasm/js/WebAssemblyFunction.cpp
+++ b/Source/JavaScriptCore/wasm/js/WebAssemblyFunction.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-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
@@ -210,7 +210,7 @@
MacroAssemblerCodePtr<JSEntryPtrTag> WebAssemblyFunction::jsCallEntrypointSlow()
{
- VM& vm = *this->vm();
+ VM& vm = this->vm();
CCallHelpers jit;
const auto& signature = Wasm::SignatureInformation::get(signatureIndex());
diff --git a/Source/JavaScriptCore/wasm/js/WebAssemblyMemoryConstructor.cpp b/Source/JavaScriptCore/wasm/js/WebAssemblyMemoryConstructor.cpp
index 2405989..2371267 100644
--- a/Source/JavaScriptCore/wasm/js/WebAssemblyMemoryConstructor.cpp
+++ b/Source/JavaScriptCore/wasm/js/WebAssemblyMemoryConstructor.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-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
@@ -65,7 +65,7 @@
Wasm::PageCount initialPageCount;
{
- Identifier initial = Identifier::fromString(&vm, "initial");
+ Identifier initial = Identifier::fromString(vm, "initial");
JSValue minSizeValue = memoryDescriptor->get(exec, initial);
RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
uint32_t size = toNonWrappingUint32(exec, minSizeValue);
@@ -81,7 +81,7 @@
{
// In WebIDL, "present" means that [[Get]] result is undefined, not [[HasProperty]] result.
// https://heycam.github.io/webidl/#idl-dictionaries
- Identifier maximum = Identifier::fromString(&vm, "maximum");
+ Identifier maximum = Identifier::fromString(vm, "maximum");
JSValue maxSizeValue = memoryDescriptor->get(exec, maximum);
RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
if (!maxSizeValue.isUndefined()) {
diff --git a/Source/JavaScriptCore/wasm/js/WebAssemblyModuleConstructor.cpp b/Source/JavaScriptCore/wasm/js/WebAssemblyModuleConstructor.cpp
index 730f4ec..6bab94e 100644
--- a/Source/JavaScriptCore/wasm/js/WebAssemblyModuleConstructor.cpp
+++ b/Source/JavaScriptCore/wasm/js/WebAssemblyModuleConstructor.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-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
@@ -114,15 +114,15 @@
const auto& imports = module->moduleInformation().imports;
if (imports.size()) {
- Identifier module = Identifier::fromString(exec, "module");
- Identifier name = Identifier::fromString(exec, "name");
- Identifier kind = Identifier::fromString(exec, "kind");
+ Identifier module = Identifier::fromString(vm, "module");
+ Identifier name = Identifier::fromString(vm, "name");
+ Identifier kind = Identifier::fromString(vm, "kind");
for (const Wasm::Import& imp : imports) {
JSObject* obj = constructEmptyObject(exec);
RETURN_IF_EXCEPTION(throwScope, { });
- obj->putDirect(vm, module, jsString(exec, String::fromUTF8(imp.module)));
- obj->putDirect(vm, name, jsString(exec, String::fromUTF8(imp.field)));
- obj->putDirect(vm, kind, jsString(exec, String(makeString(imp.kind))));
+ obj->putDirect(vm, module, jsString(vm, String::fromUTF8(imp.module)));
+ obj->putDirect(vm, name, jsString(vm, String::fromUTF8(imp.field)));
+ obj->putDirect(vm, kind, jsString(vm, String(makeString(imp.kind))));
result->push(exec, obj);
RETURN_IF_EXCEPTION(throwScope, { });
}
@@ -146,13 +146,13 @@
const auto& exports = module->moduleInformation().exports;
if (exports.size()) {
- Identifier name = Identifier::fromString(exec, "name");
- Identifier kind = Identifier::fromString(exec, "kind");
+ Identifier name = Identifier::fromString(vm, "name");
+ Identifier kind = Identifier::fromString(vm, "kind");
for (const Wasm::Export& exp : exports) {
JSObject* obj = constructEmptyObject(exec);
RETURN_IF_EXCEPTION(throwScope, { });
- obj->putDirect(vm, name, jsString(exec, String::fromUTF8(exp.field)));
- obj->putDirect(vm, kind, jsString(exec, String(makeString(exp.kind))));
+ obj->putDirect(vm, name, jsString(vm, String::fromUTF8(exp.field)));
+ obj->putDirect(vm, kind, jsString(vm, String(makeString(exp.kind))));
result->push(exec, obj);
RETURN_IF_EXCEPTION(throwScope, { });
}
diff --git a/Source/JavaScriptCore/wasm/js/WebAssemblyModuleRecord.cpp b/Source/JavaScriptCore/wasm/js/WebAssemblyModuleRecord.cpp
index a23ee78..92ddcf7 100644
--- a/Source/JavaScriptCore/wasm/js/WebAssemblyModuleRecord.cpp
+++ b/Source/JavaScriptCore/wasm/js/WebAssemblyModuleRecord.cpp
@@ -73,7 +73,7 @@
Base::finishCreation(exec, vm);
ASSERT(inherits(vm, info()));
for (const auto& exp : moduleInformation.exports) {
- Identifier field = Identifier::fromString(&vm, String::fromUTF8(exp.field));
+ Identifier field = Identifier::fromString(vm, String::fromUTF8(exp.field));
addExportEntry(ExportEntry::createLocal(field, field));
}
}
@@ -126,8 +126,8 @@
continue;
}
- Identifier moduleName = Identifier::fromString(&vm, String::fromUTF8(import.module));
- Identifier fieldName = Identifier::fromString(&vm, String::fromUTF8(import.field));
+ Identifier moduleName = Identifier::fromString(vm, String::fromUTF8(import.module));
+ Identifier fieldName = Identifier::fromString(vm, String::fromUTF8(import.field));
JSValue value;
if (creationMode == Wasm::CreationMode::FromJS) {
// 1. Let o be the resultant value of performing Get(importObject, i.module_name).
@@ -441,7 +441,7 @@
bool shouldThrowReadOnlyError = false;
bool ignoreReadOnlyErrors = true;
bool putResult = false;
- symbolTablePutTouchWatchpointSet(moduleEnvironment, exec, Identifier::fromString(&vm, String::fromUTF8(exp.field)), exportedValue, shouldThrowReadOnlyError, ignoreReadOnlyErrors, putResult);
+ symbolTablePutTouchWatchpointSet(moduleEnvironment, exec, Identifier::fromString(vm, String::fromUTF8(exp.field)), exportedValue, shouldThrowReadOnlyError, ignoreReadOnlyErrors, putResult);
scope.assertNoException();
RELEASE_ASSERT(putResult);
}
diff --git a/Source/JavaScriptCore/wasm/js/WebAssemblyTableConstructor.cpp b/Source/JavaScriptCore/wasm/js/WebAssemblyTableConstructor.cpp
index 909c281..45c8eb1 100644
--- a/Source/JavaScriptCore/wasm/js/WebAssemblyTableConstructor.cpp
+++ b/Source/JavaScriptCore/wasm/js/WebAssemblyTableConstructor.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-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
@@ -60,7 +60,7 @@
Wasm::TableElementType type;
{
- Identifier elementIdent = Identifier::fromString(&vm, "element");
+ Identifier elementIdent = Identifier::fromString(vm, "element");
JSValue elementValue = memoryDescriptor->get(exec, elementIdent);
RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
String elementString = elementValue.toWTFString(exec);
@@ -73,7 +73,7 @@
return JSValue::encode(throwException(exec, throwScope, createTypeError(exec, "WebAssembly.Table expects its 'element' field to be the string 'funcref' or 'anyref'"_s)));
}
- Identifier initialIdent = Identifier::fromString(&vm, "initial");
+ Identifier initialIdent = Identifier::fromString(vm, "initial");
JSValue initialSizeValue = memoryDescriptor->get(exec, initialIdent);
RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
uint32_t initial = toNonWrappingUint32(exec, initialSizeValue);
@@ -82,7 +82,7 @@
// In WebIDL, "present" means that [[Get]] result is undefined, not [[HasProperty]] result.
// https://heycam.github.io/webidl/#idl-dictionaries
Optional<uint32_t> maximum;
- Identifier maximumIdent = Identifier::fromString(&vm, "maximum");
+ Identifier maximumIdent = Identifier::fromString(vm, "maximum");
JSValue maxSizeValue = memoryDescriptor->get(exec, maximumIdent);
RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
if (!maxSizeValue.isUndefined()) {
