diff options
author | Jan Kotas <jkotas@microsoft.com> | 2018-08-11 07:43:16 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-11 07:43:16 -0700 |
commit | af4ec7c89d0192ad14392da04e8c097da8ec9e48 (patch) | |
tree | 0b3018c1c576114d2b5b0f355df6ff48972a6c5d /src/vm/peimage.inl | |
parent | f551543427176850c84b9e11c7b8d528c3f282a7 (diff) | |
download | coreclr-af4ec7c89d0192ad14392da04e8c097da8ec9e48.tar.gz coreclr-af4ec7c89d0192ad14392da04e8c097da8ec9e48.tar.bz2 coreclr-af4ec7c89d0192ad14392da04e8c097da8ec9e48.zip |
Make RuntimeType sealed and deleted support for introspection only loads (#19427)
- Sealed Runtime makes `is RuntimeType` and similar checks faster. These checks are fairly common in reflection.
- Delete support for introspection only loads from the runtime. We do not plan to use in .NET Core. The support for introspection loads inherited from RuntimeType and thus it is incompatible with sealed RuntimeType.
Diffstat (limited to 'src/vm/peimage.inl')
-rw-r--r-- | src/vm/peimage.inl | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/src/vm/peimage.inl b/src/vm/peimage.inl index 954d8872f6..0e7410734e 100644 --- a/src/vm/peimage.inl +++ b/src/vm/peimage.inl @@ -94,16 +94,6 @@ inline PTR_PEImageLayout PEImage::GetLoadedLayout() return m_pLayouts[IMAGE_LOADED]; //no addref } -inline PTR_PEImageLayout PEImage::GetLoadedIntrospectionLayout() -{ - LIMITED_METHOD_CONTRACT; - SUPPORTS_DAC; - - _ASSERTE(m_pLayouts[IMAGE_LOADED_FOR_INTROSPECTION]!=NULL); - return m_pLayouts[IMAGE_LOADED_FOR_INTROSPECTION]; //no addref -} - - // // GetExistingLayout - get an layout corresponding to the specified mask, or null if none. // Does not take any locks or call AddRef. @@ -125,8 +115,6 @@ inline PTR_PEImageLayout PEImage::GetExistingLayoutInternal(DWORD imageLayoutMas if (imageLayoutMask&PEImageLayout::LAYOUT_LOADED) pRetVal=m_pLayouts[IMAGE_LOADED]; - if (pRetVal==NULL && (imageLayoutMask & PEImageLayout::LAYOUT_LOADED_FOR_INTROSPECTION)) - pRetVal=m_pLayouts[IMAGE_LOADED_FOR_INTROSPECTION]; if (pRetVal==NULL && (imageLayoutMask & PEImageLayout::LAYOUT_MAPPED)) pRetVal=m_pLayouts[IMAGE_MAPPED]; if (pRetVal==NULL && (imageLayoutMask & PEImageLayout::LAYOUT_FLAT)) @@ -146,14 +134,7 @@ inline BOOL PEImage::HasLoadedLayout() inline BOOL PEImage::IsOpened() { LIMITED_METHOD_CONTRACT; - return m_pLayouts[IMAGE_LOADED]!=NULL ||m_pLayouts[IMAGE_MAPPED]!=NULL || m_pLayouts[IMAGE_FLAT] !=NULL || m_pLayouts[IMAGE_LOADED_FOR_INTROSPECTION]!=NULL; -} - - -inline BOOL PEImage::HasLoadedIntrospectionLayout() //introspection only!!! -{ - LIMITED_METHOD_DAC_CONTRACT; - return m_pLayouts[IMAGE_LOADED_FOR_INTROSPECTION]!=NULL; + return m_pLayouts[IMAGE_LOADED]!=NULL ||m_pLayouts[IMAGE_MAPPED]!=NULL || m_pLayouts[IMAGE_FLAT] !=NULL; } |