From 276f5bdef86a1a6edb28d0fdd58685365eb357f4 Mon Sep 17 00:00:00 2001 From: svenbarth Date: Thu, 21 Nov 2019 21:44:16 +0000 Subject: [PATCH] * ensure that nothing assembly related is generated for generics when a typed constant (this also includes local variable initializations) are parsed git-svn-id: trunk@43534 - --- compiler/ptconst.pas | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/compiler/ptconst.pas b/compiler/ptconst.pas index 96529599a0..dd373707e6 100644 --- a/compiler/ptconst.pas +++ b/compiler/ptconst.pas @@ -123,23 +123,26 @@ implementation end; end; - if vo_is_public in sym.varoptions then - current_module.add_public_asmsym(sym.mangledname,AB_GLOBAL,AT_DATA); + if not parse_generic then + begin + if vo_is_public in sym.varoptions then + current_module.add_public_asmsym(sym.mangledname,AB_GLOBAL,AT_DATA); - if not(target_info.system in systems_typed_constants_node_init) then - begin - { only now get the final asmlist, because inserting the symbol - information depends on potential section information set above } - tasmlisttypedconstbuilder(tcbuilder).get_final_asmlists(reslist,datalist); - { add the parsed value } - list.concatlist(reslist); - { and pointed data, if any } - current_asmdata.asmlists[al_const].concatlist(datalist); - { the (empty) lists themselves are freed by tcbuilder } - end - else - begin - { nothing to do } + if not(target_info.system in systems_typed_constants_node_init) then + begin + { only now get the final asmlist, because inserting the symbol + information depends on potential section information set above } + tasmlisttypedconstbuilder(tcbuilder).get_final_asmlists(reslist,datalist); + { add the parsed value } + list.concatlist(reslist); + { and pointed data, if any } + current_asmdata.asmlists[al_const].concatlist(datalist); + { the (empty) lists themselves are freed by tcbuilder } + end + else + begin + { nothing to do } + end; end; tcbuilder.free;