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

* manually merged r36194, fixes a regression introduced by 3.0.0 on Win64 (due to SEH).

Browse Source 
git-svn-id: branches/fixes_3_0@36571 -
This commit is contained in:
marco 2017-06-22 09:00:12 +00:00
parent 2432faf941
commit 2b110e0e92
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/pmodules.pas
View File

@ -620,12 +620,12 @@ implementation
case flag of case flag of
uf_init : uf_init :
begin begin
result:=create_main_proc(make_mangledname('',current_module.localsymtable,'init_implicit'),potype_unitinit,st); result:=create_main_proc(make_mangledname('',current_module.localsymtable,'init_implicit$'),potype_unitinit,st);
result.procdef.aliasnames.insert(make_mangledname('INIT$',current_module.localsymtable,'')); result.procdef.aliasnames.insert(make_mangledname('INIT$',current_module.localsymtable,''));
end; end;
uf_finalize : uf_finalize :
begin begin
result:=create_main_proc(make_mangledname('',current_module.localsymtable,'finalize_implicit'),potype_unitfinalize,st); result:=create_main_proc(make_mangledname('',current_module.localsymtable,'finalize_implicit$'),potype_unitfinalize,st);
result.procdef.aliasnames.insert(make_mangledname('FINALIZE$',current_module.localsymtable,'')); result.procdef.aliasnames.insert(make_mangledname('FINALIZE$',current_module.localsymtable,''));
if (not current_module.is_unit) then if (not current_module.is_unit) then
result.procdef.aliasnames.insert('PASCALFINALIZE'); result.procdef.aliasnames.insert('PASCALFINALIZE');
@ -952,7 +952,7 @@ type
internalerror(200212285); internalerror(200212285);
{ Compile the unit } { Compile the unit }
init_procinfo:=create_main_proc(make_mangledname('',current_module.localsymtable,'init'),potype_unitinit,current_module.localsymtable); init_procinfo:=create_main_proc(make_mangledname('',current_module.localsymtable,'init$'),potype_unitinit,current_module.localsymtable);
init_procinfo.procdef.aliasnames.insert(make_mangledname('INIT$',current_module.localsymtable,'')); init_procinfo.procdef.aliasnames.insert(make_mangledname('INIT$',current_module.localsymtable,''));
init_procinfo.parse_body; init_procinfo.parse_body;
{ save file pos for debuginfo } { save file pos for debuginfo }
@ -1084,7 +1084,7 @@ type
if not current_module.interface_only and (token=_FINALIZATION) then if not current_module.interface_only and (token=_FINALIZATION) then
begin begin
{ Compile the finalize } { Compile the finalize }
finalize_procinfo:=create_main_proc(make_mangledname('',current_module.localsymtable,'finalize'),potype_unitfinalize,current_module.localsymtable); finalize_procinfo:=create_main_proc(make_mangledname('',current_module.localsymtable,'finalize$'),potype_unitfinalize,current_module.localsymtable);
finalize_procinfo.procdef.aliasnames.insert(make_mangledname('FINALIZE$',current_module.localsymtable,'')); finalize_procinfo.procdef.aliasnames.insert(make_mangledname('FINALIZE$',current_module.localsymtable,''));
finalize_procinfo.parse_body; finalize_procinfo.parse_body;
end end
@ -2150,7 +2150,7 @@ type
if token=_FINALIZATION then if token=_FINALIZATION then
begin begin
{ Parse the finalize } { Parse the finalize }
finalize_procinfo:=create_main_proc(make_mangledname('',current_module.localsymtable,'finalize'),potype_unitfinalize,current_module.localsymtable); finalize_procinfo:=create_main_proc(make_mangledname('',current_module.localsymtable,'finalize$'),potype_unitfinalize,current_module.localsymtable);
finalize_procinfo.procdef.aliasnames.insert(make_mangledname('FINALIZE$',current_module.localsymtable,'')); finalize_procinfo.procdef.aliasnames.insert(make_mangledname('FINALIZE$',current_module.localsymtable,''));
finalize_procinfo.procdef.aliasnames.insert('PASCALFINALIZE'); finalize_procinfo.procdef.aliasnames.insert('PASCALFINALIZE');
finalize_procinfo.parse_body; finalize_procinfo.parse_body;