From d8689e5c87143536d15212bc32cfbb6d3f1e9e2d Mon Sep 17 00:00:00 2001 From: Martin Date: Tue, 10 Oct 2023 19:26:48 +0200 Subject: [PATCH] LazDebugger[Fp]Lldb: fix for new Apple-LLDB version. Read new format for eval results (e.g. exception data) (cherry picked from commit 07025f3b9c76b101a7a5cb683e49f4c74d918d55) --- .../lazdebuggerlldb/lldbinstructions.pas | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/components/lazdebuggers/lazdebuggerlldb/lldbinstructions.pas b/components/lazdebuggers/lazdebuggerlldb/lldbinstructions.pas index 44853e1dd6..2c30a50d51 100644 --- a/components/lazdebuggers/lazdebuggerlldb/lldbinstructions.pas +++ b/components/lazdebuggers/lazdebuggerlldb/lldbinstructions.pas @@ -1107,17 +1107,27 @@ begin exit; end; + // error: use of undeclared identifier 'i' + // (int) $0 = 133 + // (LONGINT) I = 99 + // (ANSISTRING) $1 = 0x005aac80 if StrMatches(AData, ['(', ')', ' = ', ''], found) then begin FRes := AData; FCurly := 0; if ParseStruct(found[2]) then SetContentReceieved; exit; + end + else + // (char *) 0x0000000111246cd8 "\"\" is not a valid boolean." + // (unsigned long) 0x0000000106e6f8a0 + if StrMatches(AData, ['(', ') ', ''], found) then begin + FRes := AData; + FCurly := 0; + if ParseStruct(found[1]) then + SetContentReceieved; + exit; end; -// error: use of undeclared identifier 'i' -// (int) $0 = 133 -// (LONGINT) I = 99 -// (ANSISTRING) $1 = 0x005aac80 Result := inherited ProcessInputFromDbg(AData); end;