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

* fixed bug #1096 (merged)

Browse Source
This commit is contained in:
peter 2000-08-12 15:41:15 +00:00
parent cdbe6a1fa3
commit bd6d4c3d17
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/pstatmnt.pas
View File

@ -717,7 +717,8 @@ unit pstatmnt;
else
p:=nil;
p:=gensinglenode(exitn,p);
p^.resulttype:=procinfo^.returntype.def;
// p^.resulttype:=procinfo^.returntype.def;
p^.resulttype:=voiddef;
exit_statement:=p;
end;
@ -1381,7 +1382,10 @@ unit pstatmnt;
end.
{
$Log$
Revision 1.4 2000-08-12 06:46:06 florian
Revision 1.5 2000-08-12 15:41:15 peter
* fixed bug 1096 (merged)
Revision 1.4 2000/08/12 06:46:06 florian
+ case statement for int64/qword implemented
Revision 1.3 2000/07/13 12:08:27 michael
@ -1390,4 +1394,4 @@ end.
Revision 1.2 2000/07/13 11:32:45 michael
+ removed logs
}
}

12
compiler/tcflw.pas
View File

@ -386,6 +386,7 @@ implementation
var
pt : ptree;
begin
p^.resulttype:=voiddef;
if assigned(p^.left) then
begin
firstpass(p^.left);
@ -393,12 +394,12 @@ implementation
if codegenerror then
exit;
{ Check the 2 types }
p^.left:=gentypeconvnode(p^.left,p^.resulttype);
p^.left:=gentypeconvnode(p^.left,procinfo^.returntype.def);
firstpass(p^.left);
if ret_in_param(p^.resulttype) or procinfo^.no_fast_exit then
if ret_in_param(procinfo^.returntype.def) or procinfo^.no_fast_exit then
begin
pt:=genzeronode(funcretn);
pt^.rettype.setdef(p^.resulttype);
pt^.rettype.setdef(procinfo^.returntype.def);
pt^.funcretprocinfo:=procinfo;
p^.left:=gennode(assignn,pt,p^.left);
firstpass(p^.left);
@ -634,7 +635,10 @@ implementation
end.
{
$Log$
Revision 1.3 2000-08-02 07:04:56 jonas
Revision 1.4 2000-08-12 15:41:15 peter
* fixed bug 1096 (merged)
Revision 1.3 2000/08/02 07:04:56 jonas
* fixed crash when an undeclared identifier is used in a raise statement
(merged from fixes branch)