[cDAC] Delete GetAssemblyInfo (#127481)

Delete the DacDbi API GetAssemblyInfo

Author: rcj1

src/coreclr/debug/daccess/dacdbiimpl.cpp

@@ -4361,29 +4361,6 @@ HRESULT STDMETHODCALLTYPE DacDbiInterfaceImpl::GetModuleForAssembly(VMPTR_Assemb
     return hr;
 }
 
-
-// Implement IDacDbiInterface::GetAssemblyInfo
-HRESULT STDMETHODCALLTYPE DacDbiInterfaceImpl::GetAssemblyInfo(VMPTR_Assembly vmAssembly, OUT AssemblyInfo * pData)
-{
-    DD_ENTER_MAY_THROW;
-
-    HRESULT hr = S_OK;
-    EX_TRY
-    {
-
-        _ASSERTE(pData != NULL);
-
-        ZeroMemory(pData, sizeof(*pData));
-
-        Assembly * pAssembly  = vmAssembly.GetDacPtr();
-
-        pData->vmAssembly.SetHostPtr(pAssembly);
-        pData->vmAppDomain.SetHostPtr(AppDomain::GetCurrentDomain());
-    }
-    EX_CATCH_HRESULT(hr);
-    return hr;
-}
-
 // Implement IDacDbiInterface::GetModuleData
 HRESULT STDMETHODCALLTYPE DacDbiInterfaceImpl::GetModuleData(VMPTR_Module vmModule, OUT ModuleInfo * pData)
 {

src/coreclr/debug/daccess/dacdbiimpl.h

@@ -617,9 +617,6 @@ class DacDbiInterfaceImpl :
     // Gets properties for a module
     HRESULT STDMETHODCALLTYPE GetModuleData(VMPTR_Module vmModule, OUT ModuleInfo * pData);
 
-    // Gets properties for an assembly
-    HRESULT STDMETHODCALLTYPE GetAssemblyInfo(VMPTR_Assembly vmAssembly, OUT AssemblyInfo * pData);
-
     HRESULT STDMETHODCALLTYPE GetModuleForAssembly(VMPTR_Assembly vmAssembly, OUT VMPTR_Module * pModule);
 
     // Get the "type" of address.

src/coreclr/debug/di/divalue.cpp

@@ -2471,7 +2471,7 @@ HRESULT CordbObjectValue::EnumerateExceptionCallStack(ICorDebugExceptionObjectCa
             DacExceptionCallStackData& currentDacFrame = dacStackFrames[index];
             CorDebugExceptionObjectStackFrame& currentStackFrame = pStackFrames[index];
 
-            CordbAppDomain* pAppDomain = GetProcess()->LookupOrCreateAppDomain(currentDacFrame.vmAppDomain);
+            CordbAppDomain* pAppDomain = GetProcess()->GetAppDomain();
             CordbModule* pModule = pAppDomain->LookupOrCreateModule(currentDacFrame.vmAssembly);
 
             hr = pModule->QueryInterface(IID_ICorDebugModule, reinterpret_cast<void**>(&currentStackFrame.pModule));
@@ -2675,7 +2675,7 @@ HRESULT CordbObjectValue::GetTargetHelper(ICorDebugReferenceValue **ppTarget)
     }
 
     RSLockHolder lockHolder(GetProcess()->GetProcessLock());
-    RSSmartPtr<CordbAppDomain> pCordbAppDomForTarget(GetProcess()->LookupOrCreateAppDomain(pAppDomainOfTarget));
+    RSSmartPtr<CordbAppDomain> pCordbAppDomForTarget(GetProcess()->GetAppDomain());
     RSSmartPtr<CordbReferenceValue> targetObjRefVal(CordbValue::CreateHeapReferenceValue(pCordbAppDomForTarget, pDelegateTargetObj));
     *ppTarget = static_cast<ICorDebugReferenceValue*>(targetObjRefVal.GetValue());
     targetObjRefVal->ExternalAddRef();

src/coreclr/debug/di/module.cpp

@@ -57,20 +57,14 @@ CordbModule::CordbModule(
     m_fDynamic  = modInfo.fIsDynamic;
     m_fInMemory = modInfo.fInMemory;
     m_vmPEFile = modInfo.vmPEAssembly;
+    m_pAppDomain = pProcess->GetAppDomain();
 
     if (!vmAssembly.IsNull())
     {
-        AssemblyInfo dfInfo;
-
-        IfFailThrow(pProcess->GetDAC()->GetAssemblyInfo(vmAssembly, &dfInfo)); // throws
-
-        m_pAppDomain = pProcess->LookupOrCreateAppDomain(dfInfo.vmAppDomain);
-        _ASSERTE(m_pAppDomain == pProcess->GetAppDomain());
-        m_pAssembly  = m_pAppDomain->LookupOrCreateAssembly(dfInfo.vmAssembly);
+        m_pAssembly  = m_pAppDomain->LookupOrCreateAssembly(vmAssembly);
     }
     else
     {
-        m_pAppDomain = pProcess->GetAppDomain();
         m_pAssembly = m_pAppDomain->LookupOrCreateAssembly(modInfo.vmAssembly);
     }
 #ifdef _DEBUG

src/coreclr/debug/di/process.cpp

@@ -360,9 +360,7 @@ IMDInternalImport * CordbProcess::LookupMetaData(VMPTR_PEAssembly vmPEAssembly)
     }
 
     // Cache didn't have it... time to search harder
-    VMPTR_AppDomain vmAppDomain;
-    GetDAC()->GetCurrentAppDomain(&vmAppDomain);
-    LookupOrCreateAppDomain(vmAppDomain);
+    GetAppDomain();
 
     // There may be perf issues here. The DAC may make a lot of metadata requests, and so
     // this may be an area for potential perf optimizations if we find things running slow.
@@ -2638,28 +2636,22 @@ COM_METHOD CordbProcess::GetAsyncStack(CORDB_ADDRESS continuationAddress, ICorDe
 
 HRESULT CordbProcess::GetTypeForObject(CORDB_ADDRESS addr, CordbType **ppType, CordbAppDomain **pAppDomain)
 {
-    VMPTR_AppDomain appDomain = VMPTR_AppDomain::NullPtr();
-
     HRESULT hr = E_FAIL;
-    IfFailThrow(GetDAC()->GetCurrentAppDomain(&appDomain));
-    if (!appDomain.IsNull())
-    {
-        CordbAppDomain *cdbAppDomain = appDomain.IsNull() ? GetAppDomain() : LookupOrCreateAppDomain(appDomain);
+    CordbAppDomain *cdbAppDomain = GetAppDomain();
 
-        _ASSERTE(cdbAppDomain);
+    _ASSERTE(cdbAppDomain);
 
-        DebuggerIPCE_ExpandedTypeData data;
-        IfFailThrow(GetDAC()->GetObjectExpandedTypeInfo(AllBoxed, addr, &data));
+    DebuggerIPCE_ExpandedTypeData data;
+    IfFailThrow(GetDAC()->GetObjectExpandedTypeInfo(AllBoxed, addr, &data));
 
-        CordbType *type = 0;
-        hr = CordbType::TypeDataToType(cdbAppDomain, &data, &type);
+    CordbType *type = 0;
+    hr = CordbType::TypeDataToType(cdbAppDomain, &data, &type);
 
-        if (SUCCEEDED(hr))
-        {
-            *ppType = type;
-            if (pAppDomain)
-                *pAppDomain = cdbAppDomain;
-        }
+    if (SUCCEEDED(hr))
+    {
+        *ppType = type;
+        if (pAppDomain)
+            *pAppDomain = cdbAppDomain;
     }
 
     return hr;
@@ -2797,7 +2789,7 @@ HRESULT CordbRefEnum::Next(ULONG celt, COR_GC_REFERENCE refs[], ULONG *pceltFetc
                 {
                     for (ULONG i = 0; i < fetched; ++i)
                     {
-                        CordbAppDomain *pDomain = process->LookupOrCreateAppDomain(dacRefs[i].vmDomain);
+                        CordbAppDomain *pDomain = process->GetAppDomain();
 
                         ICorDebugAppDomain *pAppDomain = NULL;
                         ICorDebugValue *pOutObject = NULL;
@@ -4870,10 +4862,7 @@ void CordbProcess::RawDispatchEvent(
         pThread = LookupOrCreateThread(pEvent->vmThread);
     }
 
-    if (!pEvent->vmAppDomain.IsNull())
-    {
-        pAppDomain.Assign(LookupOrCreateAppDomain(pEvent->vmAppDomain));
-    }
+    pAppDomain.Assign(GetAppDomain());
 
     DWORD dwVolatileThreadId = 0;
     if (pThread != NULL)
@@ -5386,7 +5375,7 @@ void CordbProcess::RawDispatchEvent(
             // Either way, still send the CreateEvent. (We don't want to skip the Create event
             // just because the debugger did an enumerate)
             // We remove AppDomains from the hash as soon as they are exited.
-            pAppDomain.Assign(LookupOrCreateAppDomain(pEvent->AppDomainData.vmAppDomain));
+            pAppDomain.Assign(GetAppDomain());
             _ASSERTE(pAppDomain != NULL); // throws on failure
 
             {
@@ -5461,7 +5450,7 @@ void CordbProcess::RawDispatchEvent(
             pEval->m_resultType     = pEvent->FuncEvalComplete.resultType;
             pEval->m_resultAppDomainToken = pEvent->FuncEvalComplete.vmAppDomain;
 
-            CordbAppDomain *pResultAppDomain = LookupOrCreateAppDomain(pEvent->FuncEvalComplete.vmAppDomain);
+            CordbAppDomain *pResultAppDomain = GetAppDomain();
 
             _ASSERTE(OutstandingEvalCount() > 0);
             DecrementOutstandingEvalCount();
@@ -5531,7 +5520,7 @@ void CordbProcess::RawDispatchEvent(
             else
             {
                 _ASSERTE (pEvent->NameChange.eventType == APP_DOMAIN_NAME_CHANGE);
-                pAppDomain.Assign(LookupOrCreateAppDomain(pEvent->NameChange.vmAppDomain));
+                pAppDomain.Assign(GetAppDomain());
                 if (pAppDomain)
                 {
                     pAppDomain->InvalidateName();
@@ -8559,33 +8548,6 @@ HRESULT CordbProcess::SafeReadBuffer(TargetBuffer tb, BYTE * pLocalBuffer, BOOL
     return S_OK;
 }
 
-
-//---------------------------------------------------------------------------------------
-// Lookup or create an appdomain.
-//
-// Arguments:
-//     vmAppDomain - CLR appdomain to lookup
-//
-// Returns:
-//     Instance of CordbAppDomain for the given appdomain. This is a cached instance.
-//     If the CordbAppDomain does not yet exist, it will be created and added to the cache.
-//     Never returns NULL. Throw on error.
-CordbAppDomain * CordbProcess::LookupOrCreateAppDomain(VMPTR_AppDomain vmAppDomain)
-{
-    if (m_pAppDomain == NULL)
-    {
-        _ASSERTE(GetProcessLock()->HasLock());
-
-        RSInitHolder<CordbAppDomain> pAppDomain;
-        pAppDomain.Assign(new CordbAppDomain(this, vmAppDomain));  // throws
-
-        m_pAppDomain = pAppDomain;
-        m_pAppDomain->InternalAddRef();
-        pAppDomain.ClearAndMarkDontNeuter();
-    }
-    return m_pAppDomain;
-}
-
 CordbAppDomain * CordbProcess::GetAppDomain()
 {
     // Return the one and only app domain
@@ -8594,10 +8556,17 @@ CordbAppDomain * CordbProcess::GetAppDomain()
         return m_pAppDomain;
     }
 
+    _ASSERTE(GetProcessLock()->HasLock());
+
     VMPTR_AppDomain vmAppDomain;
     IfFailThrow(GetDAC()->GetCurrentAppDomain(&vmAppDomain));
-    CordbAppDomain * appDomain = LookupOrCreateAppDomain(vmAppDomain);
-    return appDomain;
+    RSInitHolder<CordbAppDomain> pAppDomain;
+    pAppDomain.Assign(new CordbAppDomain(this, vmAppDomain));  // throws
+
+    m_pAppDomain = pAppDomain;
+    m_pAppDomain->InternalAddRef();
+    pAppDomain.ClearAndMarkDontNeuter();
+    return m_pAppDomain;
 }
 
 //---------------------------------------------------------------------------------------
@@ -8625,9 +8594,7 @@ HRESULT CordbProcess::EnumerateAppDomains(ICorDebugAppDomainEnum **ppAppDomains)
         ValidateOrThrow(ppAppDomains);
 
         // Ensure the appdomain is populated.
-        VMPTR_AppDomain vmAppDomain;
-        GetDAC()->GetCurrentAppDomain(&vmAppDomain);
-        LookupOrCreateAppDomain(vmAppDomain);
+        GetAppDomain();
 
         RSSmartPtr<CordbAppDomain> rgAppDomains[1];
         DWORD count = 0;
@@ -15082,11 +15049,9 @@ HRESULT CordbProcess::GetReferenceValueFromGCHandle(
         {
             ThrowHR(CORDBG_E_BAD_REFERENCE_VALUE);
         }
-        VMPTR_AppDomain vmAppDomain;
-        IfFailThrow(pDAC->GetCurrentAppDomain(&vmAppDomain));
 
         RSLockHolder lockHolder(GetProcessLock());
-        CordbAppDomain * pAppDomain = LookupOrCreateAppDomain(vmAppDomain);
+        CordbAppDomain * pAppDomain = GetAppDomain();
         lockHolder.Release();
 
         // Now that we finally have the AppDomain, we can go ahead and get a ReferenceValue

src/coreclr/debug/di/rspriv.h

@@ -3658,9 +3658,6 @@ class CordbProcess :
 
     void PrepopulateThreadsOrThrow();
 
-    // Lookup or create an appdomain.
-    CordbAppDomain * LookupOrCreateAppDomain(VMPTR_AppDomain vmAppDomain);
-
     // Get the app domain.
     CordbAppDomain * GetAppDomain();
 

src/coreclr/debug/di/rsstackwalk.cpp

@@ -642,7 +642,7 @@ HRESULT CordbStackWalk::GetFrameWorker(ICorDebugFrame ** ppFrame)
 
         // Lookup the appdomain that the thread was in when it was executing code for this frame. We pass this
         // to the frame when we create it so we can properly resolve locals in that frame later.
-        CordbAppDomain * pCurrentAppDomain = GetProcess()->LookupOrCreateAppDomain(frameData.vmCurrentAppDomainToken);
+        CordbAppDomain * pCurrentAppDomain = GetProcess()->GetAppDomain();
         _ASSERTE(pCurrentAppDomain != NULL);
 
         // Lookup the module
@@ -819,8 +819,7 @@ HRESULT CordbStackWalk::GetFrameWorker(ICorDebugFrame ** ppFrame)
 
         // Lookup the appdomain that the thread was in when it was executing code for this frame. We pass this
         // to the frame when we create it so we can properly resolve locals in that frame later.
-        CordbAppDomain * pCurrentAppDomain =
-            GetProcess()->LookupOrCreateAppDomain(frameData.vmCurrentAppDomainToken);
+        CordbAppDomain * pCurrentAppDomain = GetProcess()->GetAppDomain();
         _ASSERTE(pCurrentAppDomain != NULL);
 
         CordbRuntimeUnwindableFrame * pRuntimeFrame = new CordbRuntimeUnwindableFrame(m_pCordbThread,

src/coreclr/debug/di/rsthread.cpp

@@ -2300,12 +2300,7 @@ void CordbThread::GetActiveInternalFramesCallback(const DebuggerIPCE_STRData * p
     _ASSERTE(pFrameData->eType == DebuggerIPCE_STRData::cStubFrame);
 
     // Look up the CordbAppDomain.
-    CordbAppDomain * pAppDomain = NULL;
-    VMPTR_AppDomain vmCurrentAppDomain = pFrameData->vmCurrentAppDomainToken;
-    if (!vmCurrentAppDomain.IsNull())
-    {
-        pAppDomain = pThis->GetProcess()->LookupOrCreateAppDomain(vmCurrentAppDomain);
-    }
+    CordbAppDomain * pAppDomain = pThis->GetProcess()->GetAppDomain();
 
     // Create a CordbInternalFrame.
     CordbInternalFrame * pInternalFrame = new CordbInternalFrame(pThis,
@@ -10471,7 +10466,7 @@ HRESULT CordbEval::GetResult(ICorDebugValue **ppResult)
             // @dbgtodo  funceval - push this up
             RSLockHolder lockHolder(GetProcess()->GetProcessLock());
 
-            pAppDomain = m_thread->GetProcess()->LookupOrCreateAppDomain(m_resultAppDomainToken);
+            pAppDomain = m_thread->GetProcess()->GetAppDomain();
         }
         else
         {

src/coreclr/debug/inc/dacdbiinterface.h

@@ -490,24 +490,8 @@ IDacDbiInterface : public IUnknown
     //    vmModule - vm handle to a module
     //    pData - required out parameter which will be filled out with module properties
     //
-    // Notes:
-    //    See definition of AssemblyInfo for more details about what properties
-    //    this gives back.
     virtual HRESULT STDMETHODCALLTYPE GetModuleData(VMPTR_Module vmModule, OUT ModuleInfo * pData) = 0;
 
-
-    //
-    // Get properties for a Assembly
-    //
-    // Arguments:
-    //    vmAssembly - vm handle to a Assembly
-    //    pData - required out parameter which will be filled out with module properties
-    //
-    // Notes:
-    //    See definition of AssemblyInfo for more details about what properties
-    //    this gives back.
-    virtual HRESULT STDMETHODCALLTYPE GetAssemblyInfo(VMPTR_Assembly vmAssembly, OUT AssemblyInfo * pData) = 0;
-
     virtual HRESULT STDMETHODCALLTYPE GetModuleForAssembly(VMPTR_Assembly vmAssembly, OUT VMPTR_Module * pModule) = 0;
 
     //.........................................................................

src/coreclr/debug/inc/dacdbistructures.h

@@ -160,22 +160,10 @@ struct MSLAYOUT TargetBuffer
     ULONG         cbSize;
 };
 
-//===================================================================================
 // Module properties, retrieved by DAC.
-// Describes a VMPTR_Assembly representing a module.
-//===================================================================================
-struct MSLAYOUT AssemblyInfo
-{
-    // The appdomain that the Assembly is associated with.
-    VMPTR_AppDomain vmAppDomain;
-
-    // The assembly this module belongs to. All modules live in an assembly.
-    VMPTR_Assembly vmAssembly;
-};
-
 struct MSLAYOUT ModuleInfo
 {
-    // The non-domain specific assembly which this module resides in.
+    // The assembly which this module resides in.
     VMPTR_Assembly vmAssembly;
 
     // The PE Base address and size of the module. These may be 0 if there is no image