Adjust for roslyn change on ref parameters and NotNullIfNotNull (#42707)

* Adjust for roslyn change on ref parameters

* Adjust for roslyn change on NotNullIfNotNull

diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.CoreCLR.cs b/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.CoreCLR.cs
index f979ed4..22a9185 100644 (file)
--- a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.CoreCLR.cs
+++ b/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.CoreCLR.cs
@@ -585,7 +585,7 @@ namespace System.Runtime.InteropServices
                 if (!SetComObjectData(o, t, Wrapper))
                 {
                     // Another thead already cached the wrapper so use that one instead.
-                    Wrapper = GetComObjectData(o, t);
+                    Wrapper = GetComObjectData(o, t)!;
                 }
             }
 

diff --git a/src/libraries/System.Private.CoreLib/src/System/Threading/LazyInitializer.cs b/src/libraries/System.Private.CoreLib/src/System/Threading/LazyInitializer.cs
index 5f13e3d..b2703e7 100644 (file)
--- a/src/libraries/System.Private.CoreLib/src/System/Threading/LazyInitializer.cs
+++ b/src/libraries/System.Private.CoreLib/src/System/Threading/LazyInitializer.cs
@@ -143,7 +143,7 @@ namespace System.Threading
                 return target!;
             }
 
-            return EnsureInitializedCore(ref target, ref initialized, ref syncLock);
+            return EnsureInitializedCore<T>(ref target, ref initialized, ref syncLock);
         }
 
         /// <summary>