Merge main into Reflection.Emit RVA storage

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
jkoritzinsky · Oct 2, 2026 · Sep 30, 2026 · Sep 30, 2026 · Oct 1, 2026 · Oct 1, 2026
commit a78c901becd38700da13d7f5b6526bb41eeaec9e
diff --git a/src/coreclr/vm/ceeload.cpp b/src/coreclr/vm/ceeload.cpp
@@ -3861,7 +3861,10 @@ void ReflectionModule::Initialize(AllocMemTracker *pamTracker, LPCWSTR szName)
 
     m_pInMemoryWriter = new RefClassWriter();
 
-    IfFailThrow(m_pInMemoryWriter->Init(GetEmitter(), szName));
+    IfFailThrow(m_pInMemoryWriter->Init(
+        GetPEAssembly()->GetMDInternalEmit(),
+        GetMDImport(),
+        szName));
 
     m_CrstLeafLock.Init(CrstLeafLock);
 }

diff --git a/src/coreclr/vm/reflectclasswriter.cpp b/src/coreclr/vm/reflectclasswriter.cpp
@@ -12,12 +12,16 @@
 //* constructor for RefClassWriter
 //*
 //******************************************************
-HRESULT RefClassWriter::Init(IUnknown *pUnk, LPCWSTR szName)
+HRESULT RefClassWriter::Init(
+    IMDInternalEmit *pEmitter,
+    IMDInternalImport *pInternalImport,
+    LPCWSTR szName)
 {
     CONTRACTL {
         STANDARD_VM_CHECK;
 
-        PRECONDITION(CheckPointer(pUnk));
+        PRECONDITION(CheckPointer(pEmitter));
+        PRECONDITION(CheckPointer(pInternalImport));
     }
     CONTRACTL_END;
 
@@ -26,22 +30,10 @@ HRESULT RefClassWriter::Init(IUnknown *pUnk, LPCWSTR szName)
     m_internalimport = NULL;
     m_ulResourceSize = 0;
 
-    // Get the interfaces
-    HRESULT hr = pUnk->QueryInterface(IID_IMetaDataEmit2, (void**)&m_emitter);
-    if (FAILED(hr))
-        return hr;
-
-    hr = pUnk->QueryInterface(IID_IMetaDataImport, (void**)&m_importer);
-    if (FAILED(hr))
-        return hr;
-
-    hr = pUnk->QueryInterface(IID_IMetaDataEmitHelper, (void**)&m_pEmitHelper);
-    if (FAILED(hr))
-        return hr;
-
-    hr = GetMDInternalInterfaceFromPublic(pUnk, IID_IMDInternalImport, (void**)&m_internalimport);
-    if (FAILED(hr))
-        return hr;
+    m_emitter = pEmitter;
+    m_emitter->AddRef();
+    m_internalimport = pInternalImport;
+    m_internalimport->AddRef();
 
     // <TODO> We will need to set this at some point.</TODO>
     HRESULT hr = m_emitter->SetModuleProps(szName);

diff --git a/src/coreclr/vm/reflectclasswriter.h b/src/coreclr/vm/reflectclasswriter.h
@@ -14,15 +14,17 @@ class RefClassWriter {
     friend class COMDynamicWrite;
 	IMDInternalEmit*		m_emitter;			// Emit interface.
 	IMDInternalImport*		m_internalimport;	// Scopeless internal import interface
-	IMetaDataEmitHelper*	m_pEmitHelper;
 	ULONG					m_ulResourceSize;
 
 public:
     RefClassWriter() {
         LIMITED_METHOD_CONTRACT;
     }
 
-	HRESULT		Init(IUnknown *pUnk, LPCWSTR szName);
+	HRESULT		Init(
+        IMDInternalEmit *pEmitter,
+        IMDInternalImport *pInternalImport,
+        LPCWSTR szName);
 
 	IMDInternalEmit* GetEmitter() {
         LIMITED_METHOD_CONTRACT;