Fix assembly default to nullable, remove pointer support, bump to v2

mikernet · mikernet · commit 212bfc8fcb6f · 2024-10-25T16:55:41.000-04:00
diff --git a/Source/Directory.Build.props b/Source/Directory.Build.props
@@ -4,7 +4,7 @@
     <Nullable>enable</Nullable>
     <AnnotatedReferenceAssemblyVersion>6.0.0</AnnotatedReferenceAssemblyVersion>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <Version>1.0.6</Version>
+    <Version>2.0.0</Version>
     <DefineConstants Condition="'$(IsCI)' == 'true'">$(DefineConstants);CI</DefineConstants>
   </PropertyGroup>
 
diff --git a/Source/RuntimeNullables.Fody.Tests/NullableDisabledTests.cs b/Source/RuntimeNullables.Fody.Tests/NullableDisabledTests.cs
@@ -0,0 +1,11 @@
+﻿using Microsoft.VisualStudio.TestTools.UnitTesting;
+using TestAssembly;
+
+namespace RuntimeNullables.Fody.Tests;
+
+[TestClass]
+public class NullableDisabledTests
+{
+    [TestMethod]
+    public void NonNull() => NullableDisabled.NonNull(null);
+}
diff --git a/Source/RuntimeNullables.Fody.Tests/PointerTests.cs b/Source/RuntimeNullables.Fody.Tests/PointerTests.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+﻿using Microsoft.VisualStudio.TestTools.UnitTesting;
 using TestAssemblyPointers;
 
 namespace RuntimeNullables.Fody.Tests;
@@ -10,31 +9,11 @@ public class PointerTests
     private readonly int _value = 5;
 
     [TestMethod]
-    public unsafe void ReturnSameValueNullableParameter()
+    public unsafe void PointerIgnored()
     {
         fixed (int* value = &_value) {
-            Pointers.ReturnSameValueNullableParameter(value);
-            var ex = Assert.ThrowsException<NullReferenceException>(() => Pointers.ReturnSameValueNullableParameter(null));
-            Assert.IsTrue(ex.Message.Contains("return", StringComparison.OrdinalIgnoreCase), "Exception message did not apply to return value.");
-        }
-    }
-
-    [TestMethod]
-    public unsafe void AllowNullOnlyNoOp()
-    {
-        fixed (int* value = &_value) {
-            Pointers.AllowNullOnlyNoOp(value);
-            var ex = Assert.ThrowsException<NullReferenceException>(() => Pointers.AllowNullOnlyNoOp(null));
-            Assert.IsTrue(ex.Message.Contains("output", StringComparison.OrdinalIgnoreCase), "Exception message did not apply to output value.");
-        }
-    }
-
-    [TestMethod]
-    public unsafe void NonNullParameter()
-    {
-        fixed (int* value = &_value) {
-            Pointers.NonNullParameter(value);
-            Assert.ThrowsException<ArgumentNullException>(() => Pointers.NonNullParameter(null));
+            Pointers.Ignored(value);
+            Pointers.Ignored(null);
         }
     }
 }
diff --git a/Source/RuntimeNullables.Fody.Tests/RuntimeNullables.Fody.Tests.csproj b/Source/RuntimeNullables.Fody.Tests/RuntimeNullables.Fody.Tests.csproj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FodyHelpers" Version="6.8.0" />
+    <PackageReference Include="FodyHelpers" Version="6.8.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
     <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
diff --git a/Source/RuntimeNullables.Fody.Tests/VerifyILTests.InjectedThrowHelpers.Debug.DotNet6_0.verified.txt b/Source/RuntimeNullables.Fody.Tests/VerifyILTests.InjectedThrowHelpers.Debug.DotNet6_0.verified.txt
@@ -2,7 +2,7 @@
 extends [System.Runtime]System.Object
 {
 string) = ( 01 00 15 52 75 6E 74 69 6D 65 4E 75 6C 6C 61 62   // ...RuntimeNullab
-6C 65 73 2E 46 6F 64 79 07 31 2E 30 2E 36 2E 30   // les.Fody.1.0.6.0
+6C 65 73 2E 46 6F 64 79 07 32 2E 30 2E 30 2E 30   // les.Fody.2.0.0.0
 00 00 )
 .method assembly hidebysig static void
 ThrowArgumentNull(string paramName) cil managed
diff --git a/Source/RuntimeNullables.Fody.Tests/VerifyILTests.InjectedThrowHelpers.Debug.DotNet7_0.verified.txt b/Source/RuntimeNullables.Fody.Tests/VerifyILTests.InjectedThrowHelpers.Debug.DotNet7_0.verified.txt
@@ -2,7 +2,7 @@
 extends [System.Runtime]System.Object
 {
 string) = ( 01 00 15 52 75 6E 74 69 6D 65 4E 75 6C 6C 61 62   // ...RuntimeNullab
-6C 65 73 2E 46 6F 64 79 07 31 2E 30 2E 36 2E 30   // les.Fody.1.0.6.0
+6C 65 73 2E 46 6F 64 79 07 32 2E 30 2E 30 2E 30   // les.Fody.2.0.0.0
 00 00 )
 .method assembly hidebysig static void
 ThrowArgumentNull(string paramName) cil managed
diff --git a/Source/RuntimeNullables.Fody.Tests/VerifyILTests.InjectedThrowHelpers.Release.DotNet6_0.verified.txt b/Source/RuntimeNullables.Fody.Tests/VerifyILTests.InjectedThrowHelpers.Release.DotNet6_0.verified.txt
@@ -2,7 +2,7 @@
 extends [System.Runtime]System.Object
 {
 string) = ( 01 00 15 52 75 6E 74 69 6D 65 4E 75 6C 6C 61 62   // ...RuntimeNullab
-6C 65 73 2E 46 6F 64 79 07 31 2E 30 2E 36 2E 30   // les.Fody.1.0.6.0
+6C 65 73 2E 46 6F 64 79 07 32 2E 30 2E 30 2E 30   // les.Fody.2.0.0.0
 00 00 )
 .method assembly hidebysig static void
 ThrowArgumentNull(string paramName) cil managed
diff --git a/Source/RuntimeNullables.Fody.Tests/VerifyILTests.InjectedThrowHelpers.Release.DotNet7_0.verified.txt b/Source/RuntimeNullables.Fody.Tests/VerifyILTests.InjectedThrowHelpers.Release.DotNet7_0.verified.txt
@@ -2,7 +2,7 @@
 extends [System.Runtime]System.Object
 {
 string) = ( 01 00 15 52 75 6E 74 69 6D 65 4E 75 6C 6C 61 62   // ...RuntimeNullab
-6C 65 73 2E 46 6F 64 79 07 31 2E 30 2E 36 2E 30   // les.Fody.1.0.6.0
+6C 65 73 2E 46 6F 64 79 07 32 2E 30 2E 30 2E 30   // les.Fody.2.0.0.0
 00 00 )
 .method assembly hidebysig static void
 ThrowArgumentNull(string paramName) cil managed
diff --git a/Source/RuntimeNullables.Fody.Tests/VerifyILTests.NullableDisabled.Debug.DotNet6_0.verified.txt b/Source/RuntimeNullables.Fody.Tests/VerifyILTests.NullableDisabled.Debug.DotNet6_0.verified.txt
@@ -0,0 +1,11 @@
+﻿.class public abstract auto ansi sealed beforefieldinit TestAssembly.NullableDisabled
+extends [System.Runtime]System.Object
+{
+.method public hidebysig static string
+NonNull(string x) cil managed
+{
+.maxstack  8
+IL_0000:  ldarg.0
+IL_0001:  ret
+}
+}
diff --git a/Source/RuntimeNullables.Fody.Tests/VerifyILTests.NullableDisabled.Debug.DotNet7_0.verified.txt b/Source/RuntimeNullables.Fody.Tests/VerifyILTests.NullableDisabled.Debug.DotNet7_0.verified.txt
@@ -0,0 +1,11 @@
+﻿.class public abstract auto ansi sealed beforefieldinit TestAssembly.NullableDisabled
+extends [System.Runtime]System.Object
+{
+.method public hidebysig static string
+NonNull(string x) cil managed
+{
+.maxstack  8
+IL_0000:  ldarg.0
+IL_0001:  ret
+}
+}
diff --git a/Source/RuntimeNullables.Fody.Tests/VerifyILTests.NullableDisabled.Release.DotNet6_0.verified.txt b/Source/RuntimeNullables.Fody.Tests/VerifyILTests.NullableDisabled.Release.DotNet6_0.verified.txt
@@ -0,0 +1,11 @@
+﻿.class public abstract auto ansi sealed beforefieldinit TestAssembly.NullableDisabled
+extends [System.Runtime]System.Object
+{
+.method public hidebysig static string
+NonNull(string x) cil managed
+{
+.maxstack  8
+IL_0000:  ldarg.0
+IL_0001:  ret
+}
+}
diff --git a/Source/RuntimeNullables.Fody.Tests/VerifyILTests.NullableDisabled.Release.DotNet7_0.verified.txt b/Source/RuntimeNullables.Fody.Tests/VerifyILTests.NullableDisabled.Release.DotNet7_0.verified.txt
@@ -0,0 +1,11 @@
+﻿.class public abstract auto ansi sealed beforefieldinit TestAssembly.NullableDisabled
+extends [System.Runtime]System.Object
+{
+.method public hidebysig static string
+NonNull(string x) cil managed
+{
+.maxstack  8
+IL_0000:  ldarg.0
+IL_0001:  ret
+}
+}
diff --git a/Source/RuntimeNullables.Fody.Tests/VerifyILTests.Pointers.Debug.DotNet6_0.verified.txt b/Source/RuntimeNullables.Fody.Tests/VerifyILTests.Pointers.Debug.DotNet6_0.verified.txt
@@ -2,42 +2,15 @@
 extends [System.Runtime]System.Object
 {
 .method public hidebysig static int32*
-ReturnSameValueNullableParameter(int32* 'value') cil managed
+Ignored(int32* 'value') cil managed
 {
-.param [1]
-.maxstack  8
-IL_0000:  ldarg.0
-IL_0001:  dup
-IL_0002:  brtrue.s   IL_000e
-IL_0004:  ldstr      "Return value nullability contract was broken."
-IL_0009:  call       void RuntimeNullables.ThrowHelpers::ThrowOutputNull(string)
-IL_000e:  ret
-}
-.method public hidebysig static void  AllowNullOnlyNoOp(int32* 'value') cil managed
-{
-.param [1]
-.maxstack  8
+.maxstack  1
+.locals init (int32* V_0)
 IL_0000:  nop
 IL_0001:  ldarg.0
-IL_0002:  brtrue.s   IL_000e
-IL_0004:  ldstr      "Output parameter 'value' nullability contract was "
-+ "broken."
-IL_0009:  call       void RuntimeNullables.ThrowHelpers::ThrowOutputNull(string)
-IL_000e:  ret
-}
-.method public hidebysig static void  NonNullParameter(int32* 'value') cil managed
-{
-.maxstack  8
-IL_0000:  ldarg.0
-IL_0001:  brtrue.s   IL_000d
-IL_0003:  ldstr      "value"
-IL_0008:  call       void RuntimeNullables.ThrowHelpers::ThrowArgumentNull(string)
-IL_000d:  nop
-IL_000e:  ldarg.0
-IL_000f:  brtrue.s   IL_001b
-IL_0011:  ldstr      "Output parameter 'value' nullability contract was "
-+ "broken."
-IL_0016:  call       void RuntimeNullables.ThrowHelpers::ThrowOutputNull(string)
-IL_001b:  ret
+IL_0002:  stloc.0
+IL_0003:  br.s       IL_0005
+IL_0005:  ldloc.0
+IL_0006:  ret
 }
 }
diff --git a/Source/RuntimeNullables.Fody.Tests/VerifyILTests.Pointers.Debug.DotNet7_0.verified.txt b/Source/RuntimeNullables.Fody.Tests/VerifyILTests.Pointers.Debug.DotNet7_0.verified.txt
@@ -2,42 +2,15 @@
 extends [System.Runtime]System.Object
 {
 .method public hidebysig static int32*
-ReturnSameValueNullableParameter(int32* 'value') cil managed
+Ignored(int32* 'value') cil managed
 {
-.param [1]
-.maxstack  8
-IL_0000:  ldarg.0
-IL_0001:  dup
-IL_0002:  brtrue.s   IL_000e
-IL_0004:  ldstr      "Return value nullability contract was broken."
-IL_0009:  call       void RuntimeNullables.ThrowHelpers::ThrowOutputNull(string)
-IL_000e:  ret
-}
-.method public hidebysig static void  AllowNullOnlyNoOp(int32* 'value') cil managed
-{
-.param [1]
-.maxstack  8
+.maxstack  1
+.locals init (int32* V_0)
 IL_0000:  nop
 IL_0001:  ldarg.0
-IL_0002:  brtrue.s   IL_000e
-IL_0004:  ldstr      "Output parameter 'value' nullability contract was "
-+ "broken."
-IL_0009:  call       void RuntimeNullables.ThrowHelpers::ThrowOutputNull(string)
-IL_000e:  ret
-}
-.method public hidebysig static void  NonNullParameter(int32* 'value') cil managed
-{
-.maxstack  8
-IL_0000:  ldarg.0
-IL_0001:  brtrue.s   IL_000d
-IL_0003:  ldstr      "value"
-IL_0008:  call       void RuntimeNullables.ThrowHelpers::ThrowArgumentNull(string)
-IL_000d:  nop
-IL_000e:  ldarg.0
-IL_000f:  brtrue.s   IL_001b
-IL_0011:  ldstr      "Output parameter 'value' nullability contract was "
-+ "broken."
-IL_0016:  call       void RuntimeNullables.ThrowHelpers::ThrowOutputNull(string)
-IL_001b:  ret
+IL_0002:  stloc.0
+IL_0003:  br.s       IL_0005
+IL_0005:  ldloc.0
+IL_0006:  ret
 }
 }
diff --git a/Source/RuntimeNullables.Fody.Tests/VerifyILTests.Pointers.Release.DotNet6_0.verified.txt b/Source/RuntimeNullables.Fody.Tests/VerifyILTests.Pointers.Release.DotNet6_0.verified.txt
@@ -2,40 +2,10 @@
 extends [System.Runtime]System.Object
 {
 .method public hidebysig static int32*
-ReturnSameValueNullableParameter(int32* 'value') cil managed
+Ignored(int32* 'value') cil managed
 {
-.param [1]
 .maxstack  8
 IL_0000:  ldarg.0
-IL_0001:  dup
-IL_0002:  brtrue.s   IL_000e
-IL_0004:  ldstr      "Return value nullability contract was broken."
-IL_0009:  call       void RuntimeNullables.ThrowHelpers::ThrowOutputNull(string)
-IL_000e:  ret
-}
-.method public hidebysig static void  AllowNullOnlyNoOp(int32* 'value') cil managed
-{
-.param [1]
-.maxstack  8
-IL_0000:  ldarg.0
-IL_0001:  brtrue.s   IL_000d
-IL_0003:  ldstr      "Output parameter 'value' nullability contract was "
-+ "broken."
-IL_0008:  call       void RuntimeNullables.ThrowHelpers::ThrowOutputNull(string)
-IL_000d:  ret
-}
-.method public hidebysig static void  NonNullParameter(int32* 'value') cil managed
-{
-.maxstack  8
-IL_0000:  ldarg.0
-IL_0001:  brtrue.s   IL_000d
-IL_0003:  ldstr      "value"
-IL_0008:  call       void RuntimeNullables.ThrowHelpers::ThrowArgumentNull(string)
-IL_000d:  ldarg.0
-IL_000e:  brtrue.s   IL_001a
-IL_0010:  ldstr      "Output parameter 'value' nullability contract was "
-+ "broken."
-IL_0015:  call       void RuntimeNullables.ThrowHelpers::ThrowOutputNull(string)
-IL_001a:  ret
+IL_0001:  ret
 }
 }
diff --git a/Source/RuntimeNullables.Fody.Tests/VerifyILTests.Pointers.Release.DotNet7_0.verified.txt b/Source/RuntimeNullables.Fody.Tests/VerifyILTests.Pointers.Release.DotNet7_0.verified.txt
@@ -2,40 +2,10 @@
 extends [System.Runtime]System.Object
 {
 .method public hidebysig static int32*
-ReturnSameValueNullableParameter(int32* 'value') cil managed
+Ignored(int32* 'value') cil managed
 {
-.param [1]
 .maxstack  8
 IL_0000:  ldarg.0
-IL_0001:  dup
-IL_0002:  brtrue.s   IL_000e
-IL_0004:  ldstr      "Return value nullability contract was broken."
-IL_0009:  call       void RuntimeNullables.ThrowHelpers::ThrowOutputNull(string)
-IL_000e:  ret
-}
-.method public hidebysig static void  AllowNullOnlyNoOp(int32* 'value') cil managed
-{
-.param [1]
-.maxstack  8
-IL_0000:  ldarg.0
-IL_0001:  brtrue.s   IL_000d
-IL_0003:  ldstr      "Output parameter 'value' nullability contract was "
-+ "broken."
-IL_0008:  call       void RuntimeNullables.ThrowHelpers::ThrowOutputNull(string)
-IL_000d:  ret
-}
-.method public hidebysig static void  NonNullParameter(int32* 'value') cil managed
-{
-.maxstack  8
-IL_0000:  ldarg.0
-IL_0001:  brtrue.s   IL_000d
-IL_0003:  ldstr      "value"
-IL_0008:  call       void RuntimeNullables.ThrowHelpers::ThrowArgumentNull(string)
-IL_000d:  ldarg.0
-IL_000e:  brtrue.s   IL_001a
-IL_0010:  ldstr      "Output parameter 'value' nullability contract was "
-+ "broken."
-IL_0015:  call       void RuntimeNullables.ThrowHelpers::ThrowOutputNull(string)
-IL_001a:  ret
+IL_0001:  ret
 }
 }
diff --git a/Source/RuntimeNullables.Fody.Tests/VerifyILTests.cs b/Source/RuntimeNullables.Fody.Tests/VerifyILTests.cs
@@ -81,6 +81,12 @@ public Task NestedContainer()
         return Verify(Decompile(typeof(NestedContainer)), _verifySettings);
     }
 
+    [TestMethod]
+    public Task NullableDisabled()
+    {
+        return Verify(Decompile(typeof(NullableDisabled)), _verifySettings);
+    }
+
     [TestMethod]
     public Task OutputParameters()
     {
diff --git a/Source/RuntimeNullables.Fody/Contexts/NullableContext.cs b/Source/RuntimeNullables.Fody/Contexts/NullableContext.cs
@@ -19,7 +19,7 @@ internal NullableContext(ICustomAttributeProvider attributeProvider, WeavingCont
     {
         WeavingContext = weavingContext;
 
-        _isNullable = false;
+        _isNullable = true;
         _nullChecksEnabled = true;
 
         ProcessAttributes(attributeProvider, ref _isNullable, ref _nullChecksEnabled);
diff --git a/Source/RuntimeNullables.Fody/Extensions/TypeReferenceExtensions.cs b/Source/RuntimeNullables.Fody/Extensions/TypeReferenceExtensions.cs
@@ -6,7 +6,10 @@ internal static class TypeReferenceExtensions
 {
     public static bool IsReferenceType(this TypeReference type)
     {
-        if (type.IsPointer || type.IsArray)
+        if (type.IsPointer)
+            return false;
+
+        if (type.IsArray)
             return true;
 
         type = type.GetElementType();
diff --git a/Source/RuntimeNullables.Fody/ModuleWeaver.ParameterChecks.cs b/Source/RuntimeNullables.Fody/ModuleWeaver.ParameterChecks.cs
@@ -43,7 +43,7 @@ private static bool InjectParameterChecks(MethodContext methodContext, ref Retur
 
             // Postconditions:
 
-            if (weavingContext.CheckOutputs && (parameterType.IsPointer || (parameterType.IsByReference && !parameter.IsIn))) {
+            if (weavingContext.CheckOutputs && parameterType.IsByReference && !parameter.IsIn) {
                 bool? maybeNull = MaybeNull(parameter);
 
                 // Avoid calling MethodContext.IsParameterNullable unless we did not already do so for the getter and we are going to need the value
diff --git a/Source/RuntimeNullables.Fody/RuntimeNullables.Fody.csproj b/Source/RuntimeNullables.Fody/RuntimeNullables.Fody.csproj
@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FodyHelpers" Version="6.8.0" />
+    <PackageReference Include="FodyHelpers" Version="6.8.2" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
   </ItemGroup>
 </Project>
diff --git a/Source/RuntimeNullables/RuntimeNullables.csproj b/Source/RuntimeNullables/RuntimeNullables.csproj
diff --git a/Source/TestAssembly/NullableDisabled.cs b/Source/TestAssembly/NullableDisabled.cs
diff --git a/Source/TestAssembly/TestAssembly.csproj b/Source/TestAssembly/TestAssembly.csproj
diff --git a/Source/TestAssemblyNonPublic/TestAssemblyNonPublic.csproj b/Source/TestAssemblyNonPublic/TestAssemblyNonPublic.csproj
diff --git a/Source/TestAssemblyPointers/Pointers.cs b/Source/TestAssemblyPointers/Pointers.cs
diff --git a/Source/TestAssemblyPointers/TestAssemblyPointers.csproj b/Source/TestAssemblyPointers/TestAssemblyPointers.csproj
diff --git a/Source/TestAssemblyThrowHelpers/TestAssemblyThrowHelpers.csproj b/Source/TestAssemblyThrowHelpers/TestAssemblyThrowHelpers.csproj

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`extends [System.Runtime]System.Object`
`3`	`3`	`{`
`4`	`4`	`string) = ( 01 00 15 52 75 6E 74 69 6D 65 4E 75 6C 6C 61 62 // ...RuntimeNullab`
`5`		`-6C 65 73 2E 46 6F 64 79 07 31 2E 30 2E 36 2E 30 // les.Fody.1.0.6.0`
	`5`	`+6C 65 73 2E 46 6F 64 79 07 32 2E 30 2E 30 2E 30 // les.Fody.2.0.0.0`
`6`	`6`	`00 00 )`
`7`	`7`	`.method assembly hidebysig static void`
`8`	`8`	`ThrowArgumentNull(string paramName) cil managed`