diff options
| author | Jiyoung Yun <jy910.yun@samsung.com> | 2016-12-27 16:46:08 +0900 |
|---|---|---|
| committer | Jiyoung Yun <jy910.yun@samsung.com> | 2016-12-27 16:46:08 +0900 |
| commit | db20f3f1bb8595633a7e16c8900fd401a453a6b5 (patch) | |
| tree | e5435159cd1bf0519276363a6fe1663d1721bed3 /src/vm/class.cpp | |
| parent | 4b4aad7217d3292650e77eec2cf4c198ea9c3b4b (diff) | |
| download | coreclr-db20f3f1bb8595633a7e16c8900fd401a453a6b5.tar.gz coreclr-db20f3f1bb8595633a7e16c8900fd401a453a6b5.tar.bz2 coreclr-db20f3f1bb8595633a7e16c8900fd401a453a6b5.zip | |
Imported Upstream version 1.0.0.9127upstream/1.0.0.9127
Diffstat (limited to 'src/vm/class.cpp')
| -rw-r--r-- | src/vm/class.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/vm/class.cpp b/src/vm/class.cpp index 961df2a104..cff71f328f 100644 --- a/src/vm/class.cpp +++ b/src/vm/class.cpp @@ -19,6 +19,7 @@ #include "constrainedexecutionregion.h" #include "customattribute.h" #include "encee.h" +#include "typestring.h" #ifdef FEATURE_COMINTEROP #include "comcallablewrapper.h" @@ -2490,12 +2491,14 @@ MethodTable::GetSubstitutionForParent( #endif //!DACCESS_COMPILE +#ifdef FEATURE_CER //******************************************************************************* DWORD EEClass::GetReliabilityContract() { LIMITED_METHOD_CONTRACT; return HasOptionalFields() ? GetOptionalFields()->m_dwReliabilityContract : RC_NULL; } +#endif // FEATURE_CER //******************************************************************************* #ifdef FEATURE_PREJIT @@ -3065,6 +3068,7 @@ void EEClass::Fixup(DataImage *image, MethodTable *pMT) image->ZeroPointerField(this, offsetof(DelegateEEClass, m_pUMThunkMarshInfo)); image->ZeroPointerField(this, offsetof(DelegateEEClass, m_pStaticCallStub)); image->ZeroPointerField(this, offsetof(DelegateEEClass, m_pMultiCastInvokeStub)); + image->ZeroPointerField(this, offsetof(DelegateEEClass, m_pSecureDelegateInvokeStub)); image->ZeroPointerField(this, offsetof(DelegateEEClass, m_pMarshalStub)); #ifdef FEATURE_COMINTEROP |