From 437016087d42a152a0f6f6a762d6c8eddb27d7d7 Mon Sep 17 00:00:00 2001 From: Stephen Toub Date: Sat, 19 May 2018 19:14:05 -0400 Subject: [PATCH] Remove unnecessary NoInlining uses (dotnet/corefx#29801) Commit migrated from https://github.com/dotnet/corefx/commit/28f6f35d6465486b0b014332d7c3733d5e5f30e0 --- .../src/System/Collections/Concurrent/ConcurrentDictionary.cs | 2 -- .../src/System/IO/Compression/DeflateManaged/DeflateManagedStream.cs | 3 --- .../src/System/IO/Compression/DeflateZLib/DeflateStream.cs | 3 --- .../System.IO.Compression/src/System/IO/Compression/GZipStream.cs | 1 - src/libraries/System.Net.Primitives/src/System/Net/IPAddress.cs | 1 - .../src/System/Runtime/Serialization/FormatterConverter.cs | 1 - 6 files changed, 11 deletions(-) diff --git a/src/libraries/System.Collections.Concurrent/src/System/Collections/Concurrent/ConcurrentDictionary.cs b/src/libraries/System.Collections.Concurrent/src/System/Collections/Concurrent/ConcurrentDictionary.cs index 2e14360..5211b46 100644 --- a/src/libraries/System.Collections.Concurrent/src/System/Collections/Concurrent/ConcurrentDictionary.cs +++ b/src/libraries/System.Collections.Concurrent/src/System/Collections/Concurrent/ConcurrentDictionary.cs @@ -893,13 +893,11 @@ namespace System.Collections.Concurrent // as these are uncommonly needed and when inlined are observed to prevent the inlining // of important methods like TryGetValue and ContainsKey. - [MethodImpl(MethodImplOptions.NoInlining)] private static void ThrowKeyNotFoundException(object key) { throw new KeyNotFoundException(SR.Format(SR.Arg_KeyNotFoundWithKey, key.ToString())); } - [MethodImpl(MethodImplOptions.NoInlining)] private static void ThrowKeyNullException() { throw new ArgumentNullException("key"); diff --git a/src/libraries/System.IO.Compression/src/System/IO/Compression/DeflateManaged/DeflateManagedStream.cs b/src/libraries/System.IO.Compression/src/System/IO/Compression/DeflateManaged/DeflateManagedStream.cs index 3fa6f5d..ab3fde0 100644 --- a/src/libraries/System.IO.Compression/src/System/IO/Compression/DeflateManaged/DeflateManagedStream.cs +++ b/src/libraries/System.IO.Compression/src/System/IO/Compression/DeflateManaged/DeflateManagedStream.cs @@ -192,7 +192,6 @@ namespace System.IO.Compression ThrowStreamClosedException(); } - [MethodImpl(MethodImplOptions.NoInlining)] private static void ThrowStreamClosedException() { throw new ObjectDisposedException(null, SR.ObjectDisposed_StreamClosed); @@ -204,7 +203,6 @@ namespace System.IO.Compression ThrowCannotReadFromDeflateManagedStreamException(); } - [MethodImpl(MethodImplOptions.NoInlining)] private static void ThrowCannotReadFromDeflateManagedStreamException() { throw new InvalidOperationException(SR.CannotReadFromDeflateStream); @@ -216,7 +214,6 @@ namespace System.IO.Compression ThrowCannotWriteToDeflateManagedStreamException(); } - [MethodImpl(MethodImplOptions.NoInlining)] private static void ThrowCannotWriteToDeflateManagedStreamException() { throw new InvalidOperationException(SR.CannotWriteToDeflateStream); diff --git a/src/libraries/System.IO.Compression/src/System/IO/Compression/DeflateZLib/DeflateStream.cs b/src/libraries/System.IO.Compression/src/System/IO/Compression/DeflateZLib/DeflateStream.cs index 1b287ee..48dc0cf 100644 --- a/src/libraries/System.IO.Compression/src/System/IO/Compression/DeflateZLib/DeflateStream.cs +++ b/src/libraries/System.IO.Compression/src/System/IO/Compression/DeflateZLib/DeflateStream.cs @@ -313,7 +313,6 @@ namespace System.IO.Compression ThrowStreamClosedException(); } - [MethodImpl(MethodImplOptions.NoInlining)] private static void ThrowStreamClosedException() { throw new ObjectDisposedException(null, SR.ObjectDisposed_StreamClosed); @@ -325,7 +324,6 @@ namespace System.IO.Compression ThrowCannotReadFromDeflateStreamException(); } - [MethodImpl(MethodImplOptions.NoInlining)] private static void ThrowCannotReadFromDeflateStreamException() { throw new InvalidOperationException(SR.CannotReadFromDeflateStream); @@ -337,7 +335,6 @@ namespace System.IO.Compression ThrowCannotWriteToDeflateStreamException(); } - [MethodImpl(MethodImplOptions.NoInlining)] private static void ThrowCannotWriteToDeflateStreamException() { throw new InvalidOperationException(SR.CannotWriteToDeflateStream); diff --git a/src/libraries/System.IO.Compression/src/System/IO/Compression/GZipStream.cs b/src/libraries/System.IO.Compression/src/System/IO/Compression/GZipStream.cs index 6c5640d..df7d23e 100644 --- a/src/libraries/System.IO.Compression/src/System/IO/Compression/GZipStream.cs +++ b/src/libraries/System.IO.Compression/src/System/IO/Compression/GZipStream.cs @@ -216,7 +216,6 @@ namespace System.IO.Compression } } - [MethodImpl(MethodImplOptions.NoInlining)] private static void ThrowStreamClosedException() { throw new ObjectDisposedException(null, SR.ObjectDisposed_StreamClosed); diff --git a/src/libraries/System.Net.Primitives/src/System/Net/IPAddress.cs b/src/libraries/System.Net.Primitives/src/System/Net/IPAddress.cs index a8e9775..4530455 100644 --- a/src/libraries/System.Net.Primitives/src/System/Net/IPAddress.cs +++ b/src/libraries/System.Net.Primitives/src/System/Net/IPAddress.cs @@ -670,7 +670,6 @@ namespace System.Net return new IPAddress(address); } - [MethodImpl(MethodImplOptions.NoInlining)] private static byte[] ThrowAddressNullException() => throw new ArgumentNullException("address"); } } diff --git a/src/libraries/System.Runtime.Serialization.Formatters/src/System/Runtime/Serialization/FormatterConverter.cs b/src/libraries/System.Runtime.Serialization.Formatters/src/System/Runtime/Serialization/FormatterConverter.cs index d928b28..b60193b 100644 --- a/src/libraries/System.Runtime.Serialization.Formatters/src/System/Runtime/Serialization/FormatterConverter.cs +++ b/src/libraries/System.Runtime.Serialization.Formatters/src/System/Runtime/Serialization/FormatterConverter.cs @@ -115,7 +115,6 @@ namespace System.Runtime.Serialization return System.Convert.ToString(value, CultureInfo.InvariantCulture); } - [MethodImpl(MethodImplOptions.NoInlining)] private static void ThrowValueNullException() { throw new ArgumentNullException("value"); -- 2.7.4