Modified: branches/safari-612.1.21-branch/Source/_javascript_Core/ChangeLog (279434 => 279435)
--- branches/safari-612.1.21-branch/Source/_javascript_Core/ChangeLog 2021-06-30 22:17:44 UTC (rev 279434)
+++ branches/safari-612.1.21-branch/Source/_javascript_Core/ChangeLog 2021-06-30 22:18:46 UTC (rev 279435)
@@ -1,3 +1,7 @@
+2021-06-30 Alan Coon <[email protected]>
+
+ Revert r279253. rdar://problem/79987808
+
2021-06-25 Commit Queue <[email protected]>
Unreviewed, reverting r279266.
Modified: branches/safari-612.1.21-branch/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp (279434 => 279435)
--- branches/safari-612.1.21-branch/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp 2021-06-30 22:17:44 UTC (rev 279434)
+++ branches/safari-612.1.21-branch/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp 2021-06-30 22:18:46 UTC (rev 279435)
@@ -16754,7 +16754,7 @@
merge->appendSomeRegister(ptr);
merge->setGenerator([=] (CCallHelpers& jit, const StackmapGenerationParams& params) {
jit.move(params[2].gpr(), params[0].gpr());
- jit.bitFieldInsert64(params[1].gpr(), CCallHelpers::TrustedImm32(0), CCallHelpers::TrustedImm32(64 - MacroAssembler::maxNumberOfAllowedPACBits), params[0].gpr());
+ jit.bitFieldInsert64(params[1].gpr(), 0, 64 - MacroAssembler::maxNumberOfAllowedPACBits, params[0].gpr());
});
result = doUntagArrayPtr(merge);
Modified: branches/safari-612.1.21-branch/Source/_javascript_Core/jit/AssemblyHelpers.cpp (279434 => 279435)
--- branches/safari-612.1.21-branch/Source/_javascript_Core/jit/AssemblyHelpers.cpp 2021-06-30 22:17:44 UTC (rev 279434)
+++ branches/safari-612.1.21-branch/Source/_javascript_Core/jit/AssemblyHelpers.cpp 2021-06-30 22:18:46 UTC (rev 279435)
@@ -1111,7 +1111,7 @@
addPtr(TrustedImmPtr(Gigacage::basePtr(kind)), storage);
#if CPU(ARM64E)
if (kind == Gigacage::Primitive)
- bitFieldInsert64(storage, TrustedImm32(0), TrustedImm32(64 - maxNumberOfAllowedPACBits), tempReg);
+ bitFieldInsert64(storage, 0, 64 - maxNumberOfAllowedPACBits, tempReg);
if (skip.isSet())
skip.link(this);
#endif
@@ -1148,7 +1148,7 @@
ASSERT(LogicalImmediate::create64(Gigacage::mask(kind)).isValid());
andPtr(TrustedImmPtr(Gigacage::mask(kind)), tempReg);
addPtr(scratch, tempReg);
- bitFieldInsert64(tempReg, TrustedImm32(0), TrustedImm32(64 - maxNumberOfAllowedPACBits), storage);
+ bitFieldInsert64(tempReg, 0, 64 - maxNumberOfAllowedPACBits, storage);
#else
andPtr(TrustedImmPtr(Gigacage::mask(kind)), storage);
addPtr(scratch, storage);
