* switch class'/object's parent reference in the VMT to an indirect reference

(this also requires the adjustment of a test)

git-svn-id: trunk@34172 -

compiler/ncgvmt.pas

@@ -1129,7 +1129,7 @@ implementation
            begin
              tcb.queue_init(parentvmtdef);
              tcb.queue_emit_asmsym(
-               current_asmdata.RefAsmSymbol(_class.childof.vmt_mangledname,AT_DATA),
+               current_asmdata.RefAsmSymbol(_class.childof.vmt_mangledname,AT_DATA,true),
                tfieldvarsym(_class.childof.vmt_field).vardef);
            end
          else

rtl/inc/objpas.inc

@@ -267,6 +267,23 @@
           fpc_class_as_corbaintf:=nil;
       end;
 
+{****************************************************************************
+                               TVMT
+****************************************************************************}
+
+
+    function TVmt.GetvParent: PVmt;
+      begin
+        {$ifdef VER3_0}
+        GetvParent:=vParentRef;
+        {$else VER3_0}
+        if Assigned(vParentRef) then
+          GetvParent:=vParentRef^
+        else
+          GetvParent:=Nil;
+        {$endif VER3_0}
+      end;
+
 
 {****************************************************************************
                                TOBJECT

rtl/inc/objpash.inc

@@ -97,10 +97,16 @@
        pinterfacetable = ^tinterfacetable;
 
        PVmt = ^TVmt;
+       PPVmt = ^PVmt;
        TVmt = record
+       private
+         function GetvParent: PVmt; inline;
+       public
+         property vParent: PVmt read GetvParent;
+       public
          vInstanceSize: SizeInt;
          vInstanceSize2: SizeInt;
-         vParent: PVmt;
+         vParentRef: {$ifdef VER3_0}PVmt{$else}PPVmt{$endif};
          vClassName: PShortString;
          vDynamicTable: Pointer;
          vMethodTable: Pointer;

tests/webtbs/tw16034.pp

@@ -77,11 +77,12 @@ enD;
 
 type
   pObjVMT = ^TObjVMT;
+  ppObjVMT = ^pObjVMT;
   TObjVMT =
     record
       fInstanceSize: UInt;
       fInstanceSize2: Int;
-      fParent: pObjVMT;
+      fParent: ppObjVMT;
     enD;
 
 Function GetInstanceSize(AVMT: pObjVMT): UInt;
@@ -93,7 +94,7 @@ Function GetVMTPtrOffset(AVMT: pObjVMT): UInt;
 begin
   if (AVMT.fParent = nil) then
     Result := GetInstanceSize(AVMT) - SizeOf(ptr) else
-    Result := GetVMTPtrOffset(AVMT.fParent);
+    Result := GetVMTPtrOffset(AVMT.fParent^);
 enD;
 
 Function SetVMT(Obj: ptr; AVMT: ptr): Bool;