paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-28 16:40:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

codetools: replace helper: keep AVLNode, it may be in use by the iterator

Browse Source 
git-svn-id: trunk@49993 -
This commit is contained in:
mattias 2015-10-08 13:38:33 +00:00
parent c18721377e
commit 851bfd3a7d
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
components/codetools/finddeclarationtool.pas
View File

@ -1430,14 +1430,17 @@ begin
if ExprType.Desc in xtAllIdentTypes then
begin
if Kind=fdhlkDelphiHelper then begin
// class/type/record helpers only allow one helepr per class
// class/type/record helpers only allow one helper per class
OldKey := FTree.FindKey(@ExprType, @CompareHelpersListExprType);
if OldKey <> nil then
begin
if Replace then
FTree.FreeAndDelete(OldKey)
else
Exit(TFDHelpersListItem(OldKey.Data));
Result:=TFDHelpersListItem(OldKey.Data);
if Replace then begin
// keep AVLNode, it may be in use by the iterator of SearchInHelpers
Result.HelperContext.Node := HelperNode;
Result.HelperContext.Tool := Tool;
end;
exit;
end;
end;
@ -12210,6 +12213,8 @@ begin
Result:=TFDHelpersList.Create(HelperKind);
FHelpers[HelperKind]:=Result;
FFreeHelpers[HelperKind]:=true;
//if HelperKind=fdhlkDelphiHelper then
// debugln(['TFindDeclarationParams.GetHelpers Self=',dbgs(Pointer(Self)),' Helper=',dbgs(Pointer(FHelpers[HelperKind]))]);
end;
end;