From 11ad3881e8a92703aadd5ea03a74f3f4416cc7e7 Mon Sep 17 00:00:00 2001
From: martin <laz.git@mfriebe.de>
Date: Fri, 24 Apr 2020 20:08:13 +0000
Subject: [PATCH] FpDebug: stepping, avoid double step out.

git-svn-id: trunk@63062 -
---
 components/fpdebug/fpdbgcontroller.pas | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/components/fpdebug/fpdbgcontroller.pas b/components/fpdebug/fpdbgcontroller.pas
index 41bfa5e367..f048f870b9 100644
--- a/components/fpdebug/fpdbgcontroller.pas
+++ b/components/fpdebug/fpdbgcontroller.pas
@@ -545,13 +545,13 @@ begin
   if not FController.NextOnlyStopOnStartLine then
     exit;
 
-  if IsAtLastHiddenBreakAddr then begin
+  FStepInfoUnavailAfterStepOut := not IsAtLastHiddenBreakAddr;
+  if not FStepInfoUnavailAfterStepOut then begin
     {$PUSH}{$Q-}{$R-}
     FThread.StoreStepInfo(FThread.GetInstructionPointerRegisterValue +
       FThread.GetInstructionPointerRegisterValue - 1);
     {$POP}
   end;
-  FStepInfoUnavailAfterStepOut := not IsAtLastHiddenBreakAddr;
   FStepInfoUpdatedForStepOut := True;
 end;
 
@@ -559,14 +559,21 @@ function TDbgControllerLineStepBaseCmd.HasSteppedAwayFromOriginLine: boolean;
 var
   CompRes: TFPDCompareStepInfo;
 begin
-  Result := IsSteppedOut and (not FController.NextOnlyStopOnStartLine);
-  if Result then
-    exit;
+  Result := IsSteppedOut;
+  if Result then begin
+    Result := (not FController.NextOnlyStopOnStartLine);
+    if Result then
+      exit;
 
-// LIMIT steps ? // avoid further stepping out ? // stop at leave/ret ?
-  if IsSteppedOut and FStepInfoUnavailAfterStepOut then begin
-    Result := FController.FCurrentThread.IsAtStartOfLine;
-    exit;
+    // If stepped out, do not step out again
+    Result := NextInstruction.IsLeaveStackFrame or NextInstruction.IsReturnInstruction;
+    if Result then
+      exit;
+
+    if FStepInfoUnavailAfterStepOut then begin
+      Result := FController.FCurrentThread.IsAtStartOfLine;
+      exit;
+    end;
   end;
 
   CompRes := FThread.CompareStepInfo;