From ab01b0ebd72c646b66a6bb3fd55ed717b9852541 Mon Sep 17 00:00:00 2001
From: Jonas Maebe <jonas@freepascal.org>
Date: Sun, 3 Oct 2021 21:35:55 +0200
Subject: [PATCH] Typed constants: no internalerror on failure

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
---
 compiler/aasmcnst.pas   |  6 ++++--
 compiler/ngtcon.pas     |  4 ++--
 tests/webtbf/tw39393.pp | 12 ++++++++++++
 3 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 tests/webtbf/tw39393.pp

diff --git a/compiler/aasmcnst.pas b/compiler/aasmcnst.pas
index d9d3d0ede1..6035cfe5b0 100644
--- a/compiler/aasmcnst.pas
+++ b/compiler/aasmcnst.pas
@@ -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;
diff --git a/compiler/ngtcon.pas b/compiler/ngtcon.pas
index 930ca5fa38..05d6cbd69d 100644
--- a/compiler/ngtcon.pas
+++ b/compiler/ngtcon.pas
@@ -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
diff --git a/tests/webtbf/tw39393.pp b/tests/webtbf/tw39393.pp
new file mode 100644
index 0000000000..c1736744fe
--- /dev/null
+++ b/tests/webtbf/tw39393.pp
@@ -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.