From c1bf99c30a33eb8b9eca2f9a0543d006e5fa3a8b Mon Sep 17 00:00:00 2001 From: peter Date: Mon, 27 Dec 2004 16:36:10 +0000 Subject: [PATCH] * fix crash with callnode.ppuload when symtableproc=nil --- compiler/ncal.pas | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/compiler/ncal.pas b/compiler/ncal.pas index 90eb9a0412..e852b936be 100644 --- a/compiler/ncal.pas +++ b/compiler/ncal.pas @@ -906,8 +906,9 @@ type begin inherited derefimpl; symtableprocentry:=tprocsym(symtableprocentryderef.resolve); - symtableproc:=symtableprocentry.owner; - procdefinition:=tprocdef(procdefinitionderef.resolve); + if assigned(symtableprocentry) then + symtableproc:=symtableprocentry.owner; + procdefinition:=tabstractprocdef(procdefinitionderef.resolve); if assigned(methodpointer) then methodpointer.derefimpl; if assigned(methodpointerinit) then @@ -2133,7 +2134,7 @@ type st:=procdefinition.owner; if (st.symtabletype=objectsymtable) then st:=st.defowner.owner; - if (pi_inline_local_only in tprocdef(procdefinition).inlininginfo^.flags) and + if (pi_uses_static_symtable in tprocdef(procdefinition).inlininginfo^.flags) and (st.unitid<>0) then begin Comment(V_lineinfo+V_Debug,'Not inlining "'+tprocdef(procdefinition).procsym.realname+'", references static symtable'); @@ -2449,7 +2450,10 @@ begin end. { $Log$ - Revision 1.272 2004-12-26 16:22:01 peter + Revision 1.273 2004-12-27 16:36:10 peter + * fix crash with callnode.ppuload when symtableproc=nil + + Revision 1.272 2004/12/26 16:22:01 peter * fix lineinfo for with blocks Revision 1.271 2004/12/15 21:08:15 peter