|
@@ -1140,13 +1140,12 @@ implementation
|
|
if (tsym(p).typ=paravarsym) then
|
|
if (tsym(p).typ=paravarsym) then
|
|
begin
|
|
begin
|
|
needs_inittable :=
|
|
needs_inittable :=
|
|
- not is_class_or_interface(tparavarsym(p).vardef) and
|
|
|
|
|
|
+ not is_class(tparavarsym(p).vardef) and
|
|
tparavarsym(p).vardef.needs_inittable;
|
|
tparavarsym(p).vardef.needs_inittable;
|
|
do_trashing :=
|
|
do_trashing :=
|
|
(localvartrashing <> -1) and
|
|
(localvartrashing <> -1) and
|
|
(not assigned(tparavarsym(p).defaultconstsym)) and
|
|
(not assigned(tparavarsym(p).defaultconstsym)) and
|
|
- (not tparavarsym(p).vardef.needs_inittable or
|
|
|
|
- is_class(tparavarsym(p).vardef));
|
|
|
|
|
|
+ not needs_inittable;
|
|
case tparavarsym(p).varspez of
|
|
case tparavarsym(p).varspez of
|
|
vs_value :
|
|
vs_value :
|
|
if needs_inittable then
|
|
if needs_inittable then
|
|
@@ -1202,7 +1201,7 @@ implementation
|
|
if not(tsym(p).typ=paravarsym) then
|
|
if not(tsym(p).typ=paravarsym) then
|
|
exit;
|
|
exit;
|
|
list:=TAsmList(arg);
|
|
list:=TAsmList(arg);
|
|
- if not is_class_or_interface(tparavarsym(p).vardef) and
|
|
|
|
|
|
+ if not is_class(tparavarsym(p).vardef) and
|
|
tparavarsym(p).vardef.needs_inittable then
|
|
tparavarsym(p).vardef.needs_inittable then
|
|
begin
|
|
begin
|
|
if (tparavarsym(p).varspez=vs_value) then
|
|
if (tparavarsym(p).varspez=vs_value) then
|