fb

Author: kasperk81

src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/ExceptionHandling.cs

@@ -444,9 +444,9 @@ public static Exception GetRuntimeException(ExceptionIDs id)
 
         private enum HwExceptionCode : uint
         {
-            STATUS_NULL_REFERENCE = 0x00000000u,
-            STATUS_UNMANAGED_HELPER_NULL_REFERENCE = 0x00000042u,
-            STATUS_THREAD_ABORT = 0x00000043u,
+            STATUS_NATIVEAOT_NULL_REFERENCE = 0x00000000u,
+            STATUS_NATIVEAOT_UNMANAGED_HELPER_NULL_REFERENCE = 0x00000042u,
+            STATUS_NATIVEAOT_THREAD_ABORT = 0x00000043u,
 
             STATUS_DATATYPE_MISALIGNMENT = 0x80000002u,
             STATUS_ACCESS_VIOLATION = 0xC0000005u,
@@ -574,11 +574,11 @@ public static void RhThrowHwEx(uint exceptionCode, ref ExInfo exInfo)
 
             switch (exceptionCode)
             {
-                case (uint)HwExceptionCode.STATUS_NULL_REFERENCE:
+                case (uint)HwExceptionCode.STATUS_NATIVEAOT_NULL_REFERENCE:
                     exceptionId = ExceptionIDs.NullReference;
                     break;
 
-                case (uint)HwExceptionCode.STATUS_UNMANAGED_HELPER_NULL_REFERENCE:
+                case (uint)HwExceptionCode.STATUS_NATIVEAOT_UNMANAGED_HELPER_NULL_REFERENCE:
                     // The write barrier where the actual fault happened has been unwound already.
                     // The IP of this fault needs to be treated as return address, not as IP of
                     // faulting instruction.
@@ -587,7 +587,7 @@ public static void RhThrowHwEx(uint exceptionCode, ref ExInfo exInfo)
                     break;
 
 #if NATIVEAOT
-                case (uint)HwExceptionCode.STATUS_THREAD_ABORT:
+                case (uint)HwExceptionCode.STATUS_NATIVEAOT_THREAD_ABORT:
                     exceptionToThrow = InternalCalls.RhpGetThreadAbortException();
                     break;
 #endif

src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/TypeCast.cs

@@ -789,27 +789,12 @@ public static unsafe void StelemRef(object?[] array, nint index, object? obj)
             // This is supported only on arrays
             Debug.Assert(array is null || array.GetMethodTable()->IsArray, "first argument must be an array");
 
-#if INPLACE_RUNTIME
             // This will throw NullReferenceException if obj is null.
             if ((nuint)index >= (uint)array.Length)
                 ThrowIndexOutOfRangeException(array);
 
             Debug.Assert(index >= 0);
             ref object? element = ref Unsafe.Add(ref MemoryMarshal.GetArrayDataReference(array), index);
-#else
-            if (array is null)
-            {
-                // TODO: If both array and obj are null, we're likely going to throw NativeAOT's NullReferenceException.
-                //       This should blame the caller.
-                throw obj.GetMethodTable()->GetClasslibException(ExceptionIDs.NullReference);
-            }
-            if ((uint)index >= (uint)array.Length)
-            {
-                throw array.GetMethodTable()->GetClasslibException(ExceptionIDs.IndexOutOfRange);
-            }
-            ref object rawData = ref Unsafe.As<byte, object>(ref Unsafe.As<RawArrayData>(array).Data);
-            ref object element = ref Unsafe.Add(ref rawData, index);
-#endif
 
             MethodTable* elementType = array.GetMethodTable()->RelatedParameterType;
 

src/coreclr/nativeaot/Runtime/AsmOffsetsVerify.cpp

@@ -4,7 +4,6 @@
 #include "gcenv.h"
 #include "gcheaputilities.h"
 #include "rhassert.h"
-#include "Warnings.h"
 #include "slist.h"
 #include "regdisplay.h"
 #include "StackFrameIterator.h"

src/coreclr/nativeaot/Runtime/CachedInterfaceDispatchPal.h

@@ -8,13 +8,12 @@
 #include "CommonMacros.h"
 #include "daccess.h"
 #include "DebugMacrosExt.h"
-#include "PalCommon.h"
+#include "PalLimitedContext.h"
 #include "Pal.h"
 #include "rhassert.h"
 #include "slist.h"
 #include "holder.h"
 #include "Crst.h"
-#include "Warnings.h"
 #include "TargetPtrs.h"
 #include "MethodTable.h"
 #include "Range.h"

src/coreclr/nativeaot/Runtime/Crst.cpp

@@ -3,7 +3,7 @@
 #include "common.h"
 #include "CommonTypes.h"
 #include "CommonMacros.h"
-#include "PalCommon.h"
+#include "PalLimitedContext.h"
 #include "Pal.h"
 #include "holder.h"
 #include "Crst.h"

src/coreclr/nativeaot/Runtime/DebugHeader.cpp

@@ -7,7 +7,7 @@
 #include "gcinterface.dac.h"
 #include "rhassert.h"
 #include "TargetPtrs.h"
-#include "PalCommon.h"
+#include "PalLimitedContext.h"
 #include "Pal.h"
 #include "holder.h"
 #include "RuntimeInstance.h"

src/coreclr/nativeaot/Runtime/EHHelpers.cpp

@@ -10,7 +10,7 @@
 #include "GcEnum.h"
 #include "shash.h"
 #include "TypeManager.h"
-#include "PalCommon.h"
+#include "PalLimitedContext.h"
 #include "Pal.h"
 #include "holder.h"
 #include "Crst.h"
@@ -357,13 +357,13 @@ int32_t RhpHardwareExceptionHandler(uintptr_t faultCode, uintptr_t faultAddress,
     if (pCodeManager != NULL)
     {
         // Make sure that the OS does not use our internal fault codes
-        ASSERT(faultCode != STATUS_NULL_REFERENCE && faultCode != STATUS_UNMANAGED_HELPER_NULL_REFERENCE);
+        ASSERT(faultCode != STATUS_NATIVEAOT_NULL_REFERENCE && faultCode != STATUS_NATIVEAOT_UNMANAGED_HELPER_NULL_REFERENCE);
 
         if (faultCode == STATUS_ACCESS_VIOLATION)
         {
             if (faultAddress < NULL_AREA_SIZE)
             {
-                faultCode = STATUS_NULL_REFERENCE;
+                faultCode = STATUS_NATIVEAOT_NULL_REFERENCE;
             }
         }
         else if (faultCode == STATUS_STACK_OVERFLOW)
@@ -387,7 +387,7 @@ int32_t RhpHardwareExceptionHandler(uintptr_t faultCode, uintptr_t faultAddress,
         {
             if (faultAddress < NULL_AREA_SIZE)
             {
-                faultCode = STATUS_UNMANAGED_HELPER_NULL_REFERENCE;
+                faultCode = STATUS_NATIVEAOT_UNMANAGED_HELPER_NULL_REFERENCE;
             }
 
             // we were AV-ing in a helper - unwind our way to our caller
@@ -490,13 +490,13 @@ LONG WINAPI RhpVectoredExceptionHandler(PEXCEPTION_POINTERS pExPtrs)
     if (pCodeManager != NULL)
     {
         // Make sure that the OS does not use our internal fault codes
-        ASSERT(faultCode != STATUS_NULL_REFERENCE && faultCode != STATUS_UNMANAGED_HELPER_NULL_REFERENCE);
+        ASSERT(faultCode != STATUS_NATIVEAOT_NULL_REFERENCE && faultCode != STATUS_NATIVEAOT_UNMANAGED_HELPER_NULL_REFERENCE);
 
         if (faultCode == STATUS_ACCESS_VIOLATION)
         {
             if (pExPtrs->ExceptionRecord->ExceptionInformation[1] < NULL_AREA_SIZE)
             {
-                faultCode = STATUS_NULL_REFERENCE;
+                faultCode = STATUS_NATIVEAOT_NULL_REFERENCE;
             }
         }
         else if (faultCode == STATUS_STACK_OVERFLOW)
@@ -525,7 +525,7 @@ LONG WINAPI RhpVectoredExceptionHandler(PEXCEPTION_POINTERS pExPtrs)
         {
             if (pExPtrs->ExceptionRecord->ExceptionInformation[1] < NULL_AREA_SIZE)
             {
-                faultCode = STATUS_UNMANAGED_HELPER_NULL_REFERENCE;
+                faultCode = STATUS_NATIVEAOT_UNMANAGED_HELPER_NULL_REFERENCE;
             }
 
             // we were AV-ing in a helper - unwind our way to our caller

src/coreclr/nativeaot/Runtime/GCHelpers.cpp

@@ -15,7 +15,7 @@
 #include "forward_declarations.h"
 #include "RhConfig.h"
 
-#include "PalCommon.h"
+#include "PalLimitedContext.h"
 #include "slist.h"
 #include "regdisplay.h"
 #include "StackFrameIterator.h"

src/coreclr/nativeaot/Runtime/GCMemoryHelpers.cpp

@@ -7,7 +7,7 @@
 
 #include "common.h"
 #include "gcenv.h"
-#include "PalCommon.h"
+#include "PalLimitedContext.h"
 #include "CommonMacros.inl"
 #include "GCMemoryHelpers.inl"
 

src/coreclr/nativeaot/Runtime/GcStressControl.cpp

@@ -8,7 +8,7 @@
 #include "CommonTypes.h"
 #include "CommonMacros.h"
 #include "daccess.h"
-#include "PalCommon.h"
+#include "PalLimitedContext.h"
 #include "Pal.h"
 #include "rhassert.h"
 #include "holder.h"