Title: [291380] trunk/Source/_javascript_Core
- Revision
- 291380
- Author
- drou...@apple.com
- Date
- 2022-03-16 17:39:04 -0700 (Wed, 16 Mar 2022)
Log Message
Web Inspector: REGRESSION(r290720): Debugger: Step next should not behave the same as Step into
https://bugs.webkit.org/show_bug.cgi?id=237936
Reviewed by Joseph Pecoraro.
Covered by existing tests (not sure why they don't fail on EWS, but they fail locally).
* debugger/Debugger.cpp:
(JSC::Debugger::pauseIfNeeded):
Checking that the desired `CallFrame` matches the current `CallFrame` is enough to determine
whether the `Debugger` should pause for Step next and Step out, as both of those actions set
a desired `CallFrame`. We explicitly do not want to check for the `bool` flags that indicate
those actions because they have different behaviors regarding the current `CallFrame` (the
former desires the same `CallFrame` and the latter desires the parent `CallFrame`). This
patch partially reverts r290720.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (291379 => 291380)
--- trunk/Source/_javascript_Core/ChangeLog 2022-03-17 00:36:45 UTC (rev 291379)
+++ trunk/Source/_javascript_Core/ChangeLog 2022-03-17 00:39:04 UTC (rev 291380)
@@ -1,3 +1,21 @@
+2022-03-16 Devin Rousso <drou...@apple.com>
+
+ Web Inspector: REGRESSION(r290720): Debugger: Step next should not behave the same as Step into
+ https://bugs.webkit.org/show_bug.cgi?id=237936
+
+ Reviewed by Joseph Pecoraro.
+
+ Covered by existing tests (not sure why they don't fail on EWS, but they fail locally).
+
+ * debugger/Debugger.cpp:
+ (JSC::Debugger::pauseIfNeeded):
+ Checking that the desired `CallFrame` matches the current `CallFrame` is enough to determine
+ whether the `Debugger` should pause for Step next and Step out, as both of those actions set
+ a desired `CallFrame`. We explicitly do not want to check for the `bool` flags that indicate
+ those actions because they have different behaviors regarding the current `CallFrame` (the
+ former desires the same `CallFrame` and the latter desires the parent `CallFrame`). This
+ patch partially reverts r290720.
+
2022-03-16 Angelos Oikonomopoulos <ange...@igalia.com>
MacroAssemblerARMv7: Be friendlier to DisallowMacroScratchRegisterUsage
Modified: trunk/Source/_javascript_Core/debugger/Debugger.cpp (291379 => 291380)
--- trunk/Source/_javascript_Core/debugger/Debugger.cpp 2022-03-17 00:36:45 UTC (rev 291379)
+++ trunk/Source/_javascript_Core/debugger/Debugger.cpp 2022-03-17 00:39:04 UTC (rev 291380)
@@ -887,7 +887,7 @@
if (m_pauseAtNextOpportunity) {
pauseNow = true;
didPauseForStep = !afterBlackboxedScript;
- } else if (m_pauseOnStepNext || m_pauseOnStepOut || (m_pauseOnCallFrame == m_currentCallFrame)) {
+ } else if (m_pauseOnCallFrame == m_currentCallFrame) {
pauseNow = true;
didPauseForStep = true;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
