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

* typecast function results if an explicit type is forced

Browse Source 
git-svn-id: trunk@32420 -
This commit is contained in:
Jonas Maebe 2015-11-21 12:37:30 +00:00
parent 83521e7d1f
commit cc52730147
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
compiler/llvm/hlcgllvm.pas
View File

@ -1649,6 +1649,7 @@ implementation
procedure thlcgllvm.set_call_function_result(const list: TAsmList; const pd: tabstractprocdef; const llvmretdef, hlretdef: tdef; const resval: tregister; var retpara: tcgpara); procedure thlcgllvm.set_call_function_result(const list: TAsmList; const pd: tabstractprocdef; const llvmretdef, hlretdef: tdef; const resval: tregister; var retpara: tcgpara);
var var
hreg: tregister;
rettemp: treference; rettemp: treference;
begin begin
if not is_void(hlretdef) and if not is_void(hlretdef) and
@ -1664,7 +1665,15 @@ implementation
everything to memory rather than potentially dealing with aggregates everything to memory rather than potentially dealing with aggregates
in "registers" } in "registers" }
tg.gethltemp(list, hlretdef, hlretdef.size, tt_normal, rettemp); tg.gethltemp(list, hlretdef, hlretdef.size, tt_normal, rettemp);
a_load_reg_ref(list, llvmretdef, hlretdef, resval, rettemp); case def2regtyp(llvmretdef) of
R_INTREGISTER,
R_ADDRESSREGISTER:
a_load_reg_ref(list,llvmretdef,hlretdef,resval,rettemp);
R_FPUREGISTER:
a_loadfpu_reg_ref(list,llvmretdef,hlretdef,resval,rettemp);
R_MMREGISTER:
a_loadmm_reg_ref(list,llvmretdef,hlretdef,resval,rettemp,mms_movescalar);
end;
{ the return parameter now contains a value whose type matches the one { the return parameter now contains a value whose type matches the one
that the high level code generator expects instead of the llvm shim that the high level code generator expects instead of the llvm shim
} }
@ -1681,8 +1690,23 @@ implementation
end end
else else
begin begin
if llvmretdef<>hlretdef then
begin
hreg:=getregisterfordef(list,hlretdef);
case def2regtyp(llvmretdef) of
R_INTREGISTER,
R_ADDRESSREGISTER:
a_load_reg_reg(list,llvmretdef,hlretdef,resval,hreg);
R_FPUREGISTER:
a_loadfpu_reg_reg(list,llvmretdef,hlretdef,resval,hreg);
R_MMREGISTER:
a_loadmm_reg_reg(list,llvmretdef,hlretdef,resval,hreg,mms_movescalar);
end;
retpara.location^.llvmloc.reg:=hreg
end
else
retpara.location^.llvmloc.reg:=resval;
retpara.Location^.llvmloc.loc:=retpara.location^.loc; retpara.Location^.llvmloc.loc:=retpara.location^.loc;
retpara.location^.llvmloc.reg:=resval;
retpara.Location^.llvmvalueloc:=true; retpara.Location^.llvmvalueloc:=true;
end; end;
end end