From 235673d6f2a11c9d1e4d71311ed7d65138fc9c14 Mon Sep 17 00:00:00 2001 From: danmosemsft Date: Sun, 12 Feb 2017 11:05:31 -0800 Subject: [PATCH] Remove always defined FEATURE_SPAN_OF_T Commit migrated from https://github.com/dotnet/coreclr/commit/c65413fd6470e853ceb02649906cdbc164700a97 --- src/coreclr/clrdefinitions.cmake | 2 -- src/coreclr/src/inc/dacvars.h | 2 -- src/coreclr/src/vm/appdomain.cpp | 2 -- src/coreclr/src/vm/classnames.h | 2 -- src/coreclr/src/vm/jitinterface.cpp | 6 ------ src/coreclr/src/vm/method.cpp | 2 -- src/coreclr/src/vm/methodtablebuilder.cpp | 4 ---- src/coreclr/src/vm/mscorlib.h | 8 -------- src/coreclr/src/vm/vars.cpp | 2 -- src/coreclr/src/vm/vars.hpp | 2 -- 10 files changed, 32 deletions(-) diff --git a/src/coreclr/clrdefinitions.cmake b/src/coreclr/clrdefinitions.cmake index f098ac7..3c5f98b 100644 --- a/src/coreclr/clrdefinitions.cmake +++ b/src/coreclr/clrdefinitions.cmake @@ -197,5 +197,3 @@ add_definitions(-DFEATURE_WINMD_RESILIENT) add_definitions(-D_SECURE_SCL=0) add_definitions(-DUNICODE) add_definitions(-D_UNICODE) - -add_definitions(-DFEATURE_SPAN_OF_T) diff --git a/src/coreclr/src/inc/dacvars.h b/src/coreclr/src/inc/dacvars.h index b54ca10..7465866 100644 --- a/src/coreclr/src/inc/dacvars.h +++ b/src/coreclr/src/inc/dacvars.h @@ -214,9 +214,7 @@ DEFINE_DACVAR(ULONG, UNKNOWN_POINTER_TYPE, dac__g_pStringClass, ::g_pStringClass DEFINE_DACVAR(ULONG, UNKNOWN_POINTER_TYPE, dac__g_pArrayClass, ::g_pArrayClass) DEFINE_DACVAR(ULONG, UNKNOWN_POINTER_TYPE, dac__g_pSZArrayHelperClass, ::g_pSZArrayHelperClass) DEFINE_DACVAR(ULONG, UNKNOWN_POINTER_TYPE, dac__g_pNullableClass, ::g_pNullableClass) -#ifdef FEATURE_SPAN_OF_T DEFINE_DACVAR(ULONG, UNKNOWN_POINTER_TYPE, dac__g_pByReferenceClass, ::g_pByReferenceClass) -#endif DEFINE_DACVAR(ULONG, UNKNOWN_POINTER_TYPE, dac__g_pExceptionClass, ::g_pExceptionClass) DEFINE_DACVAR(ULONG, UNKNOWN_POINTER_TYPE, dac__g_pThreadAbortExceptionClass, ::g_pThreadAbortExceptionClass) DEFINE_DACVAR(ULONG, UNKNOWN_POINTER_TYPE, dac__g_pOutOfMemoryExceptionClass, ::g_pOutOfMemoryExceptionClass) diff --git a/src/coreclr/src/vm/appdomain.cpp b/src/coreclr/src/vm/appdomain.cpp index 15ba905..59c43bb 100644 --- a/src/coreclr/src/vm/appdomain.cpp +++ b/src/coreclr/src/vm/appdomain.cpp @@ -2860,13 +2860,11 @@ void SystemDomain::LoadBaseSystemClasses() // the SZArrayHelper class here. g_pSZArrayHelperClass = MscorlibBinder::GetClass(CLASS__SZARRAYHELPER); -#ifdef FEATURE_SPAN_OF_T // Load ByReference class // // NOTE: ByReference must be the first by-ref-like system type to be loaded, // because MethodTable::ClassifyEightBytesWithManagedLayout depends on it. g_pByReferenceClass = MscorlibBinder::GetClass(CLASS__BYREFERENCE); -#endif // Load Nullable class g_pNullableClass = MscorlibBinder::GetClass(CLASS__NULLABLE); diff --git a/src/coreclr/src/vm/classnames.h b/src/coreclr/src/vm/classnames.h index 455924c..8ac167f 100644 --- a/src/coreclr/src/vm/classnames.h +++ b/src/coreclr/src/vm/classnames.h @@ -16,9 +16,7 @@ #define g_ArrayClassName "System.Array" #define g_NullableName "Nullable`1" -#ifdef FEATURE_SPAN_OF_T #define g_ByReferenceName "ByReference`1" -#endif #define g_CollectionsEnumerableItfName "System.Collections.IEnumerable" #define g_CollectionsEnumeratorClassName "System.Collections.IEnumerator" diff --git a/src/coreclr/src/vm/jitinterface.cpp b/src/coreclr/src/vm/jitinterface.cpp index 8a0e0f9..d595057 100644 --- a/src/coreclr/src/vm/jitinterface.cpp +++ b/src/coreclr/src/vm/jitinterface.cpp @@ -6960,7 +6960,6 @@ bool getILIntrinsicImplementation(MethodDesc * ftn, return true; } } -#ifdef FEATURE_SPAN_OF_T else if (tk == MscorlibBinder::GetMethod(METHOD__JIT_HELPERS__BYREF_LESSTHAN)->GetMemberDef()) { // Compare the two arguments @@ -6992,12 +6991,10 @@ bool getILIntrinsicImplementation(MethodDesc * ftn, methInfo->options = (CorInfoOptions)0; return true; } -#endif // FEATURE_SPAN_OF_T return false; } -#ifdef FEATURE_SPAN_OF_T bool getILIntrinsicImplementationForUnsafe(MethodDesc * ftn, CORINFO_METHOD_INFO * methInfo) { @@ -7100,7 +7097,6 @@ bool getILIntrinsicImplementationForUnsafe(MethodDesc * ftn, return false; } -#endif // FEATURE_SPAN_OF_T bool getILIntrinsicImplementationForVolatile(MethodDesc * ftn, CORINFO_METHOD_INFO * methInfo) @@ -7323,12 +7319,10 @@ getMethodInfoHelper( { fILIntrinsic = getILIntrinsicImplementation(ftn, methInfo); } -#ifdef FEATURE_SPAN_OF_T else if (MscorlibBinder::IsClass(pMT, CLASS__UNSAFE)) { fILIntrinsic = getILIntrinsicImplementationForUnsafe(ftn, methInfo); } -#endif else if (MscorlibBinder::IsClass(pMT, CLASS__INTERLOCKED)) { fILIntrinsic = getILIntrinsicImplementationForInterlocked(ftn, methInfo); diff --git a/src/coreclr/src/vm/method.cpp b/src/coreclr/src/vm/method.cpp index c381281..eceb936 100644 --- a/src/coreclr/src/vm/method.cpp +++ b/src/coreclr/src/vm/method.cpp @@ -2467,12 +2467,10 @@ BOOL MethodDesc::IsFCallOrIntrinsic() if (IsFCall() || IsArray()) return TRUE; -#ifdef FEATURE_SPAN_OF_T // Intrinsic methods on ByReference or Span MethodTable * pMT = GetMethodTable(); if (pMT->IsByRefLike() && pMT->GetModule()->IsSystem()) return TRUE; -#endif return FALSE; } diff --git a/src/coreclr/src/vm/methodtablebuilder.cpp b/src/coreclr/src/vm/methodtablebuilder.cpp index 303edc4..9932b07 100644 --- a/src/coreclr/src/vm/methodtablebuilder.cpp +++ b/src/coreclr/src/vm/methodtablebuilder.cpp @@ -10220,7 +10220,6 @@ void MethodTableBuilder::CheckForSystemTypes() // We can exit early for generic types - there are just a few cases to check for. if (bmtGenerics->HasInstantiation() && g_pNullableClass != NULL) { -#ifdef FEATURE_SPAN_OF_T _ASSERTE(g_pByReferenceClass != NULL); _ASSERTE(g_pByReferenceClass->IsByRefLike()); @@ -10237,7 +10236,6 @@ void MethodTableBuilder::CheckForSystemTypes() #endif return; } -#endif _ASSERTE(g_pNullableClass->IsNullable()); @@ -10293,7 +10291,6 @@ void MethodTableBuilder::CheckForSystemTypes() { pMT->SetIsNullable(); } -#ifdef FEATURE_SPAN_OF_T else if (strcmp(name, g_ByReferenceName) == 0) { pMT->SetIsByRefLike(); @@ -10306,7 +10303,6 @@ void MethodTableBuilder::CheckForSystemTypes() pMT->SetInternalCorElementType(ELEMENT_TYPE_VALUETYPE); #endif } -#endif else if (strcmp(name, g_ArgIteratorName) == 0) { // Mark the special types that have embeded stack poitners in them diff --git a/src/coreclr/src/vm/mscorlib.h b/src/coreclr/src/vm/mscorlib.h index 630ac14..5b802ff 100644 --- a/src/coreclr/src/vm/mscorlib.h +++ b/src/coreclr/src/vm/mscorlib.h @@ -964,11 +964,9 @@ DEFINE_FIELD(NULL, VALUE, Value) DEFINE_CLASS(NULLABLE, System, Nullable`1) -#ifdef FEATURE_SPAN_OF_T DEFINE_CLASS(BYREFERENCE, System, ByReference`1) DEFINE_CLASS(SPAN, System, Span`1) DEFINE_CLASS(READONLY_SPAN, System, ReadOnlySpan`1) -#endif // Keep this in sync with System.Globalization.NumberFormatInfo DEFINE_CLASS_U(Globalization, NumberFormatInfo, NumberFormatInfo) @@ -1191,12 +1189,9 @@ DEFINE_METHOD(JIT_HELPERS, UNSAFE_ENUM_CAST, UnsafeEnumCast, NoSi DEFINE_METHOD(JIT_HELPERS, UNSAFE_ENUM_CAST_LONG, UnsafeEnumCastLong, NoSig) DEFINE_METHOD(JIT_HELPERS, UNSAFE_CAST_TO_STACKPTR,UnsafeCastToStackPointer, NoSig) #endif // _DEBUG -#ifdef FEATURE_SPAN_OF_T DEFINE_METHOD(JIT_HELPERS, BYREF_LESSTHAN, ByRefLessThan, NoSig) DEFINE_METHOD(JIT_HELPERS, GET_ARRAY_DATA, GetArrayData, NoSig) -#endif -#ifdef FEATURE_SPAN_OF_T DEFINE_CLASS(UNSAFE, CompilerServices, Unsafe) DEFINE_METHOD(UNSAFE, AS_POINTER, AsPointer, NoSig) DEFINE_METHOD(UNSAFE, SIZEOF, SizeOf, NoSig) @@ -1204,7 +1199,6 @@ DEFINE_METHOD(UNSAFE, BYREF_AS, As, NoSig) DEFINE_METHOD(UNSAFE, BYREF_ADD, Add, NoSig) DEFINE_METHOD(UNSAFE, BYREF_ARE_SAME, AreSame, NoSig) DEFINE_METHOD(UNSAFE, BYREF_INIT_BLOCK_UNALIGNED, InitBlockUnaligned, NoSig) -#endif DEFINE_CLASS(INTERLOCKED, Threading, Interlocked) DEFINE_METHOD(INTERLOCKED, COMPARE_EXCHANGE_T, CompareExchange, GM_RefT_T_T_RetT) @@ -1213,10 +1207,8 @@ DEFINE_METHOD(INTERLOCKED, COMPARE_EXCHANGE_OBJECT,CompareExchange, SM_ DEFINE_CLASS(PINNING_HELPER, CompilerServices, PinningHelper) DEFINE_FIELD(PINNING_HELPER, M_DATA, m_data) -#ifdef FEATURE_SPAN_OF_T DEFINE_CLASS(ARRAY_PINNING_HELPER, CompilerServices, ArrayPinningHelper) DEFINE_FIELD(ARRAY_PINNING_HELPER, M_ARRAY_DATA, m_arrayData) -#endif DEFINE_CLASS(RUNTIME_WRAPPED_EXCEPTION, CompilerServices, RuntimeWrappedException) DEFINE_METHOD(RUNTIME_WRAPPED_EXCEPTION, OBJ_CTOR, .ctor, IM_Obj_RetVoid) diff --git a/src/coreclr/src/vm/vars.cpp b/src/coreclr/src/vm/vars.cpp index 3753875..02f7efc 100644 --- a/src/coreclr/src/vm/vars.cpp +++ b/src/coreclr/src/vm/vars.cpp @@ -69,9 +69,7 @@ GPTR_IMPL(MethodTable, g_pStringClass); GPTR_IMPL(MethodTable, g_pArrayClass); GPTR_IMPL(MethodTable, g_pSZArrayHelperClass); GPTR_IMPL(MethodTable, g_pNullableClass); -#ifdef FEATURE_SPAN_OF_T GPTR_IMPL(MethodTable, g_pByReferenceClass); -#endif GPTR_IMPL(MethodTable, g_pExceptionClass); GPTR_IMPL(MethodTable, g_pThreadAbortExceptionClass); GPTR_IMPL(MethodTable, g_pOutOfMemoryExceptionClass); diff --git a/src/coreclr/src/vm/vars.hpp b/src/coreclr/src/vm/vars.hpp index d586e31..5aa6e2b 100644 --- a/src/coreclr/src/vm/vars.hpp +++ b/src/coreclr/src/vm/vars.hpp @@ -395,9 +395,7 @@ GPTR_DECL(MethodTable, g_pStringClass); GPTR_DECL(MethodTable, g_pArrayClass); GPTR_DECL(MethodTable, g_pSZArrayHelperClass); GPTR_DECL(MethodTable, g_pNullableClass); -#ifdef FEATURE_SPAN_OF_T GPTR_DECL(MethodTable, g_pByReferenceClass); -#endif GPTR_DECL(MethodTable, g_pExceptionClass); GPTR_DECL(MethodTable, g_pThreadAbortExceptionClass); GPTR_DECL(MethodTable, g_pOutOfMemoryExceptionClass); -- 2.7.4