diff --git a/src/coreclr/debug/daccess/dacdbiimpl.cpp b/src/coreclr/debug/daccess/dacdbiimpl.cpp index 4f0ee1ab4de636..a6dda591278557 100644 --- a/src/coreclr/debug/daccess/dacdbiimpl.cpp +++ b/src/coreclr/debug/daccess/dacdbiimpl.cpp @@ -1207,7 +1207,7 @@ mdSignature DacDbiInterfaceImpl::GetILCodeAndSigHelper(Module * pModule, // Method not overridden - get the original copy of the IL by going to the PE file/RVA // If this is in a dynamic module then don't even attempt this since ReflectionModule::GetIL isn't // implemented for DAC. - if (pTargetIL == 0 && !pModule->IsReflection()) + if (pTargetIL == 0 && !pModule->IsReflectionEmit()) { pTargetIL = (TADDR)pModule->GetIL(methodRVA); } @@ -4281,7 +4281,7 @@ void DacDbiInterfaceImpl::GetMetadata(VMPTR_Module vmModule, TargetBuffer * pTar _ASSERTE(pModule->IsVisibleToDebugger()); // For dynamic modules, metadata is stored as an eagerly-serialized buffer hanging off the Reflection Module. - if (pModule->IsReflection()) + if (pModule->IsReflectionEmit()) { // Here is the fetch. ReflectionModule * pReflectionModule = pModule->GetReflectionModule(); @@ -4383,7 +4383,7 @@ void DacDbiInterfaceImpl::GetModuleData(VMPTR_Module vmModule, ModuleInfo * pDat pData->vmAssembly.SetHostPtr(pModule->GetAssembly()); // Is it dynamic? - BOOL fIsDynamic = pModule->IsReflection(); + BOOL fIsDynamic = pModule->IsReflectionEmit(); pData->fIsDynamic = fIsDynamic; // Get PE BaseAddress and Size diff --git a/src/coreclr/debug/daccess/request.cpp b/src/coreclr/debug/daccess/request.cpp index 515c057bb1b931..29e71fddae5a1d 100644 --- a/src/coreclr/debug/daccess/request.cpp +++ b/src/coreclr/debug/daccess/request.cpp @@ -1724,7 +1724,7 @@ ClrDataAccess::GetModuleData(CLRDATA_ADDRESS addr, struct DacpModuleData *Module ModuleData->Address = addr; ModuleData->PEAssembly = addr; // Module address in .NET 9+ - correspondingly, SOS-DAC APIs for PE assemblies expect a module address COUNT_T metadataSize = 0; - if (!pModule->GetPEAssembly()->IsDynamic()) + if (!pModule->IsReflectionEmit()) { ModuleData->ilBase = TO_CDADDR(dac_cast(pModule->GetPEAssembly()->GetLoadedLayout()->GetBase())); } @@ -1732,8 +1732,8 @@ ClrDataAccess::GetModuleData(CLRDATA_ADDRESS addr, struct DacpModuleData *Module ModuleData->metadataStart = (CLRDATA_ADDRESS)dac_cast(pModule->GetPEAssembly()->GetLoadedMetadata(&metadataSize)); ModuleData->metadataSize = (SIZE_T) metadataSize; - ModuleData->bIsReflection = pModule->IsReflection(); - ModuleData->bIsPEFile = !pModule->GetPEAssembly()->IsDynamic(); + ModuleData->bIsReflection = pModule->IsReflectionEmit(); + ModuleData->bIsPEFile = !pModule->IsReflectionEmit(); ModuleData->Assembly = HOST_CDADDR(pModule->GetAssembly()); ModuleData->dwModuleID = 0; // CoreCLR no longer has this concept ModuleData->dwModuleIndex = 0; // CoreCLR no longer has this concept @@ -2140,7 +2140,7 @@ ClrDataAccess::GetPEFileName(CLRDATA_ADDRESS moduleAddr, unsigned int count, _In if (!pPEAssembly->GetPath().DacGetUnicode(count, fileName, pNeeded)) hr = E_FAIL; } - else if (!pPEAssembly->IsDynamic()) + else if (!pPEAssembly->IsReflectionEmit()) { StackSString displayName; pPEAssembly->GetDisplayName(displayName, 0); @@ -2194,7 +2194,7 @@ ClrDataAccess::GetPEFileBase(CLRDATA_ADDRESS moduleAddr, CLRDATA_ADDRESS *base) PEAssembly* pPEAssembly = pModule->GetPEAssembly(); // More fields later? - if (!pPEAssembly->IsDynamic()) + if (!pPEAssembly->IsReflectionEmit()) { *base = TO_CDADDR(dac_cast(pPEAssembly->GetLoadedLayout()->GetBase())); } @@ -2709,7 +2709,7 @@ ClrDataAccess::GetAssemblyName(CLRDATA_ADDRESS assembly, unsigned int count, _In else if (name) name[count-1] = 0; } - else if (!pAssembly->GetPEAssembly()->IsDynamic()) + else if (!pAssembly->GetPEAssembly()->IsReflectionEmit()) { StackSString displayName; pAssembly->GetPEAssembly()->GetDisplayName(displayName, 0); diff --git a/src/coreclr/debug/daccess/task.cpp b/src/coreclr/debug/daccess/task.cpp index d94bf04a9d8998..ca597485584ba5 100644 --- a/src/coreclr/debug/daccess/task.cpp +++ b/src/coreclr/debug/daccess/task.cpp @@ -2483,7 +2483,7 @@ ClrDataModule::GetFlags( { *flags = 0; - if (m_module->IsReflection()) + if (m_module->IsReflectionEmit()) { (*flags) |= CLRDATA_MODULE_IS_DYNAMIC; } @@ -2706,7 +2706,7 @@ ClrDataModule::RequestGetModuleData( PEAssembly *pPEAssembly = pModule->GetPEAssembly(); outGMD->PEAssembly = TO_CDADDR(PTR_HOST_TO_TADDR(pModule)); - outGMD->IsDynamic = pModule->IsReflection(); + outGMD->IsDynamic = pModule->IsReflectionEmit(); if (pPEAssembly != NULL) { diff --git a/src/coreclr/debug/ee/debugger.cpp b/src/coreclr/debug/ee/debugger.cpp index 30d1969beab583..32c4fba244f007 100644 --- a/src/coreclr/debug/ee/debugger.cpp +++ b/src/coreclr/debug/ee/debugger.cpp @@ -9770,7 +9770,7 @@ void Debugger::SendClassLoadUnloadEvent (mdTypeDef classMetadataToken, DebuggerIPCEvent * pEvent = m_pRCThread->GetIPCEventSendBuffer(); - BOOL fIsReflection = pClassDebuggerModule->GetRuntimeModule()->IsReflection(); + BOOL fIsReflection = pClassDebuggerModule->GetRuntimeModule()->IsReflectionEmit(); if (fIsLoadEvent == TRUE) { diff --git a/src/coreclr/debug/ee/debugger.inl b/src/coreclr/debug/ee/debugger.inl index 4a8ea12740f739..b38e7f1fdcc993 100644 --- a/src/coreclr/debug/ee/debugger.inl +++ b/src/coreclr/debug/ee/debugger.inl @@ -74,7 +74,7 @@ inline DebuggerModule::DebuggerModule(Module * pRuntimeModule, // Dynamic modules must receive ClassLoad callbacks in order to receive metadata updates as the module // evolves. So we force this on here and refuse to change it for all dynamic modules. - if (pRuntimeModule->IsReflection()) + if (pRuntimeModule->IsReflectionEmit()) { EnableClassLoadCallbacks(TRUE); } diff --git a/src/coreclr/vm/assembly.cpp b/src/coreclr/vm/assembly.cpp index ae351c0b3d4705..c7fb64b38158aa 100644 --- a/src/coreclr/vm/assembly.cpp +++ b/src/coreclr/vm/assembly.cpp @@ -185,7 +185,7 @@ void Assembly::Init(AllocMemTracker *pamTracker, LoaderAllocator *pLoaderAllocat // make sure the PE is loaded or R2R will be disabled. pPEAssembly->EnsureLoaded(); - if (pPEAssembly->IsDynamic()) + if (pPEAssembly->IsReflectionEmit()) // manifest modules of dynamic assemblies are always transient m_pModule = ReflectionModule::Create(this, pPEAssembly, pamTracker, REFEMIT_MANIFEST_MODULE_NAME); else @@ -199,7 +199,7 @@ void Assembly::Init(AllocMemTracker *pamTracker, LoaderAllocator *pLoaderAllocat // loading it entirely. //CacheFriendAssemblyInfo(); - if (IsCollectible() && !pPEAssembly->IsDynamic()) + if (IsCollectible() && !pPEAssembly->IsReflectionEmit()) { COUNT_T size; BYTE* start = (BYTE*)pPEAssembly->GetLoadedImageContents(&size); diff --git a/src/coreclr/vm/assemblynative.cpp b/src/coreclr/vm/assemblynative.cpp index e4311c941a0ada..ade4baf688f30b 100644 --- a/src/coreclr/vm/assemblynative.cpp +++ b/src/coreclr/vm/assemblynative.cpp @@ -529,7 +529,7 @@ FCIMPL1(FC_BOOL_RET, AssemblyNative::IsDynamic, AssemblyBaseObject* pAssemblyUNS if (refAssembly == NULL) FCThrowRes(kArgumentNullException, W("Arg_InvalidHandle")); - FC_RETURN_BOOL(refAssembly->GetDomainAssembly()->GetPEAssembly()->IsDynamic()); + FC_RETURN_BOOL(refAssembly->GetDomainAssembly()->GetPEAssembly()->IsReflectionEmit()); } FCIMPLEND diff --git a/src/coreclr/vm/ceeload.cpp b/src/coreclr/vm/ceeload.cpp index 315f99547f4b26..81d6f2347cd1b6 100644 --- a/src/coreclr/vm/ceeload.cpp +++ b/src/coreclr/vm/ceeload.cpp @@ -535,7 +535,7 @@ static BOOL IsEditAndContinueCapable(Assembly *pAssembly, PEAssembly *pPEAssembl // Some modules are never EnC-capable return ! (pAssembly->GetDebuggerInfoBits() & DACF_ALLOW_JIT_OPTS || pPEAssembly->IsSystem() || - pPEAssembly->IsDynamic()); + pPEAssembly->IsReflectionEmit()); } /* static */ @@ -1187,7 +1187,7 @@ void Module::AllocateMaps() PTR_TADDR pTable = NULL; - if (IsReflection()) + if (IsReflectionEmit()) { // For dynamic modules, it is essential that we at least have a TypeDefToMethodTable // map with an initial block. Otherwise, all the iterators will abort on an @@ -1646,7 +1646,7 @@ ISymUnmanagedReader *Module::GetISymUnmanagedReader(void) if (GetInMemorySymbolStream() ) { - if( IsReflection() ) + if( IsReflectionEmit() ) { // If this is Reflection.Emit, we must clone the stream because another thread may // update it when someone is using the reader we create here leading to AVs. @@ -1999,7 +1999,7 @@ PTR_VOID Module::GetRvaField(DWORD rva) CHECK Module::CheckRvaField(RVA field) { WRAPPER_NO_CONTRACT; - if (!IsReflection()) + if (!IsReflectionEmit()) CHECK(m_pPEAssembly->CheckRvaField(field)); CHECK_OK; } @@ -2013,7 +2013,7 @@ CHECK Module::CheckRvaField(RVA field, COUNT_T size) } CONTRACTL_END; - if (!IsReflection()) + if (!IsReflectionEmit()) CHECK(m_pPEAssembly->CheckRvaField(field, size)); CHECK_OK; } @@ -2840,7 +2840,7 @@ void Module::UpdateDynamicMetadataIfNeeded() CONTRACTL_END; // Only need to serializing metadata for dynamic modules. For non-dynamic modules, metadata is already available. - if (!IsReflection()) + if (!IsReflectionEmit()) { return; } @@ -3727,7 +3727,7 @@ ReflectionModule *ReflectionModule::Create(Assembly *pAssembly, PEAssembly *pPEA STANDARD_VM_CHECK; PRECONDITION(CheckPointer(pAssembly)); PRECONDITION(CheckPointer(pPEAssembly)); - PRECONDITION(pPEAssembly->IsDynamic()); + PRECONDITION(pPEAssembly->IsReflectionEmit()); POSTCONDITION(CheckPointer(RETVAL)); } CONTRACT_END; diff --git a/src/coreclr/vm/ceeload.h b/src/coreclr/vm/ceeload.h index 762157327b425e..2523ebf45c1a89 100644 --- a/src/coreclr/vm/ceeload.h +++ b/src/coreclr/vm/ceeload.h @@ -866,7 +866,7 @@ class Module : public ModuleBase LIMITED_METHOD_CONTRACT; SUPPORTS_DAC; - _ASSERTE(IsReflection()); + _ASSERTE(IsReflectionEmit()); return dac_cast(this); } @@ -886,7 +886,7 @@ class Module : public ModuleBase CodeVersionManager * GetCodeVersionManager(); #endif - BOOL IsReflection() const { WRAPPER_NO_CONTRACT; SUPPORTS_DAC; return GetPEAssembly()->IsDynamic(); } + BOOL IsReflectionEmit() const { WRAPPER_NO_CONTRACT; SUPPORTS_DAC; return GetPEAssembly()->IsReflectionEmit(); } BOOL IsSystem() { WRAPPER_NO_CONTRACT; SUPPORTS_DAC; return m_pPEAssembly->IsSystem(); } // Returns true iff the debugger can see this module. BOOL IsVisibleToDebugger(); @@ -959,7 +959,7 @@ class Module : public ModuleBase SUPPORTS_DAC; #ifdef DACCESS_COMPILE - if (IsReflection()) + if (IsReflectionEmit()) { return DacGetMDImport(GetReflectionModule(), true); } diff --git a/src/coreclr/vm/clsload.cpp b/src/coreclr/vm/clsload.cpp index 32d69142890b5e..a85db9e3b96d1c 100644 --- a/src/coreclr/vm/clsload.cpp +++ b/src/coreclr/vm/clsload.cpp @@ -1932,7 +1932,7 @@ TypeHandle ClassLoader::LoadTypeDefThrowing(Module *pModule, #endif TRIGGERSGC(); - if (pModule->IsReflection()) + if (pModule->IsReflectionEmit()) { // Don't try to load types that are not in available table, when this // is an in-memory module. Raise the type-resolve event instead. @@ -2151,7 +2151,7 @@ TypeHandle ClassLoader::LoadTypeDefOrRefThrowing(ModuleBase *pModule, nameHandle.SetTokenNotToLoad(tokenNotToLoad); typeHnd = pFoundModule->GetClassLoader()-> LoadTypeHandleThrowIfFailed(&nameHandle, level, - pFoundModule->IsFullModule() ? (static_cast(pFoundModule)->IsReflection() ? NULL : static_cast(pFoundModule)) : NULL); + pFoundModule->IsFullModule() ? (static_cast(pFoundModule)->IsReflectionEmit() ? NULL : static_cast(pFoundModule)) : NULL); } } @@ -2326,7 +2326,7 @@ ClassLoader::ResolveNameToTypeDefThrowing( &pFoundModule, &foundExportedType, NULL, - pSourceModule->IsReflection() ? NULL : pSourceModule, + pSourceModule->IsReflectionEmit() ? NULL : pSourceModule, loadFlag)) { RETURN FALSE; diff --git a/src/coreclr/vm/commodule.cpp b/src/coreclr/vm/commodule.cpp index dfd3c97c5deab3..cfd5d8aba7303d 100644 --- a/src/coreclr/vm/commodule.cpp +++ b/src/coreclr/vm/commodule.cpp @@ -626,7 +626,7 @@ extern "C" void QCALLTYPE RuntimeModule_GetFullyQualifiedName(QCall::ModuleHandl HRESULT hr = S_OK; - if (!pModule->GetPEAssembly()->IsDynamic()) + if (!pModule->IsReflectionEmit()) { LPCWSTR fileName = pModule->GetPath(); if (*fileName != W('\0')) @@ -662,8 +662,7 @@ extern "C" HINSTANCE QCALLTYPE MarshalNative_GetHINSTANCE(QCall::ModuleHandle pM // This returns the base address // Other modules should have zero base - PEAssembly *pPEAssembly = pModule->GetPEAssembly(); - if (!pPEAssembly->IsDynamic()) + if (!pModule->IsReflectionEmit()) { hMod = (HMODULE) pModule->GetPEAssembly()->GetManagedFileContents(); } diff --git a/src/coreclr/vm/debugdebugger.cpp b/src/coreclr/vm/debugdebugger.cpp index f5882efdd5eb01..fcb46cded28c61 100644 --- a/src/coreclr/vm/debugdebugger.cpp +++ b/src/coreclr/vm/debugdebugger.cpp @@ -693,7 +693,7 @@ FCIMPL4(void, DebugStackTrace::GetStackFramesInternal, pLoadedPeSize[iNumValidFrames] = (CLR_I4)peSize; // Set flag indicating PE file in memory has the on disk layout - if (!pPEAssembly->IsDynamic()) + if (!pPEAssembly->IsReflectionEmit()) { // This flag is only available for non-dynamic assemblies. CLR_U1 *pIsFileLayout = (CLR_U1 *)((BOOLARRAYREF)pStackFrameHelper->rgiIsFileLayout)->GetDirectPointerToNonObjectElements(); diff --git a/src/coreclr/vm/dwbucketmanager.hpp b/src/coreclr/vm/dwbucketmanager.hpp index 4b7f922cbf1b6d..782cc89519d2f9 100644 --- a/src/coreclr/vm/dwbucketmanager.hpp +++ b/src/coreclr/vm/dwbucketmanager.hpp @@ -642,16 +642,12 @@ void BaseBucketParamsManager::GetModuleTimeStamp(_Out_writes_(maxLength) WCHAR* { EX_TRY { - // We only store the IL timestamp in the native image for the - // manifest module. We should consider fixing this for Orcas. - PTR_PEAssembly pFile = pModule->GetAssembly()->GetModule()->GetPEAssembly(); - // for dynamic modules use 0 as the time stamp ULONG ulTimeStamp = 0; - if (!pFile->IsDynamic()) + if (!pModule->IsReflectionEmit()) { - ulTimeStamp = pFile->GetPEImageTimeDateStamp(); + ulTimeStamp = pModule->GetPEAssembly()->GetPEImageTimeDateStamp(); _ASSERTE(ulTimeStamp != 0); } diff --git a/src/coreclr/vm/eventtrace.cpp b/src/coreclr/vm/eventtrace.cpp index 241e761d1dfb03..d2c515043a1adb 100644 --- a/src/coreclr/vm/eventtrace.cpp +++ b/src/coreclr/vm/eventtrace.cpp @@ -3253,7 +3253,7 @@ HRESULT ETW::CodeSymbolLog::GetInMemorySymbolsLength( //This method would work fine on reflection.emit, but there would be no way to know //if some other thread was changing the size of the symbols before this method returned. //Adding events or locks to detect/prevent changes would make the scenario workable - if (pModule->IsReflection()) + if (pModule->IsReflectionEmit()) { return COR_PRF_MODULE_DYNAMIC; } @@ -3339,7 +3339,7 @@ HRESULT ETW::CodeSymbolLog::ReadInMemorySymbols( //This method would work fine on reflection.emit, but there would be no way to know //if some other thread was changing the size of the symbols before this method returned. //Adding events or locks to detect/prevent changes would make the scenario workable - if (pModule->IsReflection()) + if (pModule->IsReflectionEmit()) { return COR_PRF_MODULE_DYNAMIC; } diff --git a/src/coreclr/vm/field.cpp b/src/coreclr/vm/field.cpp index 6a07f4909d444c..d67c68c27a37db 100644 --- a/src/coreclr/vm/field.cpp +++ b/src/coreclr/vm/field.cpp @@ -260,7 +260,7 @@ PTR_VOID FieldDesc::GetStaticAddressHandle(PTR_VOID base) Module* pModule = GetModule(); PTR_VOID ret = pModule->GetRvaField(GetOffset()); - _ASSERTE(pModule->GetPEAssembly()->IsDynamic() || !pModule->IsRvaFieldTls(GetOffset())); + _ASSERTE(pModule->IsReflectionEmit() || !pModule->IsRvaFieldTls(GetOffset())); return(ret); } diff --git a/src/coreclr/vm/method.cpp b/src/coreclr/vm/method.cpp index 9569534185546e..4a8dd9efbb57c3 100644 --- a/src/coreclr/vm/method.cpp +++ b/src/coreclr/vm/method.cpp @@ -2236,7 +2236,7 @@ void MethodDesc::Reset() _ASSERTE(InEnCEnabledModule() || // The process is frozen by the debugger IsDynamicMethod() || // These are used in a very restricted way - GetLoaderModule()->IsReflection()); // Rental methods + GetLoaderModule()->IsReflectionEmit()); // Rental methods // Reset any flags relevant to the old code ClearFlagsOnUpdate(); @@ -2248,7 +2248,7 @@ void MethodDesc::Reset() else { // We should go here only for the rental methods - _ASSERTE(GetLoaderModule()->IsReflection()); + _ASSERTE(GetLoaderModule()->IsReflectionEmit()); InterlockedUpdateFlags3(enum_flag3_HasStableEntryPoint | enum_flag3_HasPrecode, FALSE); diff --git a/src/coreclr/vm/multicorejitplayer.cpp b/src/coreclr/vm/multicorejitplayer.cpp index 59dac129a37804..4d810bd7d9c56b 100644 --- a/src/coreclr/vm/multicorejitplayer.cpp +++ b/src/coreclr/vm/multicorejitplayer.cpp @@ -444,7 +444,7 @@ bool MulticoreJitManager::IsSupportedModule(Module * pModule, bool fMethodJit) PEAssembly * pPEAssembly = pModule->GetPEAssembly(); // dynamic module. - if (pPEAssembly->IsDynamic()) // Ignore dynamic modules + if (pPEAssembly->IsReflectionEmit()) // Ignore dynamic modules { return false; } diff --git a/src/coreclr/vm/peassembly.cpp b/src/coreclr/vm/peassembly.cpp index c7c618b4852831..d6b49ee14cff2d 100644 --- a/src/coreclr/vm/peassembly.cpp +++ b/src/coreclr/vm/peassembly.cpp @@ -32,7 +32,7 @@ static void ValidatePEFileMachineType(PEAssembly *pPEAssembly) { STANDARD_VM_CONTRACT; - if (pPEAssembly->IsDynamic()) + if (pPEAssembly->IsReflectionEmit()) return; // PEFiles for ReflectionEmit assemblies don't cache the machine type. DWORD peKind; @@ -74,7 +74,7 @@ void PEAssembly::EnsureLoaded() } CONTRACT_END; - if (IsDynamic()) + if (IsReflectionEmit()) RETURN; // Ensure that loaded layout is available. @@ -208,7 +208,7 @@ PTR_CVOID PEAssembly::GetMetadata(COUNT_T *pSize) } CONTRACT_END; - if (IsDynamic() + if (IsReflectionEmit() || !GetPEImage()->HasNTHeaders() || !GetPEImage()->HasCorHeader()) { @@ -257,7 +257,7 @@ TADDR PEAssembly::GetIL(RVA il) { INSTANCE_CHECK; PRECONDITION(il != 0); - PRECONDITION(!IsDynamic()); + PRECONDITION(!IsReflectionEmit()); #ifndef DACCESS_COMPILE PRECONDITION(HasLoadedPEImage()); #endif @@ -389,7 +389,7 @@ void PEAssembly::OpenMDImport() if (m_pMDImport != NULL) return; - if (!IsDynamic() + if (!IsReflectionEmit() && GetPEImage()->HasNTHeaders() && GetPEImage()->HasCorHeader()) { @@ -626,7 +626,7 @@ void PEAssembly::GetPEKindAndMachine(DWORD* pdwKind, DWORD* pdwMachine) WRAPPER_NO_CONTRACT; _ASSERTE(pdwKind != NULL && pdwMachine != NULL); - if (IsDynamic()) + if (IsReflectionEmit()) { *pdwKind = 0; *pdwMachine = 0; @@ -1054,7 +1054,7 @@ LPCWSTR PEAssembly::GetPathForErrorMessages() } CONTRACTL_END - if (!IsDynamic()) + if (!IsReflectionEmit()) { return m_PEImage->GetPathForErrorMessages(); } @@ -1106,7 +1106,7 @@ PTR_AssemblyBinder PEAssembly::GetAssemblyBinder() // If we do not have a host assembly, check if we are dealing with // a dynamically emitted assembly and if so, use its fallback load context // binder reference. - if (IsDynamic()) + if (IsReflectionEmit()) { pBinder = GetFallbackBinder(); } diff --git a/src/coreclr/vm/peassembly.h b/src/coreclr/vm/peassembly.h index 49a9a3ffc5b21a..f30ce986cb372c 100644 --- a/src/coreclr/vm/peassembly.h +++ b/src/coreclr/vm/peassembly.h @@ -151,7 +151,7 @@ class PEAssembly final // ------------------------------------------------------------ BOOL IsSystem() const; - BOOL IsDynamic() const; + BOOL IsReflectionEmit() const; // ------------------------------------------------------------ // Metadata access @@ -260,7 +260,7 @@ class PEAssembly final BOOL IsLoaded() { - return IsDynamic() || HasLoadedPEImage(); + return IsReflectionEmit() || HasLoadedPEImage(); } BOOL IsPtrInPEImage(PTR_CVOID data); diff --git a/src/coreclr/vm/peassembly.inl b/src/coreclr/vm/peassembly.inl index 23af8bd7a0940f..9567f48dc84cbf 100644 --- a/src/coreclr/vm/peassembly.inl +++ b/src/coreclr/vm/peassembly.inl @@ -26,7 +26,7 @@ inline CHECK PEAssembly::Invariant() } CONTRACT_CHECK_END; - if (IsDynamic()) + if (IsReflectionEmit()) { // dynamic module case CHECK(m_PEImage == NULL); @@ -102,7 +102,7 @@ inline void PEAssembly::ValidateForExecution() // // Ensure platform is valid for execution // - if (!IsDynamic()) + if (!IsReflectionEmit()) { if (IsMarkedAsNoPlatform()) { @@ -150,7 +150,7 @@ inline const SString& PEAssembly::GetPath() } CONTRACTL_END; - if (IsDynamic() || m_PEImage->IsInBundle ()) + if (IsReflectionEmit() || m_PEImage->IsInBundle ()) { return SString::Empty(); } @@ -194,7 +194,7 @@ inline const SString &PEAssembly::GetModuleFileNameHint() } CONTRACTL_END; - if (IsDynamic()) + if (IsReflectionEmit()) { return SString::Empty(); } @@ -231,7 +231,7 @@ inline BOOL PEAssembly::IsSystem() const return m_isSystem; } -inline BOOL PEAssembly::IsDynamic() const +inline BOOL PEAssembly::IsReflectionEmit() const { LIMITED_METHOD_CONTRACT; SUPPORTS_DAC; @@ -345,7 +345,7 @@ inline mdToken PEAssembly::GetEntryPointToken() { WRAPPER_NO_CONTRACT; - if (IsDynamic()) + if (IsReflectionEmit()) return mdTokenNil; return GetPEImage()->GetEntryPointToken(); @@ -358,7 +358,7 @@ inline BOOL PEAssembly::IsILOnly() CONTRACT_VIOLATION(ThrowsViolation|GCViolation|FaultViolation); - if (IsDynamic()) + if (IsReflectionEmit()) return FALSE; return GetPEImage()->IsILOnly(); @@ -369,7 +369,7 @@ inline PTR_VOID PEAssembly::GetRvaField(RVA field) CONTRACT(void *) { INSTANCE_CHECK; - PRECONDITION(!IsDynamic()); + PRECONDITION(!IsReflectionEmit()); PRECONDITION(CheckRvaField(field)); PRECONDITION(HasLoadedPEImage()); NOTHROW; @@ -391,7 +391,7 @@ inline CHECK PEAssembly::CheckRvaField(RVA field) CONTRACT_CHECK { INSTANCE_CHECK; - PRECONDITION(!IsDynamic()); + PRECONDITION(!IsReflectionEmit()); PRECONDITION(HasLoadedPEImage()); NOTHROW; GC_NOTRIGGER; @@ -411,7 +411,7 @@ inline CHECK PEAssembly::CheckRvaField(RVA field, COUNT_T size) CONTRACT_CHECK { INSTANCE_CHECK; - PRECONDITION(!IsDynamic()); + PRECONDITION(!IsReflectionEmit()); PRECONDITION(HasLoadedPEImage()); NOTHROW; GC_NOTRIGGER; @@ -439,7 +439,7 @@ inline BOOL PEAssembly::HasTls() CONTRACTL_END; // Dynamic modules do not contain TLS data. - if (IsDynamic()) + if (IsReflectionEmit()) return FALSE; // ILOnly modules do not contain TLS data. else if (IsILOnly()) @@ -511,7 +511,7 @@ inline const void *PEAssembly::GetInternalPInvokeTarget(RVA target) CONTRACT(void *) { INSTANCE_CHECK; - PRECONDITION(!IsDynamic()); + PRECONDITION(!IsReflectionEmit()); PRECONDITION(CheckInternalPInvokeTarget(target)); PRECONDITION(HasLoadedPEImage()); NOTHROW; @@ -529,7 +529,7 @@ inline CHECK PEAssembly::CheckInternalPInvokeTarget(RVA target) CONTRACT_CHECK { INSTANCE_CHECK; - PRECONDITION(!IsDynamic()); + PRECONDITION(!IsReflectionEmit()); PRECONDITION(HasLoadedPEImage()); NOTHROW; GC_NOTRIGGER; @@ -556,7 +556,7 @@ inline IMAGE_COR_VTABLEFIXUP *PEAssembly::GetVTableFixups(COUNT_T *pCount/*=NULL } CONTRACT_END; - if (IsDynamic() || IsILOnly()) + if (IsReflectionEmit() || IsILOnly()) { if (pCount != NULL) *pCount = 0; @@ -571,7 +571,7 @@ inline void *PEAssembly::GetVTable(RVA rva) CONTRACT(void *) { INSTANCE_CHECK; - PRECONDITION(!IsDynamic()); + PRECONDITION(!IsReflectionEmit()); PRECONDITION(HasLoadedPEImage()); PRECONDITION(!IsILOnly()); PRECONDITION(GetLoadedLayout()->CheckRva(rva)); @@ -591,7 +591,7 @@ inline HMODULE PEAssembly::GetIJWBase() CONTRACTL { INSTANCE_CHECK; - PRECONDITION(!IsDynamic()); + PRECONDITION(!IsReflectionEmit()); PRECONDITION(HasLoadedPEImage()); PRECONDITION(!IsILOnly()); NOTHROW; diff --git a/src/coreclr/vm/proftoeeinterfaceimpl.cpp b/src/coreclr/vm/proftoeeinterfaceimpl.cpp index dc9d93a106145b..7c90d9e1753ecb 100644 --- a/src/coreclr/vm/proftoeeinterfaceimpl.cpp +++ b/src/coreclr/vm/proftoeeinterfaceimpl.cpp @@ -3941,7 +3941,7 @@ DWORD ProfToEEInterfaceImpl::GetModuleFlags(Module * pModule) } } - if (pModule->IsReflection()) + if (pModule->IsReflectionEmit()) { dwRet |= COR_PRF_MODULE_DYNAMIC; } @@ -4065,7 +4065,7 @@ HRESULT ProfToEEInterfaceImpl::GetModuleInfo2(ModuleID moduleId, if (pcchName) *pcchName = trueLen; - if (ppBaseLoadAddress != NULL && !pFile->IsDynamic()) + if (ppBaseLoadAddress != NULL && !pFile->IsReflectionEmit()) { if (pModule->IsProfilerNotified()) { @@ -4272,7 +4272,7 @@ HRESULT ProfToEEInterfaceImpl::GetILFunctionBody(ModuleID moduleId, IfFailRet(pImport->GetMethodImplProps(methodId, &RVA, &dwImplFlags)); // Check to see if the method has associated IL - if ((RVA == 0 && !pPEAssembly->IsDynamic()) || !(IsMiIL(dwImplFlags) || IsMiOPTIL(dwImplFlags) || IsMiInternalCall(dwImplFlags))) + if ((RVA == 0 && !pPEAssembly->IsReflectionEmit()) || !(IsMiIL(dwImplFlags) || IsMiOPTIL(dwImplFlags) || IsMiInternalCall(dwImplFlags))) { return (CORPROF_E_FUNCTION_NOT_IL); } @@ -10420,7 +10420,7 @@ HRESULT ProfToEEInterfaceImpl::GetInMemorySymbolsLength( //This method would work fine on reflection.emit, but there would be no way to know //if some other thread was changing the size of the symbols before this method returned. //Adding events or locks to detect/prevent changes would make the scenario workable - if (pModule->IsReflection()) + if (pModule->IsReflectionEmit()) { return COR_PRF_MODULE_DYNAMIC; } @@ -10491,7 +10491,7 @@ HRESULT ProfToEEInterfaceImpl::ReadInMemorySymbols( //This method would work fine on reflection.emit, but there would be no way to know //if some other thread was changing the size of the symbols before this method returned. //Adding events or locks to detect/prevent changes would make the scenario workable - if (pModule->IsReflection()) + if (pModule->IsReflectionEmit()) { return COR_PRF_MODULE_DYNAMIC; } diff --git a/src/coreclr/vm/rejit.cpp b/src/coreclr/vm/rejit.cpp index 5b92be45104a9f..aa07730259f32e 100644 --- a/src/coreclr/vm/rejit.cpp +++ b/src/coreclr/vm/rejit.cpp @@ -502,7 +502,7 @@ HRESULT ReJitManager::UpdateActiveILVersions( continue; } - if (pModule->IsReflection()) + if (pModule->IsReflectionEmit()) { ReportReJITError(pModule, rgMethodDefs[i], NULL, CORPROF_E_MODULE_IS_DYNAMIC); continue;