paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-26 15:49:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

FpDebug: find self in class procedure

Browse Source
This commit is contained in:
Martin 2023-03-25 08:45:20 +01:00
parent 9ee0ad85fa
commit 0deadb0dbb
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/fpdebug/fpdbgdwarf.pas
View File

@ -6672,7 +6672,7 @@ begin
end; end;
var var
ThisNameInfo, SelfNameInfo: TNameSearchInfo; ThisNameInfo, SelfDollarNameInfo, SelfNameInfo: TNameSearchInfo;
function TFpSymbolDwarfDataProc.GetSelfParameter(AnAddress: TDbgPtr): TFpValueDwarf; function TFpSymbolDwarfDataProc.GetSelfParameter(AnAddress: TDbgPtr): TFpValueDwarf;
var var
InfoEntry: TDwarfInformationEntry; InfoEntry: TDwarfInformationEntry;
@ -6681,6 +6681,7 @@ var
begin begin
// special: search "self" // special: search "self"
// Todo nested procs // Todo nested procs
// TODO: move to FreePascal unit
Result := nil; Result := nil;
InfoEntry := InformationEntry.Clone; InfoEntry := InformationEntry.Clone;
//StartScopeIdx := InfoEntry.ScopeIndex; //StartScopeIdx := InfoEntry.ScopeIndex;
@ -6691,6 +6692,12 @@ begin
found := InfoEntry.GoNamedChildEx(ThisNameInfo); found := InfoEntry.GoNamedChildEx(ThisNameInfo);
if found then if found then
found := InfoEntry.IsArtificial; found := InfoEntry.IsArtificial;
if not found then begin
InfoEntry.ScopeIndex := InformationEntry.ScopeIndex;
found := InfoEntry.GoNamedChildEx(SelfDollarNameInfo);
if found then
found := InfoEntry.IsArtificial;
end;
if not found then begin if not found then begin
InfoEntry.ScopeIndex := InformationEntry.ScopeIndex; InfoEntry.ScopeIndex := InformationEntry.ScopeIndex;
found := InfoEntry.GoNamedChildEx(SelfNameInfo); found := InfoEntry.GoNamedChildEx(SelfNameInfo);
@ -6930,7 +6937,8 @@ initialization
FPDBG_DWARF_DATA_WARNINGS := DebugLogger.FindOrRegisterLogGroup('FPDBG_DWARF_DATA_WARNINGS' {$IFDEF FPDBG_DWARF_DATA_WARNINGS} , True {$ENDIF} ); FPDBG_DWARF_DATA_WARNINGS := DebugLogger.FindOrRegisterLogGroup('FPDBG_DWARF_DATA_WARNINGS' {$IFDEF FPDBG_DWARF_DATA_WARNINGS} , True {$ENDIF} );
ThisNameInfo := NameInfoForSearch('THIS'); ThisNameInfo := NameInfoForSearch('THIS');
SelfNameInfo := NameInfoForSearch('$SELF'); SelfNameInfo := NameInfoForSearch('SELF');
SelfDollarNameInfo := NameInfoForSearch('$SELF');
end. end.