* added is_normal_fieldvarsym() helper and use it

   o fixes several places where there was a check whether something is a
     fieldvarsym, but not whether it's an instance rather than a class field

git-svn-id: https://svn.freepascal.org/svn/fpc/trunk@43786 3ad0048d-3df7-0310-abae-a5850022a9f2

1 files changed, 2 insertions, 2 deletions

diff --git a/compiler/x86_64/cpupara.pas b/compiler/x86_64/cpupara.pas
index d0df68779d..230fd67946 100644
--- a/compiler/x86_64/cpupara.pas
+++ b/compiler/x86_64/cpupara.pas
@@ -56,7 +56,7 @@ unit cpupara;
        cutils,verbose,
        systems,
        globals,defutil,
-       symtable,
+       symtable,symutil,
        cpupi,
        cgx86,cgobj,cgcpu;
 
@@ -760,7 +760,7 @@ unit cpupara;
         (* Merge the fields of the structure.  *)
         for i:=0 to tabstractrecorddef(def).symtable.symlist.count-1 do
           begin
-            if tsym(tabstractrecorddef(def).symtable.symlist[i]).typ<>fieldvarsym then
+            if not is_normal_fieldvarsym(tsym(tabstractrecorddef(def).symtable.symlist[i])) then
               continue;
             vs:=tfieldvarsym(tabstractrecorddef(def).symtable.symlist[i]);
             checkalignment:=true;