From 26b8234ad0e6f6ed66863f9578c9af67aedba6a1 Mon Sep 17 00:00:00 2001
From: martin <laz.git@mfriebe.de>
Date: Sat, 9 Nov 2013 11:52:49 +0000
Subject: [PATCH] FPDebug: scan class parents

git-svn-id: trunk@43399 -
---
 components/fpdebug/fpdbgdwarf.pas | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/components/fpdebug/fpdbgdwarf.pas b/components/fpdebug/fpdbgdwarf.pas
index 557dee14e1..094dd50e3f 100644
--- a/components/fpdebug/fpdbgdwarf.pas
+++ b/components/fpdebug/fpdbgdwarf.pas
@@ -1398,11 +1398,13 @@ end;
 function TDbgDwarfInfoAddressContext.FindSymbol(const AName: String): TDbgSymbol;
 var
   SubRoutine: TDbgDwarfProcSymbol; // TDbgSymbol;
-  CU, CU2: TDwarfCompilationUnit;
+  CU, CU2, FwdCompUint: TDwarfCompilationUnit;
   //Scope,
   StartScopeIdx, ExtVal, i: Integer;
-  InfoEntry: TDwarfInformationEntry;
+  InfoEntry, InfoEntryTmp, InfoEntryParent: TDwarfInformationEntry;
   s, InfoName: String;
+  FwdInfoPtr: Pointer;
+  tg: Cardinal;
 begin
   Result := nil;
   if (FSymbol = nil) or not(FSymbol is TDbgDwarfProcSymbol) then
@@ -1429,12 +1431,35 @@ begin
         end;
       end;
 
+      tg := InfoEntry.Abbrev.tag;
+
       if InfoEntry.GoNamedChildEx(AName) then begin
         Result := TDbgDwarfIdentifier.CreateSubClass(AName, InfoEntry);
         DebugLn(FPDBG_DWARF_SEARCH, ['TDbgDwarf.FindIdentifier found ', dbgs(InfoEntry.FScope, CU), DbgSName(Result)]);
         exit;
       end;
 
+      if (tg = DW_TAG_class_type) or (tg = DW_TAG_structure_type) then begin
+        // search parent class
+        InfoEntry.ScopeIndex := StartScopeIdx;
+        InfoEntryParent := InfoEntry.FindChildByTag(DW_TAG_inheritance);
+        while (InfoEntryParent <> nil) and (InfoEntryParent.ReadReference(DW_AT_type, FwdInfoPtr, FwdCompUint)) do begin
+          InfoEntryParent.ReleaseReference;
+          InfoEntryParent := TDwarfInformationEntry.Create(FwdCompUint, FwdInfoPtr);
+          DebugLn(FPDBG_DWARF_SEARCH, ['TDbgDwarf.FindIdentifier  PARENT ', dbgs(InfoEntryParent, FwdCompUint) ]);
+          if InfoEntryParent.GoNamedChildEx(AName) then begin
+            Result := TDbgDwarfIdentifier.CreateSubClass(AName, InfoEntryParent);
+            InfoEntryParent.ReleaseReference;
+            DebugLn(FPDBG_DWARF_SEARCH, ['TDbgDwarf.FindIdentifier found ', dbgs(InfoEntryParent.FScope, CU), DbgSName(Result)]);
+            exit;
+          end;
+          InfoEntryTmp := InfoEntryParent.FindChildByTag(DW_TAG_inheritance);
+          InfoEntryParent.ReleaseReference;
+          InfoEntryParent := InfoEntryTmp;
+        end;
+        InfoEntryParent.ReleaseReference;
+      end;
+
       // Search parent(s)
       InfoEntry.ScopeIndex := StartScopeIdx;
       InfoEntry.GoParent;