paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-11 18:08:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Debugger: Correctly store names for function refs. The name was wrongly stored as part of the type, making it equal for all entries in an array. Issue #40604

Browse Source 
(cherry picked from commit 415660120f)
This commit is contained in:
Martin 2023-11-15 22:02:07 +01:00
parent c9efedc227
commit c6d4ee73be
1 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
ide/packages/idedebugger/idedebuggerwatchresult.pas
View File

@ -534,7 +534,6 @@ type
TWatchResultTypeProc = object(TWatchResultValue)
private
FText: String;
FLoc: String;
protected
property GetAsString: String read FText;
procedure LoadDataFromXMLConfig(const AConfig: TXMLConfig; const APath: string;
@ -544,22 +543,36 @@ type
procedure SaveDataToXMLConfig(const AConfig: TXMLConfig; const APath: string; AnAsProto: Boolean);
end;
TWatchResultValueFunc = object(TWatchResultValueOrdNumBase)
{ TWatchResultValueProcBase }
TWatchResultValueProcBase = object(TWatchResultValueOrdNumBase)
private
FLoc: String;
protected
procedure LoadDataFromXMLConfig(const AConfig: TXMLConfig; const APath: string;
const AnEntryTemplate: TWatchResultData;
var AnOverrideTemplate: TOverrideTemplateData;
AnAsProto: Boolean);
procedure SaveDataToXMLConfig(const AConfig: TXMLConfig; const APath: string; AnAsProto: Boolean);
end;
TWatchResultValueFunc = object(TWatchResultValueProcBase)
protected const
VKind = rdkFunction;
end;
TWatchResultValueProc = object(TWatchResultValueOrdNumBase)
TWatchResultValueProc = object(TWatchResultValueProcBase)
protected const
VKind = rdkProcedure;
end;
TWatchResultValueFuncRef = object(TWatchResultValueOrdNumBase)
TWatchResultValueFuncRef = object(TWatchResultValueProcBase)
protected const
VKind = rdkFunctionRef;
end;
TWatchResultValueProcRef = object(TWatchResultValueOrdNumBase)
TWatchResultValueProcRef = object(TWatchResultValueProcBase)
protected const
VKind = rdkProcedureRef;
end;
@ -2386,6 +2399,24 @@ begin
AConfig.SetValue(APath + 'Desc', FText);
end;
{ TWatchResultValueProcBase }
procedure TWatchResultValueProcBase.LoadDataFromXMLConfig(
const AConfig: TXMLConfig; const APath: string;
const AnEntryTemplate: TWatchResultData;
var AnOverrideTemplate: TOverrideTemplateData; AnAsProto: Boolean);
begin
inherited LoadDataFromXMLConfig(AConfig, APath, AnEntryTemplate, AnOverrideTemplate, AnAsProto);
FLoc := AConfig.GetValue(APath + 'Loc', '');
end;
procedure TWatchResultValueProcBase.SaveDataToXMLConfig(
const AConfig: TXMLConfig; const APath: string; AnAsProto: Boolean);
begin
inherited SaveDataToXMLConfig(AConfig, APath, AnAsProto);
AConfig.SetValue(APath + 'Loc', FLoc);
end;
{ TWatchResultStorageOverrides }
procedure TWatchResultStorageOverrides.Assign(
@ -4839,7 +4870,7 @@ end;
function TGenericWatchResultDataProc.GetAsString: String;
begin
Result := FType.FLoc;
Result := FData.FLoc;
end;
function TGenericWatchResultDataProc.GetAsDesc: String;
@ -4851,7 +4882,7 @@ constructor TGenericWatchResultDataProc.Create(AnAddr: QWord; ALoc,
ADesc: String);
begin
FType.FText := ADesc;
FType.FLoc := ALoc;
FData.FLoc := ALoc;
FData.FNumValue := AnAddr;
inherited Create();
end;