@@ -82,7 +82,7 @@ namespace
8282
8383 void PopulateBindRequest (/* inout*/ BinderTracing::AssemblyBindOperation::BindRequest &request)
8484 {
85- AssemblySpec *spec = request.AssemblySpec ;
85+ AssemblySpec *spec = request.AssemblySpecPtr ;
8686 _ASSERTE (spec != nullptr );
8787
8888 if (spec->GetName () != nullptr )
@@ -172,7 +172,7 @@ namespace BinderTracing
172172
173173 // ActivityTracker or EventSource may have triggered the system satellite load, or load of System.Private.CoreLib
174174 // Don't track such bindings to avoid potential infinite recursion.
175- m_ignoreBind = t_AssemblyLoadStartInProgress && (m_bindRequest.AssemblySpec ->IsCoreLib () || m_bindRequest.AssemblySpec ->IsCoreLibSatellite ());
175+ m_ignoreBind = t_AssemblyLoadStartInProgress && (m_bindRequest.AssemblySpecPtr ->IsCoreLib () || m_bindRequest.AssemblySpecPtr ->IsCoreLibSatellite ());
176176 m_checkedIgnoreBind = true ;
177177 return m_ignoreBind;
178178 }
@@ -234,12 +234,12 @@ namespace BinderTracing
234234 bool isLastAttempt = appAssembliesAttempt == nullptr ;
235235 TraceStage (Stage::FindInLoadContext,
236236 isLastAttempt && FAILED (m_hr) && SUCCEEDED (inContextAttempt->HResult ) ? m_hr : inContextAttempt->HResult ,
237- inContextAttempt->Assembly ,
237+ inContextAttempt->AssemblyHolder ,
238238 mvidMismatch && isLastAttempt ? errorMsg.GetUnicode () : nullptr );
239239 }
240240
241241 if (appAssembliesAttempt != nullptr )
242- TraceStage (Stage::ApplicationAssemblies, FAILED (m_hr) && SUCCEEDED (appAssembliesAttempt->HResult ) ? m_hr : appAssembliesAttempt->HResult , appAssembliesAttempt->Assembly , mvidMismatch ? errorMsg.GetUnicode () : nullptr );
242+ TraceStage (Stage::ApplicationAssemblies, FAILED (m_hr) && SUCCEEDED (appAssembliesAttempt->HResult ) ? m_hr : appAssembliesAttempt->HResult , appAssembliesAttempt->AssemblyHolder , mvidMismatch ? errorMsg.GetUnicode () : nullptr );
243243 }
244244
245245 void ResolutionAttemptedOperation::TraceStage (Stage stage, HRESULT hr, BINDER_SPACE::Assembly *resultAssembly, const WCHAR *customError)
0 commit comments