From: Michal Strehovský Date: Tue, 5 Dec 2017 10:37:43 +0000 (+0100) Subject: Put default interfaces behind a define (#15358) X-Git-Tag: accepted/tizen/base/20180629.140029~315^2~4^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=809b8f792923c95b9d5fee824c60dde21079cca1;p=platform%2Fupstream%2Fcoreclr.git Put default interfaces behind a define (#15358) This is needed so that we can turn default interfaces off in release branches. I can't find a central location where the PRERELEASE flag could be defined because native and managed builds seem to be completely disconnected. To limit the risk of only flipping the flag in one build type, I'm adding a test that verifies being able to load an interface with default methods matches what RuntimeFeature says. --- diff --git a/clr.defines.targets b/clr.defines.targets index 7dc442c..b9f159e 100644 --- a/clr.defines.targets +++ b/clr.defines.targets @@ -1,4 +1,10 @@ + + + + true + + $(DefineConstants);FEATURE_APPX $(DefineConstants);FEATURE_ARRAYSTUB_AS_IL @@ -17,6 +23,7 @@ $(DefineConstants);FEATURE_EVENTSOURCE_XPLAT $(DefineConstants);FEATURE_USE_LCID $(DefineConstants);FEATURE_WIN32_REGISTRY + $(DefineConstants);FEATURE_DEFAULT_INTERFACES $(DefineConstants);PROFILING_SUPPORTED diff --git a/clrdefinitions.cmake b/clrdefinitions.cmake index 2ab424f..5e12ca1 100644 --- a/clrdefinitions.cmake +++ b/clrdefinitions.cmake @@ -1,5 +1,14 @@ include(clrfeatures.cmake) +# If set, indicates that this is not an officially supported release +# Keep in sync with IsPrerelease in dir.props +set(PRERELEASE 1) + +# Features we're currently flighting, but don't intend to ship in officially supported releases +if (PRERELEASE) + add_definitions(-DFEATURE_DEFAULT_INTERFACES=1) +endif (PRERELEASE) + if (CLR_CMAKE_TARGET_ARCH_AMD64) if (CLR_CMAKE_PLATFORM_UNIX) add_definitions(-DDBG_TARGET_AMD64_UNIX) diff --git a/dir.props b/dir.props index 56ee07c..fa46fc3 100644 --- a/dir.props +++ b/dir.props @@ -140,6 +140,11 @@ $(ProjectDir)THIRD-PARTY-NOTICES.TXT $(BaseIntermediateOutputPath) + + + + true + 1.0.2-beta-24224-02 $(PackagesDir)/microsoft.netcore.platforms/$(RuntimeIdGraphDefinitionVersion)/runtime.json diff --git a/src/inc/clrconfigvalues.h b/src/inc/clrconfigvalues.h index 6ebf948..24a18f1 100644 --- a/src/inc/clrconfigvalues.h +++ b/src/inc/clrconfigvalues.h @@ -874,7 +874,6 @@ RETAIL_CONFIG_DWORD_INFO(UNSUPPORTED_TieredCompilation, W("EXPERIMENTAL_TieredCo // TypeLoader // CONFIG_DWORD_INFO(INTERNAL_TypeLoader_InjectInterfaceDuplicates, W("INTERNAL_TypeLoader_InjectInterfaceDuplicates"), 0, "Injects duplicates in interface map for all types.") -RETAIL_CONFIG_DWORD_INFO(UNSUPPORTED_TypeLoader_DefaultInterfaces, W("UNSUPPORTED_TypeLoader_DefaultInterfaces"), 0, "Enables support for default interfaces.") // // Virtual call stubs diff --git a/src/mscorlib/shared/System/Runtime/CompilerServices/RuntimeFeature.cs b/src/mscorlib/shared/System/Runtime/CompilerServices/RuntimeFeature.cs index 4978b09..c6a97ec 100644 --- a/src/mscorlib/shared/System/Runtime/CompilerServices/RuntimeFeature.cs +++ b/src/mscorlib/shared/System/Runtime/CompilerServices/RuntimeFeature.cs @@ -11,9 +11,12 @@ namespace System.Runtime.CompilerServices /// public const string PortablePdb = nameof(PortablePdb); +#if FEATURE_DEFAULT_INTERFACES + /// /// Indicates that this version of runtime supports default interface method implementations. /// public const string DefaultImplementationsOfInterfaces = nameof(DefaultImplementationsOfInterfaces); +#endif /// /// Checks whether a certain feature is supported by the Runtime. @@ -23,7 +26,9 @@ namespace System.Runtime.CompilerServices switch (feature) { case PortablePdb: +#if FEATURE_DEFAULT_INTERFACES case DefaultImplementationsOfInterfaces: +#endif return true; } diff --git a/src/vm/classcompat.cpp b/src/vm/classcompat.cpp index fb48a15..af4c0d6 100644 --- a/src/vm/classcompat.cpp +++ b/src/vm/classcompat.cpp @@ -2612,12 +2612,13 @@ VOID MethodTableBuilder::EnumerateClassMethods() } } +#ifndef FEATURE_DEFAULT_INTERFACES // Some interface checks. if (fIsClassInterface) { if (IsMdVirtual(dwMemberAttrs)) { - if (!IsMdAbstract(dwMemberAttrs) && (CLRConfig::GetConfigValue(CLRConfig::UNSUPPORTED_TypeLoader_DefaultInterfaces) == 0)) + if (!IsMdAbstract(dwMemberAttrs)) { BuildMethodTableThrowException(BFA_VIRTUAL_NONAB_INT_METHOD); } @@ -2625,12 +2626,13 @@ VOID MethodTableBuilder::EnumerateClassMethods() else { // Instance field/method - if (!IsMdStatic(dwMemberAttrs) && (CLRConfig::GetConfigValue(CLRConfig::UNSUPPORTED_TypeLoader_DefaultInterfaces) == 0)) + if (!IsMdStatic(dwMemberAttrs)) { BuildMethodTableThrowException(BFA_NONVIRT_INST_INT_METHOD); } } } +#endif // No synchronized methods in ValueTypes if(fIsClassValueType && IsMiSynchronized(dwImplFlags)) diff --git a/src/vm/methodtablebuilder.cpp b/src/vm/methodtablebuilder.cpp index 1d524cc..9f4d2ca 100644 --- a/src/vm/methodtablebuilder.cpp +++ b/src/vm/methodtablebuilder.cpp @@ -2900,12 +2900,13 @@ MethodTableBuilder::EnumerateClassMethods() } } +#ifndef FEATURE_DEFAULT_INTERFACES // Some interface checks. if (fIsClassInterface) { if (IsMdVirtual(dwMemberAttrs)) { - if (!IsMdAbstract(dwMemberAttrs) && (CLRConfig::GetConfigValue(CLRConfig::UNSUPPORTED_TypeLoader_DefaultInterfaces) == 0)) + if (!IsMdAbstract(dwMemberAttrs)) { BuildMethodTableThrowException(BFA_VIRTUAL_NONAB_INT_METHOD); } @@ -2913,12 +2914,13 @@ MethodTableBuilder::EnumerateClassMethods() else { // Instance field/method - if (!IsMdStatic(dwMemberAttrs) && (CLRConfig::GetConfigValue(CLRConfig::UNSUPPORTED_TypeLoader_DefaultInterfaces) == 0)) + if (!IsMdStatic(dwMemberAttrs)) { BuildMethodTableThrowException(BFA_NONVIRT_INST_INT_METHOD); } } } +#endif // No synchronized methods in ValueTypes if(fIsClassValueType && IsMiSynchronized(dwImplFlags)) diff --git a/tests/src/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrainedcall.ilproj b/tests/src/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrainedcall.ilproj index de431d5..7a2fb51 100644 --- a/tests/src/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrainedcall.ilproj +++ b/tests/src/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrainedcall.ilproj @@ -14,23 +14,7 @@ true Exe BuildAndRun - 0 - - True - - - - - - - - + 0 diff --git a/tests/src/Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape.ilproj b/tests/src/Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape.ilproj index 78d9162..df375eb 100644 --- a/tests/src/Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape.ilproj +++ b/tests/src/Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape.ilproj @@ -15,22 +15,6 @@ Exe BuildAndRun 0 - - True - - - - - - - - diff --git a/tests/src/Loader/classloader/DefaultInterfaceMethods/genericmethods/genericmethods.ilproj b/tests/src/Loader/classloader/DefaultInterfaceMethods/genericmethods/genericmethods.ilproj index 03db9c5..463e3ed 100644 --- a/tests/src/Loader/classloader/DefaultInterfaceMethods/genericmethods/genericmethods.ilproj +++ b/tests/src/Loader/classloader/DefaultInterfaceMethods/genericmethods/genericmethods.ilproj @@ -15,22 +15,6 @@ Exe BuildAndRun 0 - - True - - - - - - - - diff --git a/tests/src/Loader/classloader/DefaultInterfaceMethods/methodimpl/methodimpl.ilproj b/tests/src/Loader/classloader/DefaultInterfaceMethods/methodimpl/methodimpl.ilproj index 03f4842..eb7660b 100644 --- a/tests/src/Loader/classloader/DefaultInterfaceMethods/methodimpl/methodimpl.ilproj +++ b/tests/src/Loader/classloader/DefaultInterfaceMethods/methodimpl/methodimpl.ilproj @@ -15,22 +15,6 @@ Exe BuildAndRun 0 - - True - - - - - - - - diff --git a/tests/src/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics.ilproj b/tests/src/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics.ilproj index 7b6f274..a97596e 100644 --- a/tests/src/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics.ilproj +++ b/tests/src/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics.ilproj @@ -15,22 +15,6 @@ Exe BuildAndRun 0 - - True - - - - - - - - diff --git a/tests/src/Loader/classloader/DefaultInterfaceMethods/simple/simple.ilproj b/tests/src/Loader/classloader/DefaultInterfaceMethods/simple/simple.ilproj index aa2f06c..0446a78 100644 --- a/tests/src/Loader/classloader/DefaultInterfaceMethods/simple/simple.ilproj +++ b/tests/src/Loader/classloader/DefaultInterfaceMethods/simple/simple.ilproj @@ -15,22 +15,6 @@ Exe BuildAndRun 0 - - True - - - - - - - - diff --git a/tests/src/Loader/classloader/DefaultInterfaceMethods/valuetypes/valuetypes.ilproj b/tests/src/Loader/classloader/DefaultInterfaceMethods/valuetypes/valuetypes.ilproj index f928997..f190a75 100644 --- a/tests/src/Loader/classloader/DefaultInterfaceMethods/valuetypes/valuetypes.ilproj +++ b/tests/src/Loader/classloader/DefaultInterfaceMethods/valuetypes/valuetypes.ilproj @@ -15,22 +15,6 @@ Exe BuildAndRun 0 - - True - - - - - - - - diff --git a/tests/src/baseservices/compilerservices/RuntimeFeature/DefaultImplementationsOfInterfaces.il b/tests/src/baseservices/compilerservices/RuntimeFeature/DefaultImplementationsOfInterfaces.il new file mode 100644 index 0000000..56ff2e7 --- /dev/null +++ b/tests/src/baseservices/compilerservices/RuntimeFeature/DefaultImplementationsOfInterfaces.il @@ -0,0 +1,73 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +// +// Verifies that RuntimeFeature::IsSupported("DefaultImplementationsOfInterfaces") matches reality. +// This needs to succeed no matter whether default interfaces are supported. +// + +.assembly extern System.Runtime{} +.assembly DefaultImplementationsOfInterfaces{} + +.class interface private abstract auto ansi DefaultInterface +{ + .method public hidebysig newslot virtual + instance void Method() cil managed + { + .maxstack 8 + ret + } +} + +.method private hidebysig static void TryLoadDefaultInterface() cil managed noinlining +{ + .maxstack 8 + ldtoken DefaultInterface + call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [mscorlib]System.RuntimeTypeHandle) + callvirt instance string [System.Runtime]System.Object::ToString() + pop + ret +} + +.method private hidebysig static bool SupportsDefaultInterfaces() cil managed +{ + .maxstack 1 + .try + { + call void TryLoadDefaultInterface() + leave.s Supports + + } + catch [System.Runtime]System.TypeLoadException + { + pop + leave.s DoesNotSupport + + } + Supports: + ldc.i4.1 + ret + + DoesNotSupport: + ldc.i4.0 + ret + } + +.method private hidebysig static int32 + Main() cil managed +{ + .entrypoint + .maxstack 2 + ldstr "DefaultImplementationsOfInterfaces" + call bool [System.Runtime]System.Runtime.CompilerServices.RuntimeFeature::IsSupported(string) + call bool SupportsDefaultInterfaces() + beq Good + + ldc.i4.m1 + ret + + Good: + ldc.i4 100 + ret +} diff --git a/tests/src/baseservices/compilerservices/RuntimeFeature/DefaultImplementationsOfInterfaces.ilproj b/tests/src/baseservices/compilerservices/RuntimeFeature/DefaultImplementationsOfInterfaces.ilproj new file mode 100644 index 0000000..56bfa03 --- /dev/null +++ b/tests/src/baseservices/compilerservices/RuntimeFeature/DefaultImplementationsOfInterfaces.ilproj @@ -0,0 +1,38 @@ + + + + + Debug + AnyCPU + $(MSBuildProjectName) + 2.0 + {A8E3EED5-E6C0-4976-AC7E-70691EA00C52} + Exe + {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + ..\..\ + BuildAndRun + 0 + + + + + + + + + False + + + + + + + + + + + + + + + \ No newline at end of file