From 0a87dfeb4d471f954d439dddefa1f922332d1b26 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michal=20Strehovsk=C3=BD?= Date: Sat, 16 May 2020 16:09:54 +0200 Subject: [PATCH] Port changes to shared files Nullable.cs, Enum.cs (#36597) --- src/libraries/System.Private.CoreLib/src/System/Enum.cs | 1 - src/libraries/System.Private.CoreLib/src/System/Nullable.cs | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/libraries/System.Private.CoreLib/src/System/Enum.cs b/src/libraries/System.Private.CoreLib/src/System/Enum.cs index 9d80c82..33e294a 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Enum.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Enum.cs @@ -10,7 +10,6 @@ using System.Runtime.CompilerServices; using Internal.Runtime.CompilerServices; #if CORERT -using CorElementType = System.Runtime.RuntimeImports.RhCorElementType; using RuntimeType = System.Type; using EnumInfo = Internal.Runtime.Augments.EnumInfo; #endif diff --git a/src/libraries/System.Private.CoreLib/src/System/Nullable.cs b/src/libraries/System.Private.CoreLib/src/System/Nullable.cs index 223a446..8a5416d 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Nullable.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Nullable.cs @@ -111,7 +111,7 @@ namespace System { if (nullableEEType.IsNullable) { - return Internal.Reflection.Core.NonPortable.RuntimeTypeUnifier.GetRuntimeTypeForEEType(nullableEEType.NullableType); + return Type.GetTypeFromEETypePtr(nullableEEType.NullableType); } } return null; -- 2.7.4