From 8f57609ef2e30cb65e8a8eb067fd46f235bcafdb Mon Sep 17 00:00:00 2001 From: Jonas Maebe Date: Sun, 22 Nov 2015 11:49:36 +0000 Subject: [PATCH] * fixed types for classrefdef typed constants git-svn-id: trunk@32471 - --- compiler/ngtcon.pas | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/compiler/ngtcon.pas b/compiler/ngtcon.pas index 3480a0bb25..8b4b544c0d 100644 --- a/compiler/ngtcon.pas +++ b/compiler/ngtcon.pas @@ -744,11 +744,10 @@ function get_next_varsym(def: tabstractrecorddef; const SymList:TFPHashObjectLis begin if not def_is_related(tobjectdef(tclassrefdef(node.resultdef).pointeddef),tobjectdef(def.pointeddef)) then IncompatibleTypes(node.resultdef, def); - { TODO for correct type? } - ftcb.emit_tai(Tai_const.Create_sym(current_asmdata.RefAsmSymbol(Tobjectdef(tclassrefdef(node.resultdef).pointeddef).vmt_mangledname,AT_DATA)),voidpointertype); + ftcb.emit_tai(Tai_const.Create_sym(current_asmdata.RefAsmSymbol(Tobjectdef(tclassrefdef(node.resultdef).pointeddef).vmt_mangledname,AT_DATA)),def); end; niln: - ftcb.emit_tai(Tai_const.Create_sym(nil),voidpointertype); + ftcb.emit_tai(Tai_const.Create_sym(nil),def); else if is_constnode(node) then IncompatibleTypes(node.resultdef, def) else