Changeset 262478 in webkit for trunk/Source/JavaScriptCore/ftl/FTLOSRExitCompiler.cpp

Timestamp:

Jun 2, 2020, 11:25:50 PM (5 years ago)

Author:

[email protected]

Message:

Rolling out r262475 to unbreak Windows bot.
​https://bugs.webkit.org/show_bug.cgi?id=212680

Not reviewed.

• CMakeLists.txt:
• JavaScriptCore.xcodeproj/project.pbxproj:
• Sources.txt:
• assembler/MacroAssemblerARM64.h:
• assembler/MacroAssemblerX86_64.h:
• assembler/testmasm.cpp:

(JSC::testCountTrailingZeros64WithoutNullCheck):
(JSC::run):
(JSC::testStore64Imm64AddressPointer): Deleted.

• dfg/DFGDoesGCCheck.cpp: Removed.
• dfg/DFGDoesGCCheck.h: Removed.
• dfg/DFGGraph.cpp:
• dfg/DFGOSRExit.cpp:

(JSC::DFG::operationCompileOSRExit):
(JSC::DFG::OSRExit::compileExit):

• dfg/DFGSpeculativeJIT64.cpp:

(JSC::DFG::SpeculativeJIT::compile):

• ftl/FTLLowerDFGToB3.cpp:

(JSC::FTL::DFG::LowerDFGToB3::compileNode):

• ftl/FTLOSRExitCompiler.cpp:

(JSC::FTL::compileStub):
(JSC::FTL::operationCompileFTLOSRExit):

• heap/CompleteSubspace.cpp:

(JSC::CompleteSubspace::tryAllocateSlow):
(JSC::CompleteSubspace::reallocatePreciseAllocationNonVirtual):

• heap/CompleteSubspaceInlines.h:

(JSC::CompleteSubspace::allocateNonVirtual):

• heap/DeferGC.h:

(JSC::DeferGC::~DeferGC):

• heap/GCDeferralContextInlines.h:

(JSC::GCDeferralContext::~GCDeferralContext):

• heap/Heap.cpp:

(JSC::Heap::collectNow):
(JSC::Heap::collectAsync):
(JSC::Heap::collectSync):
(JSC::Heap::stopIfNecessarySlow):
(JSC::Heap::collectIfNecessaryOrDefer):

• heap/Heap.h:

(JSC::Heap::expectDoesGC const):
(JSC::Heap::setExpectDoesGC):
(JSC::Heap::addressOfExpectDoesGC):
(JSC::Heap::addressOfDoesGC): Deleted.
(JSC::Heap::setDoesGCExpectation): Deleted.
(JSC::Heap::verifyCanGC): Deleted.

• heap/HeapInlines.h:

(JSC::Heap::acquireAccess):
(JSC::Heap::stopIfNecessary):

• heap/LocalAllocatorInlines.h:

(JSC::LocalAllocator::allocate):

• heap/PreciseAllocation.cpp:

(JSC::PreciseAllocation::tryCreate):
(JSC::PreciseAllocation::createForLowerTier):

• runtime/JSString.h:

(JSC::jsSingleCharacterString):
(JSC::JSString::toAtomString const):
(JSC::JSString::toExistingAtomString const):
(JSC::JSString::value const):
(JSC::JSString::tryGetValue const):
(JSC::JSRopeString::unsafeView const):
(JSC::JSRopeString::viewWithUnderlyingString const):
(JSC::JSString::unsafeView const):

• runtime/RegExpMatchesArray.h:

(JSC::createRegExpMatchesArray):

File:

• trunk/Source/JavaScriptCore/ftl/FTLOSRExitCompiler.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/ftl/FTLOSRExitCompiler.cpp

@@ -212 +212 @@
         // materialization below.
 
-        // Even though we set Heap::m_doesGC in compileFTLOSRExit(), we also need
+        // Even though we set Heap::m_expectDoesGC in compileFTLOSRExit(), we also need
         // to set it here because compileFTLOSRExit() is only called on the first time
         // we exit from this site, but all subsequent exits will take this compiled
         // ramp without calling compileFTLOSRExit() first.
-        jit.store64(CCallHelpers::TrustedImm64(DoesGCCheck::encode(true, DoesGCCheck::Special::FTLOSRExit)), vm.heap.addressOfDoesGC());
+        jit.store8(CCallHelpers::TrustedImm32(true), vm.heap.addressOfExpectDoesGC());
     }
 
@@ -549 +549 @@
         // We're about to exit optimized code. So, there's no longer any optimized
         // code running that expects no GC.
-        vm.heap.setDoesGCExpectation(true, DoesGCCheck::Special::FTLOSRExit);
+        vm.heap.setExpectDoesGC(true);
     }