diff options
author | dotnet-bot <dotnet-bot@microsoft.com> | 2017-02-07 10:13:11 +0300 |
---|---|---|
committer | dotnet-bot <dotnet-bot@microsoft.com> | 2017-02-07 10:13:11 +0300 |
commit | aa0fb82c1b78a8323d822d8fb69c2af895b2faeb (patch) | |
tree | d3957eba85bcc219f27da2e48f6429e66035a813 /src/Native/Runtime/MiscHelpers.cpp | |
parent | f70b3b312e248343aec127568be1c2c5147a0674 (diff) |
RI from ProjNdev3
[tfs-changeset: 1646943]
Diffstat (limited to 'src/Native/Runtime/MiscHelpers.cpp')
-rw-r--r-- | src/Native/Runtime/MiscHelpers.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/Native/Runtime/MiscHelpers.cpp b/src/Native/Runtime/MiscHelpers.cpp index 6eb25def8..2e58e9bc5 100644 --- a/src/Native/Runtime/MiscHelpers.cpp +++ b/src/Native/Runtime/MiscHelpers.cpp @@ -114,9 +114,14 @@ COOP_PINVOKE_HELPER(HANDLE, RhGetModuleFromPointer, (PTR_VOID pPointerVal)) COOP_PINVOKE_HELPER(HANDLE, RhGetModuleFromEEType, (EEType * pEEType)) { -#if CORERT +#if CORERT return (HANDLE)(pEEType->GetTypeManager()); #else +#if EETYPE_MODULE_MANAGER + if (pEEType->HasTypeManager()) + return (HANDLE)(pEEType->GetTypeManager()); +#endif + // For dynamically created types, return the module handle that contains the template type if (pEEType->IsDynamicType()) pEEType = pEEType->get_DynamicTemplateType(); @@ -635,18 +640,11 @@ COOP_PINVOKE_HELPER(Boolean, RhpRegisterFrozenSegment, (void* pSegmentStart, UIn return RedhawkGCInterface::RegisterFrozenSection(pSegmentStart, length) != NULL; } -#ifdef CORERT COOP_PINVOKE_HELPER(void*, RhpGetModuleSection, (TypeManager* pModule, Int32 headerId, Int32* length)) { return pModule->GetModuleSection((ReadyToRunSectionType)headerId, length); } -COOP_PINVOKE_HELPER(void*, RhpCreateTypeManager, (void* pModuleHeader)) -{ - return TypeManager::Create(pModuleHeader); -} -#endif - COOP_PINVOKE_HELPER(void, RhGetCurrentThreadStackBounds, (PTR_VOID * ppStackLow, PTR_VOID * ppStackHigh)) { ThreadStore::GetCurrentThread()->GetStackBounds(ppStackLow, ppStackHigh); |