./trunk/gcc186/vcs_diff_compiler.patch 2025-12-03-03:28
> uname -a Linux cfarm186 5.10.0-29-amd64 #1 SMP Debian 5.10.216-1 (2024-05-03) x86_64 GNU/Linux
diff --git a/compiler/ctask.pas b/compiler/ctask.pas
index 7102ecdb91..c699644140 100644
--- a/compiler/ctask.pas
+++ b/compiler/ctask.pas
@@ -31,9 +31,9 @@ interface
fmodule, cclasses, globstat;
type
- { ttask_list }
+ { ttask_item }
- ttask_list = class(tlinkedlistitem)
+ ttask_item = class(tlinkedlistitem)
module : tmodule;
state : tglobalstate;
constructor create(_m : tmodule);
@@ -41,11 +41,11 @@ ttask_list = class(tlinkedlistitem)
procedure SaveState;
procedure RestoreState;
procedure DiscardState;
- function nexttask : ttask_list; inline;
+ function nexttask : ttask_item; inline;
end;
ttasklinkedlist = class(tlinkedlist)
- function firsttask : ttask_list; inline;
+ function firsttask : ttask_item; inline;
end;
{ ttask_handler }
@@ -61,13 +61,13 @@ ttask_handler = class
constructor create;
destructor destroy; override;
// Find the task for module m
- function findtask(m : tmodule) : ttask_list;
+ function findtask(m : tmodule) : ttask_item;
// Can we continue processing this module ? If not, firstwaiting contains first module that m is waiting for.
function cancontinue(m : tmodule; checksub : boolean; out firstwaiting: tmodule): boolean;
// Overload of cancontinue, based on task.
- function cancontinue(t: ttask_list; out firstwaiting: tmodule): boolean; inline;
+ function cancontinue(t: ttask_item; out firstwaiting: tmodule): boolean; inline;
// Continue processing this module. Return true if the module is done and can be removed.
- function continue(t : ttask_list): Boolean;
+ function continue(t : ttask_item): Boolean;
// process the queue. Note that while processing the queue, elements will be added.
procedure processqueue;
// add a module to the queue. If a module is already in the queue, we do not add it again.
@@ -101,14 +101,14 @@ procedure DoneTaskHandler;
{ ttasklinkedlist }
-function ttasklinkedlist.firsttask: ttask_list;
+function ttasklinkedlist.firsttask: ttask_item;
begin
- Result:=ttask_list(first);
+ Result:=ttask_item(first);
end;
-{ ttask_list }
+{ ttask_item }
-constructor ttask_list.create(_m: tmodule);
+constructor ttask_item.create(_m: tmodule);
begin
inherited create;
module:=_m;
@@ -116,24 +116,24 @@ constructor ttask_list.create(_m: tmodule);
end;
-destructor ttask_list.destroy;
+destructor ttask_item.destroy;
begin
DiscardState;
Inherited;
end;
-procedure ttask_list.DiscardState;
+procedure ttask_item.DiscardState;
begin
FreeAndNil(state);
end;
-function ttask_list.nexttask: ttask_list;
+function ttask_item.nexttask: ttask_item;
begin
- Result:=ttask_list(next);
+ Result:=ttask_item(next);
end;
-procedure ttask_list.SaveState;
+procedure ttask_item.SaveState;
begin
if State=Nil then
State:=tglobalstate.Create(true)
@@ -141,7 +141,7 @@ procedure ttask_list.SaveState;
State.save(true);
end;
-procedure ttask_list.RestoreState;
+procedure ttask_item.RestoreState;
begin
if not module.is_reset then
state.restore(true);
@@ -169,7 +169,7 @@ destructor ttask_handler.destroy;
inherited destroy;
end;
-function ttask_handler.findtask(m: tmodule): ttask_list;
+function ttask_handler.findtask(m: tmodule): ttask_item;
begin
result:=list.FirstTask;
@@ -252,13 +252,13 @@ function ttask_handler.cancontinue(m: tmodule; checksub : boolean; out firstwait
{$ENDIF}
end;
-function ttask_handler.cancontinue(t : ttask_list; out firstwaiting : tmodule): boolean;
+function ttask_handler.cancontinue(t : ttask_item; out firstwaiting : tmodule): boolean;
begin
Result:=cancontinue(t.module,true,firstwaiting);
end;
-function ttask_handler.continue(t : ttask_list) : Boolean;
+function ttask_handler.continue(t : ttask_item) : Boolean;
var
m : tmodule;
@@ -321,7 +321,7 @@ function ttask_handler.continue(t : ttask_list) : Boolean;
procedure ttask_handler.rebuild_hash;
var
- t : ttask_list;
+ t : ttask_item;
begin
Hash.Clear;
@@ -336,7 +336,7 @@ procedure ttask_handler.rebuild_hash;
procedure ttask_handler.processqueue;
var
- t,t2 : ttask_list;
+ t,t2 : ttask_item;
process: boolean;
dummy,firstwaiting : tmodule;
@@ -410,18 +410,18 @@ procedure ttask_handler.addmodule(m: tmodule);
var
n : TSymStr;
- e, t : ttask_list;
+ e, t : ttask_item;
begin
{$IFDEF DEBUG_CTASK}Writeln(m.ToString,' added to task scheduler. State: ',m.state);{$ENDIF}
n:=m.modulename^;
- e:=ttask_list(Hash.Find(n));
+ e:=ttask_item(Hash.Find(n));
if e=nil then
begin
// Clear reset flag.
// This can happen when during load, reset is done and unit is added to task list.
m.is_reset:=false;
- t:=ttask_list.create(m);
+ t:=ttask_item.create(m);
list.insert(t);
hash.Add(n,t);
if list.count=1 then
@@ -447,7 +447,7 @@ procedure ttask_handler.addmodule(m: tmodule);
procedure ttask_handler.write_queue;
var
- t: ttask_list;
+ t: ttask_item;
firstwaiting: tmodule;
cc: Boolean;
begin