diff options
| -rw-r--r-- | src/inc/clrhost.h | 1 | ||||
| -rw-r--r-- | src/vm/constrainedexecutionregion.h | 4 | ||||
| -rw-r--r-- | src/vm/mlinfo.h | 2 | ||||
| -rw-r--r-- | src/vm/securitydescriptor.h | 4 | ||||
| -rw-r--r-- | src/vm/securitydescriptor.inl | 6 | ||||
| -rw-r--r-- | src/vm/stackwalk.h | 1 |
6 files changed, 11 insertions, 7 deletions
diff --git a/src/inc/clrhost.h b/src/inc/clrhost.h index 222b8e1f98..8268c9a69b 100644 --- a/src/inc/clrhost.h +++ b/src/inc/clrhost.h @@ -601,7 +601,6 @@ extern void DecCantAllocCount(); class CantAllocHolder { - BOOL m_bUseTLSCount; public: CantAllocHolder () { diff --git a/src/vm/constrainedexecutionregion.h b/src/vm/constrainedexecutionregion.h index 8c67cd11da..99ddfde965 100644 --- a/src/vm/constrainedexecutionregion.h +++ b/src/vm/constrainedexecutionregion.h @@ -422,10 +422,10 @@ class MethodCallGraphPreparer DWORD m_cEHClauses; // Number of elements in above array CerPrepInfo *m_pCerPrepInfo; // Context recording how much preparation this region has had MethodContextStack m_sPersist; // MethodContexts we need to keep around past the 'prepare' phase of preparation -#ifdef FEATURE_PREJIT +#ifdef FEATURE_NATIVE_IMAGE_GENERATION bool m_fNgen; // True when being called as part of an ngen MethodContextStack m_sRootMethods; // Methods containing a sub-CER (excludes the real root) -#endif +#endif // FEATURE_NATIVE_IMAGE_GENERATION Thread *m_pThread; // Cached managed thread pointer (for allocations and the like) bool m_fPartialPreparation; // True if we have unbound type vars at the CER root and can only prep one instantiation at a time diff --git a/src/vm/mlinfo.h b/src/vm/mlinfo.h index b4cbd9a929..615a057ac6 100644 --- a/src/vm/mlinfo.h +++ b/src/vm/mlinfo.h @@ -799,7 +799,9 @@ private: BOOL m_fAnsi; BOOL m_fDispItf; BOOL m_fInspItf; +#ifdef FEATURE_COMINTEROP BOOL m_fErrorNativeType; +#endif // FEATURE_COMINTEROP // Information used by NT_CUSTOMMARSHALER. CustomMarshalerHelper* m_pCMHelper; diff --git a/src/vm/securitydescriptor.h b/src/vm/securitydescriptor.h index e45b95ac0b..ead79b5897 100644 --- a/src/vm/securitydescriptor.h +++ b/src/vm/securitydescriptor.h @@ -91,9 +91,11 @@ protected: LoaderAllocator *m_pLoaderAllocator; private: +#ifndef CROSSGEN_COMPILE LOADERHANDLE m_hGrantedPermissionSet; // Granted Permission LOADERHANDLE m_hGrantDeniedPermissionSet;// Specifically Denied Permissions - +#endif // CROSSGEN_COMPILE + public: BOOL IsFullyTrusted(); DWORD GetSpecialFlags() const; diff --git a/src/vm/securitydescriptor.inl b/src/vm/securitydescriptor.inl index a993c0d964..cd7ca80dcd 100644 --- a/src/vm/securitydescriptor.inl +++ b/src/vm/securitydescriptor.inl @@ -50,9 +50,11 @@ inline SecurityDescriptor::SecurityDescriptor(AppDomain *pAppDomain, m_fEvidenceComputed(FALSE), #endif // FEATURE_CAS_POLICY m_dwSpecialFlags(0), - m_pLoaderAllocator(pLoaderAllocator), - m_hGrantedPermissionSet(NULL), + m_pLoaderAllocator(pLoaderAllocator) +#ifndef CROSSGEN_COMPILE + , m_hGrantedPermissionSet(NULL), m_hGrantDeniedPermissionSet(NULL) +#endif // CROSSGEN_COMPILE { LIMITED_METHOD_CONTRACT; } diff --git a/src/vm/stackwalk.h b/src/vm/stackwalk.h index d92cb9e374..a6924f3e1f 100644 --- a/src/vm/stackwalk.h +++ b/src/vm/stackwalk.h @@ -680,7 +680,6 @@ private: // the following fields are used to cache information about a managed stack frame // when we need to stop for skipped explicit frames EECodeInfo m_cachedCodeInfo; - PTR_VOID m_pCachedGCInfo; GSCookie * m_pCachedGSCookie; |