From b57a587842d59d59ae616d9add5f553360510610 Mon Sep 17 00:00:00 2001 From: svenbarth Date: Thu, 22 Aug 2013 20:18:14 +0000 Subject: [PATCH] Fix for Mantis #24903. ncon.pas, tstringconstnode: * buildderefimpl: don't build the deref if we don't need to * derefimpl: do not try to resolve the deref if it wasn't stored at all git-svn-id: trunk@25329 - --- compiler/ncon.pas | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/compiler/ncon.pas b/compiler/ncon.pas index 3ab333b942..b9343e6a27 100644 --- a/compiler/ncon.pas +++ b/compiler/ncon.pas @@ -912,14 +912,16 @@ implementation procedure tstringconstnode.buildderefimpl; begin inherited buildderefimpl; - astringdefderef.build(astringdef); + if cst_type=cst_ansistring then + astringdefderef.build(astringdef); end; procedure tstringconstnode.derefimpl; begin inherited derefimpl; - astringdef:=tdef(astringdefderef.resolve); + if cst_type=cst_ansistring then + astringdef:=tdef(astringdefderef.resolve); end;