./trunk/gcc188/vcs_diff_compiler.patch 2026-03-06-11:04
> uname -a Linux gcc188 5.14.21-150500.55.65-default #1 SMP PREEMPT_DYNAMIC Thu May 23 04:57:11 UTC 2024 (a46829d) x86_64 x86_64 x86_64 GNU/Linux
diff --git a/compiler/fmodule.pas b/compiler/fmodule.pas
index 7b0e8219f8..778a10fafa 100644
--- a/compiler/fmodule.pas
+++ b/compiler/fmodule.pas
@@ -185,8 +185,8 @@ tmodule = class(tmodulebase)
derefdataintflen : longint;
derefdata : tdynamicarray;
checkforwarddefs,
- deflist,
- symlist : TFPObjectList;
+ m_deflist,
+ m_symlist : TFPObjectList;
forwardgenericdefs : TFPHashObjectList; { contains a list of specializations of a forward declared generic (the key) }
ptrdefs : THashSet; { list of pointerdefs created in this module so we can reuse them (not saved/restored) }
arraydefs : THashSet; { list of single-element-arraydefs created in this module so we can reuse them (not saved/restored) }
@@ -675,8 +675,8 @@ implementation
derefmapcnt:=0;
derefdata:=TDynamicArray.Create(1024);
derefdataintflen:=0;
- deflist:=TFPObjectList.Create(false);
- symlist:=TFPObjectList.Create(false);
+ m_deflist:=TFPObjectList.Create(false);
+ m_symlist:=TFPObjectList.Create(false);
ptrdefs:=THashSet.Create(64,true,false);
arraydefs:=THashSet.Create(64,true,false);
procaddrdefs:=THashSet.Create(64,true,false);
@@ -840,17 +840,17 @@ implementation
{$endif}
derefdata.free;
derefdata := nil;
- if assigned(deflist) then
+ if assigned(m_deflist) then
begin
- for i:=0 to deflist.Count-1 do
- if assigned(deflist[i]) and
- (tdef(deflist[i]).registered_in_module=self) then
- tdef(deflist[i]).registered_in_module:=nil;
- deflist.free;
- deflist := nil;
+ for i:=0 to m_deflist.Count-1 do
+ if assigned(m_deflist[i]) and
+ (tdef(m_deflist[i]).registered_in_module=self) then
+ tdef(m_deflist[i]).registered_in_module:=nil;
+ m_deflist.free;
+ m_deflist := nil;
end;
- symlist.free;
- symlist := nil;
+ m_symlist.free;
+ m_symlist := nil;
ptrdefs.free;
ptrdefs := nil;
arraydefs.free;
@@ -941,10 +941,10 @@ implementation
globalmacrosymtable:=nil;
localmacrosymtable.free;
localmacrosymtable:=nil;
- deflist.free;
- deflist:=TFPObjectList.Create(false);
- symlist.free;
- symlist:=TFPObjectList.Create(false);
+ m_deflist.free;
+ m_deflist:=TFPObjectList.Create(false);
+ m_symlist.free;
+ m_symlist:=TFPObjectList.Create(false);
ptrdefs.free;
ptrdefs:=THashSet.Create(64,true,false);
arraydefs.free;
@@ -1312,9 +1312,9 @@ implementation
Internalerror(2026022622);
end;
- if (sym.SymId>=module.symlist.Count) then
+ if (sym.SymId>=module.m_symlist.Count) then
Internalerror(2026022617);
- if sym<>TSymEntry(module.symlist[sym.SymId]) then
+ if sym<>TSymEntry(module.m_symlist[sym.SymId]) then
begin
writeln('tmodule.addimportedsym ',modulename^,' ',statestr,' ',Sym.RealName,' ',Sym.SymId,' MISMATCH');
Internalerror(2026022611);
@@ -1337,9 +1337,9 @@ implementation
begin
importsym:=tunitimportsym(unitimportsyms[i]);
module:=importsym.module;
- if (importsym.SymId>=module.symlist.Count) then
+ if (importsym.SymId>=module.m_symlist.Count) then
Internalerror(2026022618);
- importsym.sym:=TSymEntry(module.symlist[importsym.symid]);
+ importsym.sym:=TSymEntry(module.m_symlist[importsym.symid]);
end;
end;
diff --git a/compiler/fppu.pas b/compiler/fppu.pas
index bfead2c0e0..0da501bc28 100644
--- a/compiler/fppu.pas
+++ b/compiler/fppu.pas
@@ -1885,8 +1885,8 @@ implementation
ppufile.header.common.cpu:=word(target_cpu);
ppufile.header.common.target:=word(target_info.system);
ppufile.header.common.flags:=headerflags;
- ppufile.header.deflistsize:=current_module.deflist.count;
- ppufile.header.symlistsize:=current_module.symlist.count;
+ ppufile.header.deflistsize:=current_module.m_deflist.count;
+ ppufile.header.symlistsize:=current_module.m_symlist.count;
ppufile.writeheader;
{$ifdef Test_Double_checksum_write}
@@ -2042,8 +2042,8 @@ implementation
{ ok, now load the interface of this unit }
if current_module<>self then
internalerror(200208187);
- deflist.count:=ppufile.header.deflistsize;
- symlist.count:=ppufile.header.symlistsize;
+ m_deflist.count:=ppufile.header.deflistsize;
+ m_symlist.count:=ppufile.header.symlistsize;
globalsymtable:=tglobalsymtable.create(realmodulename^,moduleid);
tstoredsymtable(globalsymtable).ppuload(ppufile);
diff --git a/compiler/jvm/njvmcon.pas b/compiler/jvm/njvmcon.pas
index e29cb0a5f9..8412e5b137 100644
--- a/compiler/jvm/njvmcon.pas
+++ b/compiler/jvm/njvmcon.pas
@@ -447,7 +447,7 @@ implementation
{ add a read-only typed constant }
new(ps);
ps^:=value_set^;
- csym:=cconstsym.create_ptr('_$setconst'+tostr(current_module.symlist.count),constset,ps,resultdef);
+ csym:=cconstsym.create_ptr('_$setconst'+tostr(current_module.m_symlist.count),constset,ps,resultdef);
csym.visibility:=vis_private;
include(csym.symoptions,sp_internal);
current_module.localsymtable.insertsym(csym);
diff --git a/compiler/pgenutil.pas b/compiler/pgenutil.pas
index bcd6ce07a9..40018b0f60 100644
--- a/compiler/pgenutil.pas
+++ b/compiler/pgenutil.pas
@@ -2354,7 +2354,7 @@ current_scanner.recordtokenbuf:=recordbuf;
constraintdata:=tgenericconstraintdata.create;
constraintdata.fileinfo:=fileinfo;
defname:='';
- str(current_module.deflist.count,defname);
+ str(current_module.m_deflist.count,defname);
defname:='$gendef'+defname;
allowconstructor:=m_delphi in current_settings.modeswitches;
diff --git a/compiler/ptype.pas b/compiler/ptype.pas
index 33aaf6804b..94f8f1fcfe 100644
--- a/compiler/ptype.pas
+++ b/compiler/ptype.pas
@@ -1093,7 +1093,7 @@ pd:=class_destructor_head(current_structdef)
begin
{ for the JVM target records always need a name, because they are
represented by a class }
- recst:=trecordsymtable.create(current_module.realmodulename^+'__fpc_intern_recname_'+tostr(current_module.deflist.count),
+ recst:=trecordsymtable.create(current_module.realmodulename^+'__fpc_intern_recname_'+tostr(current_module.m_deflist.count),
current_settings.packrecords,current_settings.alignment.recordalignmin);
current_structdef:=crecorddef.create(recst.name^,recst);
end;
diff --git a/compiler/symcreat.pas b/compiler/symcreat.pas
index 39a096c3a5..86ffb3d823 100644
--- a/compiler/symcreat.pas
+++ b/compiler/symcreat.pas
@@ -323,10 +323,10 @@ (astruct.typ=recorddef) then
current_scanner.readtoken(false);
type_dec(b);
// In the interface part, the object def is not necessarily the last one, the methods also generate defs.
- i:=current_module.DefList.count-1;
+ i:=current_module.m_DefList.count-1;
While (result=nil) and (i>=0) do
begin
- O:=current_module.DefList[i];
+ O:=current_module.m_DefList[i];
if (o is tobjectdef) then
if (tobjectdef(o).GetTypeName=typename) then
result:=tobjectdef(o);
diff --git a/compiler/symdef.pas b/compiler/symdef.pas
index cf1240c22d..d24221ff49 100644
--- a/compiler/symdef.pas
+++ b/compiler/symdef.pas
@@ -2140,7 +2140,7 @@ implementation
begin
inherited create(dt);
DefId:=ppufile.getlongint;
- current_module.deflist[DefId]:=self;
+ current_module.m_deflist[DefId]:=self;
{$ifdef EXTDEBUG}
fillchar(fileinfo,sizeof(fileinfo),0);
{$endif}
@@ -2734,8 +2734,8 @@ implementation
defid:=deflist_index
else
begin
- tmod.deflist.Add(self);
- defid:=tmod.deflist.Count-1;
+ tmod.m_deflist.Add(self);
+ defid:=tmod.m_deflist.Count-1;
registered_in_module:=tmod;
end;
maybe_put_in_symtable_stack;
diff --git a/compiler/symsym.pas b/compiler/symsym.pas
index 81c895136c..5239d0fa02 100644
--- a/compiler/symsym.pas
+++ b/compiler/symsym.pas
@@ -644,7 +644,7 @@ implementation
inherited Create(st,ppufile.getstring);
{$endif symansistr}
SymId:=ppufile.getlongint;
- current_module.symlist[SymId]:=self;
+ current_module.m_symlist[SymId]:=self;
ppufile.getposinfo(fileinfo);
visibility:=tvisibility(ppufile.getbyte);
ppufile.getset(tppuset2(symoptions));
@@ -762,8 +762,8 @@ implementation
{ Register in current_module }
if assigned(tmod) then
begin
- tmod.symlist.Add(self);
- SymId:=tmod.symlist.Count-1;
+ tmod.m_symlist.Add(self);
+ SymId:=tmod.m_symlist.Count-1;
end
else
SymId:=symid_registered_nost;
diff --git a/compiler/symtable.pas b/compiler/symtable.pas
index 1e0b3f5784..dec1ad0f61 100644
--- a/compiler/symtable.pas
+++ b/compiler/symtable.pas
@@ -778,8 +778,8 @@ implementation
or inlined routines in the static symbtable }
{ current number of registered defs/syms }
- defidmax:=current_module.deflist.count;
- symidmax:=current_module.symlist.count;
+ defidmax:=current_module.m_deflist.count;
+ symidmax:=current_module.m_symlist.count;
changed:=false;
{ build the derefs for the registered defs we haven't processed yet }
@@ -825,8 +825,8 @@ implementation
the currently registered ones (defs/syms get added to the module's
deflist/symlist when they are registered) }
until not changed and
- (defidmax=current_module.deflist.count) and
- (symidmax=current_module.symlist.count);
+ (defidmax=current_module.m_deflist.count) and
+ (symidmax=current_module.m_symlist.count);
end;
diff --git a/compiler/symtype.pas b/compiler/symtype.pas
index ba8a888041..6ee30f31cc 100644
--- a/compiler/symtype.pas
+++ b/compiler/symtype.pas
@@ -394,9 +394,9 @@ implementation
if assigned(registered_in_module) then
begin
if defid>=0 then
- tmodule(registered_in_module).deflist[defid]:=nil
+ tmodule(registered_in_module).m_deflist[defid]:=nil
else if defid