diff options
| author | Steve MacLean <stmaclea@microsoft.com> | 2018-12-03 12:49:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-03 12:49:31 -0500 |
| commit | 411f9787617f6bdc64c8393a51ac3b7a0d6e35f4 (patch) | |
| tree | 618cf332ea7a4daf5feb802b4672a19bdd84a16b /src/vm/eventtrace.cpp | |
| parent | f54494af07aec0d927962846eb4394c118a2fef8 (diff) | |
| download | coreclr-411f9787617f6bdc64c8393a51ac3b7a0d6e35f4.tar.gz coreclr-411f9787617f6bdc64c8393a51ac3b7a0d6e35f4.tar.bz2 coreclr-411f9787617f6bdc64c8393a51ac3b7a0d6e35f4.zip | |
Remove IsNeutralDomain() (#21318)
* Remove IsNeutralDomain()
* PR feedback
Diffstat (limited to 'src/vm/eventtrace.cpp')
| -rw-r--r-- | src/vm/eventtrace.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/vm/eventtrace.cpp b/src/vm/eventtrace.cpp index 7a45cb17fb..7b3c6aedcf 100644 --- a/src/vm/eventtrace.cpp +++ b/src/vm/eventtrace.cpp @@ -5720,15 +5720,13 @@ VOID ETW::LoaderLog::SendAssemblyEvent(Assembly *pAssembly, DWORD dwEventOptions PCWSTR szDtraceOutput1=W(""); BOOL bIsDynamicAssembly = pAssembly->IsDynamic(); BOOL bIsCollectibleAssembly = pAssembly->IsCollectible(); - BOOL bIsDomainNeutral = pAssembly->IsDomainNeutral() ; BOOL bHasNativeImage = pAssembly->GetManifestFile()->HasNativeImage(); BOOL bIsReadyToRun = pAssembly->GetManifestFile()->IsILImageReadyToRun(); ULONGLONG ullAssemblyId = (ULONGLONG)pAssembly; ULONGLONG ullDomainId = (ULONGLONG)pAssembly->GetDomain(); ULONGLONG ullBindingID = 0; - ULONG ulAssemblyFlags = ((bIsDomainNeutral ? ETW::LoaderLog::LoaderStructs::DomainNeutralAssembly : 0) | - (bIsDynamicAssembly ? ETW::LoaderLog::LoaderStructs::DynamicAssembly : 0) | + ULONG ulAssemblyFlags = ((bIsDynamicAssembly ? ETW::LoaderLog::LoaderStructs::DynamicAssembly : 0) | (bHasNativeImage ? ETW::LoaderLog::LoaderStructs::NativeAssembly : 0) | (bIsCollectibleAssembly ? ETW::LoaderLog::LoaderStructs::CollectibleAssembly : 0) | (bIsReadyToRun ? ETW::LoaderLog::LoaderStructs::ReadyToRunAssembly : 0)); @@ -6042,7 +6040,6 @@ VOID ETW::LoaderLog::SendModuleEvent(Module *pModule, DWORD dwEventOptions, BOOL ULONGLONG ullAppDomainId = 0; // This is used only with DomainModule events ULONGLONG ullModuleId = (ULONGLONG)(TADDR) pModule; ULONGLONG ullAssemblyId = (ULONGLONG)pModule->GetAssembly(); - BOOL bIsDomainNeutral = pModule->GetAssembly()->IsDomainNeutral(); BOOL bIsIbcOptimized = FALSE; if(bHasNativeImage) { @@ -6050,8 +6047,7 @@ VOID ETW::LoaderLog::SendModuleEvent(Module *pModule, DWORD dwEventOptions, BOOL } BOOL bIsReadyToRun = pModule->IsReadyToRun(); ULONG ulReservedFlags = 0; - ULONG ulFlags = ((bIsDomainNeutral ? ETW::LoaderLog::LoaderStructs::DomainNeutralModule : 0) | - (bHasNativeImage ? ETW::LoaderLog::LoaderStructs::NativeModule : 0) | + ULONG ulFlags = ((bHasNativeImage ? ETW::LoaderLog::LoaderStructs::NativeModule : 0) | (bIsDynamicAssembly ? ETW::LoaderLog::LoaderStructs::DynamicModule : 0) | (bIsManifestModule ? ETW::LoaderLog::LoaderStructs::ManifestModule : 0) | (bIsIbcOptimized ? ETW::LoaderLog::LoaderStructs::IbcOptimized : 0) | @@ -7042,9 +7038,6 @@ VOID ETW::EnumerationLog::IterateDomain(BaseDomain *pDomain, DWORD enumerationOp while (assemblyIterator.Next(pDomainAssembly.This())) { CollectibleAssemblyHolder<Assembly *> pAssembly = pDomainAssembly->GetLoadedAssembly(); - BOOL bIsDomainNeutral = pAssembly->IsDomainNeutral(); - if (bIsDomainNeutral) - continue; if (enumerationOptions & ETW::EnumerationLog::EnumerationStructs::DomainAssemblyModuleDCStart) { ETW::EnumerationLog::IterateAssembly(pAssembly, enumerationOptions); @@ -7110,7 +7103,6 @@ VOID ETW::EnumerationLog::IterateCollectibleLoaderAllocator(AssemblyLoaderAlloca while (!domainAssemblyIt.end()) { Assembly *pAssembly = domainAssemblyIt->GetAssembly(); // TODO: handle iterator - _ASSERTE(!pAssembly->IsDomainNeutral()); // Collectible Assemblies are not domain neutral. DomainModuleIterator domainModuleIterator = domainAssemblyIt->IterateModules(kModIterIncludeLoaded); while (domainModuleIterator.Next()) |