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

* disallow procvar to pointer conversion, if the pointer type isn't the default

Browse Source 
code pointer type for the current memory model

git-svn-id: trunk@32165 -
This commit is contained in:
nickysn 2015-10-27 17:23:50 +00:00
parent 30718a2601
commit e2740f0fd7
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
compiler/defcmp.pas
View File

@ -1422,7 +1422,11 @@ implementation
this is not allowed for complex procvars } this is not allowed for complex procvars }
if (is_void(tpointerdef(def_to).pointeddef) or if (is_void(tpointerdef(def_to).pointeddef) or
(m_mac_procvar in current_settings.modeswitches)) and (m_mac_procvar in current_settings.modeswitches)) and
tprocvardef(def_from).is_addressonly then tprocvardef(def_from).is_addressonly
{$ifdef x86}
and (tcpupointerdef(voidcodepointertype).x86pointertyp=tcpupointerdef(def_to).x86pointertyp)
{$endif x86}
then
begin begin
doconv:=tc_equal; doconv:=tc_equal;
eq:=te_convert_l1; eq:=te_convert_l1;
@ -1433,7 +1437,11 @@ implementation
{ procedure variable can be assigned to an void pointer, { procedure variable can be assigned to an void pointer,
this not allowed for methodpointers } this not allowed for methodpointers }
if (m_mac_procvar in current_settings.modeswitches) and if (m_mac_procvar in current_settings.modeswitches) and
tprocdef(def_from).is_addressonly then tprocdef(def_from).is_addressonly
{$ifdef x86}
and (tcpupointerdef(voidcodepointertype).x86pointertyp=tcpupointerdef(def_to).x86pointertyp)
{$endif x86}
then
begin begin
doconv:=tc_proc_2_procvar; doconv:=tc_proc_2_procvar;
eq:=te_convert_l2; eq:=te_convert_l2;