DomainAssembly does not need to have VPTR_. Couple other changes.

src/coreclr/inc/vptr_list.h

@@ -23,7 +23,6 @@ VPTR_CLASS(ReflectionModule)
 VPTR_CLASS(AppDomain)
 VPTR_CLASS(SystemDomain)
 
-VPTR_CLASS(DomainAssembly)
 VPTR_CLASS(PrecodeStubManager)
 VPTR_CLASS(StubLinkStubManager)
 VPTR_CLASS(ThePreStubManager)
@@ -39,7 +38,6 @@ VPTR_CLASS(DelegateInvokeStubManager)
 VPTR_CLASS(TailCallStubManager)
 #endif
 VPTR_CLASS(CallCountingStubManager)
-VPTR_CLASS(PEAssembly)
 
 VPTR_CLASS(PEImageLayout)
 VPTR_CLASS(ConvertedImageLayout)

src/coreclr/vm/assembly.hpp

@@ -479,8 +479,6 @@ class Assembly
     PTR_BaseDomain        m_pDomain;        // Parent Domain
     PTR_ClassLoader       m_pClassLoader;   // Single Loader
 
-
-
     PTR_MethodDesc        m_pEntryPoint;    // Method containing the entry point
     PTR_Module            m_pModule;
     PTR_PEAssembly        m_pPEAssembly;

src/coreclr/vm/domainassembly.cpp

@@ -1109,8 +1109,7 @@ void DomainAssembly::EnumMemoryRegions(CLRDataEnumMemoryFlags flags)
 {
     SUPPORTS_DAC;
 
-    //sizeof(DomainAssembly) == 0x60
-    DAC_ENUM_VTHIS();
+    DAC_ENUM_DTHIS();
 
     // Modules are needed for all minidumps, but they are enumerated elsewhere
     // so we don't need to duplicate effort; thus we do noting with m_pModule.

src/coreclr/vm/domainassembly.h

@@ -65,16 +65,14 @@ enum NotificationStatus
 
 class DomainAssembly final
 {
-    VPTR_BASE_CONCRETE_VTABLE_CLASS(DomainAssembly);
-
-  public:
+    public:
 
     // ------------------------------------------------------------
     // Public API
     // ------------------------------------------------------------
 
 #ifndef DACCESS_COMPILE
-    virtual ~DomainAssembly();
+    ~DomainAssembly();
     DomainAssembly() {LIMITED_METHOD_CONTRACT;};
 #endif
 
@@ -266,7 +264,7 @@ class DomainAssembly final
 #endif // DACCESS_COMPILE
 
 #ifdef DACCESS_COMPILE
-    virtual void EnumMemoryRegions(CLRDataEnumMemoryFlags flags);
+    void EnumMemoryRegions(CLRDataEnumMemoryFlags flags);
 #endif
 
 #ifndef DACCESS_COMPILE
@@ -402,12 +400,6 @@ class DomainAssembly final
         }
     };
 
-    void ReleaseManagedData()
-    {
-        if (m_pError)
-            m_pError->ConvertToHResult();
-    };
-
 public:
 // ------------------------------------------------------------
 // Debugger control API

src/coreclr/vm/peassembly.cpp

@@ -1080,7 +1080,7 @@ void PEAssembly::EnumMemoryRegions(CLRDataEnumMemoryFlags flags)
     WRAPPER_NO_CONTRACT;
     SUPPORTS_DAC;
 
-    DAC_ENUM_VTHIS();
+    DAC_ENUM_DTHIS();
     EMEM_OUT(("MEM: %p PEAssembly\n", dac_cast<TADDR>(this)));
 
 #ifdef _DEBUG

src/coreclr/vm/peassembly.h

@@ -83,11 +83,6 @@ typedef VPTR(PEAssembly) PTR_PEAssembly;
 
 class PEAssembly final
 {
-    // ------------------------------------------------------------
-    // SOS support
-    // ------------------------------------------------------------
-    VPTR_BASE_CONCRETE_VTABLE_CLASS(PEAssembly)
-
 public:
 
     // ------------------------------------------------------------
@@ -98,7 +93,7 @@ class PEAssembly final
     STDMETHOD_(ULONG, Release)();
 
 #ifdef DACCESS_COMPILE
-    virtual void EnumMemoryRegions(CLRDataEnumMemoryFlags flags);
+    void EnumMemoryRegions(CLRDataEnumMemoryFlags flags);
 #endif
 
 #if CHECK_INVARIANTS
@@ -381,7 +376,7 @@ class PEAssembly final
 
 #ifdef DACCESS_COMPILE
     // just to make the DAC and GCC happy.
-    virtual ~PEAssembly() {};
+    ~PEAssembly() {};
     PEAssembly() = default;
 #else
     PEAssembly(
@@ -393,7 +388,7 @@ class PEAssembly final
         BINDER_SPACE::Assembly* pHostAssembly = NULL
     );
 
-    virtual ~PEAssembly();
+    ~PEAssembly();
 #endif
 
     void OpenMDImport();