[NativeAot] Null ref return is wrapped in TargetInvocationException (#…

…69838) When a null ref return method is invoked. Fixes #69755
dotnet · May 31, 2022 · 68d16d5 · 68d16d5
1 parent 292e8c9
commit 68d16d5
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 26 deletions.
diff --git a/...clr/nativeaot/System.Private.CoreLib/src/Internal/Runtime/CompilerHelpers/ThrowHelpers.cs b/...clr/nativeaot/System.Private.CoreLib/src/Internal/Runtime/CompilerHelpers/ThrowHelpers.cs
@@ -127,5 +127,10 @@ public static void ThrowArgumentOutOfRangeException()
         {
             throw new ArgumentOutOfRangeException();
         }
+
+        public static void ThrowInvokeNullRefReturned()
+        {
+            throw new NullReferenceException(SR.NullReference_InvokeNullRefReturned);
+        }
     }
 }
diff --git a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/InvokeUtils.cs b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/InvokeUtils.cs
@@ -427,9 +427,6 @@ internal static unsafe object CallDynamicInvokeMethod(
                     }
                 }
 
-                if (result == NullByRefValueSentinel)
-                    throw new NullReferenceException(SR.NullReference_InvokeNullRefReturned);
-
                 return result;
             }
         }
@@ -671,18 +668,5 @@ public static object DynamicInvokeParamHelperCore(ref ArgSetupState argSetupStat
                 }
             }
         }
-
-        private static volatile object _nullByRefValueSentinel;
-        public static object NullByRefValueSentinel
-        {
-            get
-            {
-                if (_nullByRefValueSentinel == null)
-                {
-                    Interlocked.CompareExchange(ref _nullByRefValueSentinel, new object(), null);
-                }
-                return _nullByRefValueSentinel;
-            }
-        }
     }
 }
diff --git a/...nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/CallConverterThunk.cs b/...nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/CallConverterThunk.cs
@@ -1123,9 +1123,9 @@ private static unsafe void InvokeTarget(void* allocatedStackBuffer, ref CallConv
                         if (returnType == CorElementType.ELEMENT_TYPE_BYREF && returnValueToCopy == null)
                         {
                             // This is a byref return and dereferencing it would result in a NullReferenceException.
-                            // Set the return value to a sentinel that InvokeUtils will recognize.
-                            // Can't throw from here or we would wrap this in a TargetInvocationException.
-                            returnValue = InvokeUtils.NullByRefValueSentinel;
+                            CompilerHelpers.ThrowHelpers.ThrowInvokeNullRefReturned();
+                            // Unreachable
+                            returnValue = null;
                         }
                         else if (RuntimeAugments.IsUnmanagedPointerType(returnTypeRuntimeTypeHandle))
                         {

diff --git a/src/coreclr/tools/Common/TypeSystem/IL/Stubs/DynamicInvokeMethodThunk.cs b/src/coreclr/tools/Common/TypeSystem/IL/Stubs/DynamicInvokeMethodThunk.cs
@@ -388,9 +388,7 @@ public override MethodIL EmitIL()
             //
             // !if (ReturnType is ByRef)
             //   ByRefNull:
-            //   pop
-            //   call InvokeUtils.get_NullByRefValueSentinel
-            //   ret
+            //   throw NullReferenceException
 
             ILCodeLabel lStaticCall = emitter.NewCodeLabel();
             ILCodeLabel lProcessReturn = emitter.NewCodeLabel();
@@ -512,9 +510,8 @@ public override MethodIL EmitIL()
             if (lByRefReturnNull != null)
             {
                 returnCodeStream.EmitLabel(lByRefReturnNull);
-                returnCodeStream.Emit(ILOpcode.pop);
-                returnCodeStream.Emit(ILOpcode.call, emitter.NewToken(InvokeUtilsType.GetKnownMethod("get_NullByRefValueSentinel", null)));
-                returnCodeStream.Emit(ILOpcode.ret);
+                MethodDesc nullReferencedExceptionHelper = Context.GetHelperEntryPoint("ThrowHelpers", "ThrowInvokeNullRefReturned");
+                returnCodeStream.EmitCallThrowHelper(emitter, nullReferencedExceptionHelper);                
             }
 
             return emitter.Link(this);

diff --git a/src/tests/nativeaot/SmokeTests/Reflection/Reflection.cs b/src/tests/nativeaot/SmokeTests/Reflection/Reflection.cs
@@ -1215,7 +1215,7 @@ public static unsafe void TestNullRefReturnOfPointer()
 
             PropertyInfo p = typeof(TestClassIntPointer).GetProperty(nameof(TestClassIntPointer.NullRefReturningProp));
             Assert.NotNull(p);
-            Assert.Throws<NullReferenceException>(() => p.GetValue(tc));
+            Assert.Throws<TargetInvocationException>(() => p.GetValue(tc));
         }
 
         public static unsafe void TestByRefLikeRefReturn()