From b09cdf35a55c30a7b4174868f2145eb4fe54b8d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Van=20Canneyt?= <michael@freepascal.org>
Date: Tue, 18 Mar 2025 15:04:59 +0100
Subject: [PATCH] * Derefmap as dyn array
---
compiler/fmodule.pas | 13 +++++--------
compiler/fppu.pas | 3 +--
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/compiler/fmodule.pas b/compiler/fmodule.pas
index 42b8e2b076..860561cd90 100644
--- a/compiler/fmodule.pas
+++ b/compiler/fmodule.pas
@@ -103,7 +103,7 @@ interface
{ modulename, used during ppu load }
modulename : pshortstring;
end;
- pderefmap = ^tderefmaprec;
+ tderefmaparray = array of tderefmaprec;
{ tmodule }
@@ -141,7 +141,7 @@ interface
moduleid : longint;
unitmap : punitmap; { mapping of all used units }
unitmapsize : longint; { number of units in the map }
- derefmap : pderefmap; { mapping of all units needed for deref }
+ derefmap : tderefmaparray; { mapping of all units needed for deref }
derefmapcnt : longint; { number of units in the map }
derefmapsize : longint; { number of units in the map }
derefdataintflen : longint;
@@ -688,8 +688,8 @@ implementation
begin
for i:=0 to derefmapcnt-1 do
stringdispose(derefmap[i].modulename);
- freemem(derefmap);
end;
+ derefmap:=nil;
if assigned(_exports) then
_exports.free;
if assigned(dllscannerinputlist) then
@@ -885,9 +885,8 @@ implementation
begin
for i:=0 to derefmapcnt-1 do
stringdispose(derefmap[i].modulename);
- freemem(derefmap);
- derefmap:=nil;
end;
+ derefmap:=nil;
unitmapsize:=0;
derefmapsize:=0;
derefmapcnt:=0;
@@ -1156,9 +1155,7 @@ implementation
{ Extend Derefmap }
oldmapsize:=derefmapsize;
derefmapsize:=loaded_units.count;
- reallocmem(derefmap,derefmapsize*sizeof(tderefmaprec));
- fillchar(derefmap[oldmapsize],(derefmapsize-oldmapsize)*sizeof(tderefmaprec),0);
-
+ setlength(derefmap,derefmapsize);
{ Add all units to unitmap }
hp:=tmodule(loaded_units.first);
i:=0;
diff --git a/compiler/fppu.pas b/compiler/fppu.pas
index e93b2a3dde..8291cf55e4 100644
--- a/compiler/fppu.pas
+++ b/compiler/fppu.pas
@@ -1369,8 +1369,7 @@ var
{ Load unit map used for resolving }
derefmapsize:=ppufile.getlongint;
derefmapcnt:=derefmapsize;
- getmem(derefmap,derefmapsize*sizeof(tderefmaprec));
- fillchar(derefmap^,derefmapsize*sizeof(tderefmaprec),0);
+ setlength(derefmap,derefmapsize);
for i:=0 to derefmapsize-1 do
derefmap[i].modulename:=ppufile.getpshortstring;
end;