summaryrefslogtreecommitdiff
path: root/compiler/ngtcon.pas
diff options
context:
space:
mode:
authorjonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2>2015-05-14 14:42:19 +0000
committerjonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2>2015-05-14 14:42:19 +0000
commit3c5406d102e2d6f2c6fcace0b456a7a7930aba57 (patch)
tree26054cd4c07d1a498aa1d76c8453dbb404fad56f /compiler/ngtcon.pas
parentb47f92dde5bde25c9aa2eb0e040ce52d930bab9d (diff)
downloadfpc-3c5406d102e2d6f2c6fcace0b456a7a7930aba57.tar.gz
- removed extraneous maybe_begin_aggregate() when a procvar is initialised
with a pointerconstn, and moved the maybe_end_aggregate() for all procvar initialisation cases to a common location git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@30849 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'compiler/ngtcon.pas')
-rw-r--r--compiler/ngtcon.pas3
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/ngtcon.pas b/compiler/ngtcon.pas
index 78551a0a02..e6947be53e 100644
--- a/compiler/ngtcon.pas
+++ b/compiler/ngtcon.pas
@@ -1386,17 +1386,16 @@ function get_next_varsym(def: tabstractrecorddef; const SymList:TFPHashObjectLis
Message(parser_e_no_procvarnested_const);
ftcb.emit_tai(Tai_const.Create_sym(nil),voidpointertype);
end;
- ftcb.maybe_end_aggregate(def);
end
else if n.nodetype=pointerconstn then
begin
- ftcb.maybe_begin_aggregate(def);
ftcb.emit_tai_procvar2procdef(Tai_const.Create_pint(tpointerconstnode(n).value),def);
if not def.is_addressonly then
ftcb.emit_tai(Tai_const.Create_sym(nil),voidpointertype);
end
else
Message(parser_e_illegal_expression);
+ ftcb.maybe_end_aggregate(def);
n.free;
end;