Remove RuntimeSupportsNumericIntPtr setter

dotnet · Oct 5, 2022 · 34ac0ac · 34ac0ac
1 parent ad69fb6
commit 34ac0ac
Show file tree

Hide file tree

Showing 5 changed files with 374 additions and 458 deletions.
diff --git a/src/Compilers/CSharp/Portable/Symbols/AssemblySymbol.cs b/src/Compilers/CSharp/Portable/Symbols/AssemblySymbol.cs
@@ -442,19 +442,16 @@ internal bool RuntimeSupportsStaticAbstractMembersInInterfaces
 
         /// <summary>
         /// Whether the target runtime supports numeric IntPtr types.
-        /// This test hook should be removed once TargetFramework.Net70 is added.
-        /// Tracked by https://github.com/dotnet/roslyn/issues/61235
         /// </summary>
-        internal virtual bool RuntimeSupportsNumericIntPtr
+        internal bool RuntimeSupportsNumericIntPtr
         {
             get
             {
                 // CorLibrary should never be null, but that invariant is broken in some cases for MissingAssemblySymbol.
                 // Tracked by https://github.com/dotnet/roslyn/issues/61262
-                return CorLibrary?.RuntimeSupportsNumericIntPtr == true;
+                return CorLibrary is not null &&
+                    RuntimeSupportsFeature(SpecialMember.System_Runtime_CompilerServices_RuntimeFeature__NumericIntPtr);
             }
-
-            set => CorLibrary.RuntimeSupportsNumericIntPtr = value;
         }
 
         protected bool RuntimeSupportsFeature(SpecialMember feature)

diff --git a/src/Compilers/CSharp/Portable/Symbols/MetadataOrSourceAssemblySymbol.cs b/src/Compilers/CSharp/Portable/Symbols/MetadataOrSourceAssemblySymbol.cs
@@ -32,38 +32,6 @@ internal abstract class MetadataOrSourceAssemblySymbol
         private int _cachedSpecialTypes;
 
         private NativeIntegerTypeSymbol[] _lazyNativeIntegerTypes;
-        private ThreeState _lazyRuntimeSupportsNumericIntPtr = ThreeState.Unknown;
-
-        internal override bool RuntimeSupportsNumericIntPtr
-        {
-            get
-            {
-                if ((object)CorLibrary == this)
-                {
-                    if (!_lazyRuntimeSupportsNumericIntPtr.HasValue())
-                    {
-                        _lazyRuntimeSupportsNumericIntPtr = RuntimeSupportsFeature(SpecialMember.System_Runtime_CompilerServices_RuntimeFeature__NumericIntPtr).ToThreeState();
-                    }
-
-                    return _lazyRuntimeSupportsNumericIntPtr.Value();
-                }
-
-                return base.RuntimeSupportsNumericIntPtr;
-            }
-            set
-            {
-                Debug.Assert(value);
-                Debug.Assert(!RuntimeSupportsFeature(SpecialMember.System_Runtime_CompilerServices_RuntimeFeature__NumericIntPtr));
-                if ((object)CorLibrary == this)
-                {
-                    Debug.Assert(!_lazyRuntimeSupportsNumericIntPtr.HasValue());
-                    _lazyRuntimeSupportsNumericIntPtr = value.ToThreeState();
-                    return;
-                }
-
-                base.RuntimeSupportsNumericIntPtr = value;
-            }
-        }
 
         /// <summary>
         /// Lookup declaration for predefined CorLib type in this Assembly.

diff --git a/src/Compilers/CSharp/Portable/Symbols/MissingCorLibrarySymbol.cs b/src/Compilers/CSharp/Portable/Symbols/MissingCorLibrarySymbol.cs
@@ -64,20 +64,5 @@ internal override NamedTypeSymbol GetDeclaredSpecialType(SpecialType type)
 
             return _lazySpecialTypes[(int)type];
         }
-
-        internal override bool RuntimeSupportsNumericIntPtr
-        {
-            get
-            {
-                // For now we assume that it is not supported by default
-                Debug.Assert((object)CorLibrary == this);
-                return false;
-            }
-            set
-            {
-                Debug.Assert((object)CorLibrary == this);
-                throw ExceptionUtilities.Unreachable();
-            }
-        }
     }
 }