Merge pull request dotnet/corert#5038 from dotnet/nmirror

Merge nmirror to master

Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>

diff --git a/src/mscorlib/shared/System/Number.Formatting.cs b/src/mscorlib/shared/System/Number.Formatting.cs
index f5dd549..ddf9ef1 100644 (file)
--- a/src/mscorlib/shared/System/Number.Formatting.cs
+++ b/src/mscorlib/shared/System/Number.Formatting.cs
@@ -335,9 +335,6 @@ namespace System
             return sb.TryCopyTo(destination, out charsWritten);
         }
 
-#if PROJECTN
-        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoOptimization)]
-#endif
         private static unsafe void DecimalToNumber(decimal value, ref NumberBuffer number)
         {
             decimal d = value;
@@ -940,11 +937,7 @@ namespace System
             }
         }
 
-#if PROJECTN
-        [MethodImpl(MethodImplOptions.NoOptimization)]
-#else
         [MethodImpl(MethodImplOptions.AggressiveInlining)] // called from only one location
-#endif
         private static unsafe void Int32ToNumber(int value, ref NumberBuffer number)
         {
             number.precision = Int32Precision;
@@ -1048,11 +1041,7 @@ namespace System
             return buffer;
         }
 
-#if PROJECTN
-        [MethodImpl(MethodImplOptions.NoOptimization)]
-#else
         [MethodImpl(MethodImplOptions.AggressiveInlining)] // called from only one location
-#endif
         private static unsafe void UInt32ToNumber(uint value, ref NumberBuffer number)
         {
             number.precision = UInt32Precision;
@@ -1152,9 +1141,6 @@ namespace System
             }
         }
 
-#if PROJECTN
-        [MethodImpl(MethodImplOptions.NoOptimization)]
-#endif
         private static unsafe void Int64ToNumber(long input, ref NumberBuffer number)
         {
             ulong value = (ulong)input;
@@ -1282,9 +1268,6 @@ namespace System
             return TryCopyTo(p, (int)(buffer + bufferLength - p), destination, out charsWritten);
         }
 
-#if PROJECTN
-        [MethodImpl(MethodImplOptions.NoOptimization)]
-#endif
         private static unsafe void UInt64ToNumber(ulong value, ref NumberBuffer number)
         {
             number.precision = UInt64Precision;