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

Typed constants: no internalerror on failure

Browse Source 
Don't check whether the expression queue is empty in the destructor in case
there was an error. Also improved error messages (constant expression instead
of variable expression expected).

Resolves #39393
This commit is contained in:
Jonas Maebe 2021-10-03 21:35:55 +02:00
parent 190c77e863
commit ab01b0ebd7
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/aasmcnst.pas
View File

@ -1244,8 +1244,10 @@ implementation
destructor ttai_typedconstbuilder.destroy;
begin
{ the queue should have been flushed if it was used }
if fqueue_offset<>low(fqueue_offset) then
{ the queue should have been flushed if it was used
(but if there were errors, we may have aborted before that happened) }
if (fqueue_offset<>low(fqueue_offset)) and
(ErrorCount=0) then
internalerror(2014062901);
faggregateinformation.free;
fasmlist.free;

4
compiler/ngtcon.pas
View File

@ -1014,9 +1014,9 @@ function get_next_varsym(def: tabstractrecorddef; const SymList:TFPHashObjectLis
if tconstsym(srsym).consttyp=constresourcestring then
ftcb.queue_emit_const(tconstsym(srsym))
else
Message(type_e_variable_id_expected);
Message(type_e_constant_expr_expected);
else
Message(type_e_variable_id_expected);
Message(type_e_constant_expr_expected);
end;
end
else

12
tests/webtbf/tw39393.pp Normal file
View File

@ -0,0 +1,12 @@
{ %fail }
program project1;
{$mode objfpc}{$H+}
function bug(s: string): string;
var
p:pointer=@s;//internal error 2014062901
begin
end;
begin
end.