paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-16 01:00:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

FpDebug: Allow ClassType.Field => for static fields / return type on none static fields

Browse Source 
git-svn-id: trunk@63770 -
This commit is contained in:
martin 2020-08-17 21:50:36 +00:00
parent 67a21fe3bb
commit 2e3e27feb2
3 changed files with 66 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
components/fpdebug/fpdbgdwarf.pas
View File

@ -104,7 +104,7 @@ type
property StackFrame: Integer read FStackFrame write FStackFrame;
procedure ApplyContext(AVal: TFpValue); inline;
function SymbolToValue(ASym: TFpSymbol): TFpValue; inline;
function SymbolToValue(ASym: TFpSymbolDwarf): TFpValue; inline;
function GetSelfParameter: TFpValueDwarf;
function FindExportedSymbolInUnits(const AName: String; PNameUpper, PNameLower: PChar;
@ -142,12 +142,16 @@ type
TFpValueDwarfTypeDefinition = class(TFpValueDwarfBase)
private
FSymbol: TFpSymbol; // stType
FSymbol: TFpSymbolDwarf; // stType
protected
function GetKind: TDbgSymbolKind; override;
function GetDbgSymbol: TFpSymbol; override;
function GetMemberCount: Integer; override;
function GetMemberByName(AIndex: String): TFpValue; override;
function GetMember(AIndex: Int64): TFpValue; override;
public
constructor Create(ASymbol: TFpSymbol); // Only for stType
constructor Create(ASymbol: TFpSymbolDwarf); // Only for stType
destructor Destroy; override;
function GetTypeCastedValue(ADataVal: TFpValue): TFpValue; override;
end;
@ -1206,7 +1210,7 @@ begin
TFpValueDwarfBase(AVal).FContext := Self;
end;
function TFpDwarfInfoAddressContext.SymbolToValue(ASym: TFpSymbol): TFpValue;
function TFpDwarfInfoAddressContext.SymbolToValue(ASym: TFpSymbolDwarf): TFpValue;
begin
if ASym = nil then begin
Result := nil;
@ -1518,7 +1522,30 @@ begin
Result := FSymbol;
end;
constructor TFpValueDwarfTypeDefinition.Create(ASymbol: TFpSymbol);
function TFpValueDwarfTypeDefinition.GetMemberCount: Integer;
begin
Result := FSymbol.NestedSymbolCount;
end;
function TFpValueDwarfTypeDefinition.GetMemberByName(AIndex: String): TFpValue;
begin
Result := FSymbol.GetNestedValueByName(AIndex);
if Result = nil then
exit;
// TFpValueDwarf(Result).SetStructureValue(Self);
TFpValueDwarf(Result).FContext := FContext;
end;
function TFpValueDwarfTypeDefinition.GetMember(AIndex: Int64): TFpValue;
begin
Result := FSymbol.GetNestedValue(AIndex);
if Result = nil then
exit;
// TFpValueDwarf(Result).SetStructureValue(Self);
TFpValueDwarf(Result).FContext := FContext;
end;
constructor TFpValueDwarfTypeDefinition.Create(ASymbol: TFpSymbolDwarf);
begin
inherited Create;
FSymbol := ASymbol;
@ -4793,7 +4820,9 @@ end;
function TFpSymbolDwarfDataMember.HasAddress: Boolean;
begin
Result := (InformationEntry.HasAttrib(DW_AT_data_member_location));
// DW_AT_data_member_location defaults to zero => i.e. at the start of the containing structure
Result := not (InformationEntry.HasAttrib(DW_AT_const_value));
//(InformationEntry.HasAttrib(DW_AT_data_member_location));
end;
{ TFpSymbolDwarfTypeStructure }

2
components/fpdebug/fpdbginfo.pas
View File

@ -1092,7 +1092,7 @@ end;
function TFpValueTypeDefinition.GetKind: TDbgSymbolKind;
begin
Result := skNone;
Result := skType;
end;
function TFpValueTypeDefinition.GetDbgSymbol: TFpSymbol;

32
components/fpdebug/fppascalparser.pas
View File

@ -3387,6 +3387,8 @@ end;
function TFpPascalExpressionPartOperatorMemberOf.DoGetResultValue: TFpValue;
var
tmp: TFpValue;
MemberName: String;
MemberSym: TFpSymbol;
{$IFDEF FpDebugAutoDerefMember}
tmp2: TFpValue;
{$ENDIF}
@ -3397,6 +3399,8 @@ begin
tmp := Items[0].ResultValue;
if (tmp = nil) then exit;
MemberName := Items[1].GetText;
{$IFDEF FpDebugAutoDerefMember}
// Copy from TFpPascalExpressionPartOperatorDeRef.DoGetResultValue
tmp2 := nil;
@ -3415,9 +3419,9 @@ begin
{$ENDIF}
if (tmp.Kind in [skClass, skRecord, skObject]) then begin
Result := tmp.MemberByName[Items[1].GetText];
Result := tmp.MemberByName[MemberName];
if Result = nil then begin
SetError(fpErrNoMemberWithName, [Items[1].GetText]);
SetError(fpErrNoMemberWithName, [MemberName]);
exit;
end;
{$IFDEF WITH_REFCOUNT_DEBUG}Result.DbgRenameReference(nil, 'DoGetResultValue'){$ENDIF};
@ -3428,6 +3432,30 @@ begin
tmp2.ReleaseReference;
{$ENDIF}
if (tmp.Kind in [skType]) and
(tmp.DbgSymbol <> nil) and (tmp.DbgSymbol.Kind in [skClass, skRecord, skObject])
then begin
Result := tmp.MemberByName[MemberName];
if Result <> nil then begin
// only class fields/constants can have an address without valid "self" instance
if IsReadableLoc(result.DataAddress) then begin // result.Address?
{$IFDEF WITH_REFCOUNT_DEBUG}Result.DbgRenameReference(nil, 'DoGetResultValue'){$ENDIF};
exit;
end
else begin
ReleaseRefAndNil(Result);
MemberSym := tmp.DbgSymbol.NestedSymbolByName[MemberName];
if MemberSym <> nil then begin
Result := TFpValueTypeDefinition.Create(MemberSym);
{$IFDEF WITH_REFCOUNT_DEBUG}Result.DbgRenameReference(nil, 'DoGetResultValue'){$ENDIF};
exit;
end;
end;
end;
SetError(fpErrNoMemberWithName, [Items[1].GetText]);
exit
end;
// Todo unit
SetError(fpErrorNotAStructure, [Items[1].GetText, Items[0].GetText]);