paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-16 12:59:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

* changed fix for webtbs/tw20075 so that we don't check the need for

Browse Source 
parameter/local finalization at all in pure assembler routines;
    the routines that check this also set pi_needs_got, which should
    not be set either for pure assembler routines (fixes tw20075 on
    Darwin/i386, where PIC code is enabled by default)

git-svn-id: trunk@31622 -
This commit is contained in:
Jonas Maebe 2015-09-12 23:31:50 +00:00
parent e5153db532
commit 2205549316
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compiler/psub.pas
View File

@ -879,7 +879,6 @@ implementation
(pi_needs_implicit_finally in flags) and
{ but it's useless in init/final code of units }
not(procdef.proctypeoption in [potype_unitfinalize,potype_unitinit]) and
not(po_assembler in procdef.procoptions) and
not(target_info.system in systems_garbage_collected_managed_types) then
begin
{ Any result of managed type must be returned in parameter }
@ -1315,8 +1314,11 @@ implementation
end;
{ set implicit_finally flag when there are locals/paras to be finalized }
procdef.parast.SymList.ForEachCall(@check_finalize_paras,nil);
procdef.localst.SymList.ForEachCall(@check_finalize_locals,nil);
if not(po_assembler in current_procinfo.procdef.procoptions) then
begin
procdef.parast.SymList.ForEachCall(@check_finalize_paras,nil);
procdef.localst.SymList.ForEachCall(@check_finalize_locals,nil);
end;
{$ifdef SUPPORT_SAFECALL}
{ set implicit_finally flag for if procedure is safecall }
@ -1638,7 +1640,6 @@ implementation
if (cs_implicit_exceptions in current_settings.moduleswitches) and
not(procdef.proctypeoption in [potype_unitfinalize,potype_unitinit]) and
(pi_needs_implicit_finally in flags) and
not(po_assembler in procdef.procoptions) and
not(pi_has_implicit_finally in flags) and
not(target_info.system in systems_garbage_collected_managed_types) then
internalerror(200405231);