Modified: trunk/Source/_javascript_Core/ChangeLog (292100 => 292101)
--- trunk/Source/_javascript_Core/ChangeLog 2022-03-30 08:19:53 UTC (rev 292100)
+++ trunk/Source/_javascript_Core/ChangeLog 2022-03-30 08:32:00 UTC (rev 292101)
@@ -1,3 +1,16 @@
+2022-03-30 Mark Lam <[email protected]>
+
+ Remove obsolete --useProbeOSRExit option.
+ https://bugs.webkit.org/show_bug.cgi?id=238534
+
+ Reviewed by Saam Barati.
+
+ * dfg/DFGJITCompiler.cpp:
+ (JSC::DFG::JITCompiler::link):
+ * runtime/Options.cpp:
+ (JSC::Options::recomputeDependentOptions):
+ * runtime/OptionsList.h:
+
2022-03-29 Yusuke Suzuki <[email protected]>
[JSC] Use constants buffer to load JSGlobalObject in BaselineJIT thunks
Modified: trunk/Source/_javascript_Core/dfg/DFGJITCompiler.cpp (292100 => 292101)
--- trunk/Source/_javascript_Core/dfg/DFGJITCompiler.cpp 2022-03-30 08:19:53 UTC (rev 292100)
+++ trunk/Source/_javascript_Core/dfg/DFGJITCompiler.cpp 2022-03-30 08:32:00 UTC (rev 292101)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011-2021 Apple Inc. All rights reserved.
+ * Copyright (C) 2011-2022 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -248,11 +248,11 @@
auto target = CodeLocationLabel<JITThunkPtrTag>(osrExitThunk.code());
for (unsigned i = 0; i < m_osrExit.size(); ++i) {
OSRExitCompilationInfo& info = m_exitCompilationInfo[i];
- if (!Options::useProbeOSRExit()) {
- linkBuffer.link(info.m_patchableJump.m_jump, target);
- OSRExit& exit = m_osrExit[i];
- exit.m_patchableJumpLocation = linkBuffer.locationOf<JSInternalPtrTag>(info.m_patchableJump);
- }
+
+ linkBuffer.link(info.m_patchableJump.m_jump, target);
+ OSRExit& exit = m_osrExit[i];
+ exit.m_patchableJumpLocation = linkBuffer.locationOf<JSInternalPtrTag>(info.m_patchableJump);
+
if (info.m_replacementSource.isSet()) {
m_jitCode->common.m_jumpReplacements.append(JumpReplacement(
linkBuffer.locationOf<JSInternalPtrTag>(info.m_replacementSource),
Modified: trunk/Source/_javascript_Core/runtime/Options.cpp (292100 => 292101)
--- trunk/Source/_javascript_Core/runtime/Options.cpp 2022-03-30 08:19:53 UTC (rev 292100)
+++ trunk/Source/_javascript_Core/runtime/Options.cpp 2022-03-30 08:32:00 UTC (rev 292101)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011-2021 Apple Inc. All rights reserved.
+ * Copyright (C) 2011-2022 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -538,10 +538,6 @@
if (Options::softReservedZoneSize() < Options::reservedZoneSize() + minimumReservedZoneSize)
Options::softReservedZoneSize() = Options::reservedZoneSize() + minimumReservedZoneSize;
- // FIXME: Make probe OSR exit work on 32-bit:
- // https://bugs.webkit.org/show_bug.cgi?id=177956
- Options::useProbeOSRExit() = false;
-
if (!Options::useCodeCache())
Options::diskCachePath() = nullptr;
Modified: trunk/Source/_javascript_Core/runtime/OptionsList.h (292100 => 292101)
--- trunk/Source/_javascript_Core/runtime/OptionsList.h 2022-03-30 08:19:53 UTC (rev 292100)
+++ trunk/Source/_javascript_Core/runtime/OptionsList.h 2022-03-30 08:32:00 UTC (rev 292101)
@@ -156,7 +156,6 @@
v(Bool, verboseCompilation, false, Normal, nullptr) \
v(Bool, verboseFTLCompilation, false, Normal, nullptr) \
v(Bool, logCompilationChanges, false, Normal, nullptr) \
- v(Bool, useProbeOSRExit, false, Normal, nullptr) \
v(Bool, printEachOSRExit, false, Normal, nullptr) \
v(Bool, validateDoesGC, ASSERT_ENABLED, Normal, nullptr) \
v(Bool, validateGraph, false, Normal, nullptr) \
