NativeAOT-LLVM Merge sep 23

eng/Subsets.props

@@ -267,16 +267,11 @@
       Category="clr" />
   </ItemGroup>
 
-<<<<<<< HEAD
-  <!-- Build the CoreCLR cross tools when we're doing a cross build and either we're building any CoreCLR native tools for platforms CoreCLR fully supports or when someone explicitly requests them, but never for Browser/Wasm -->
-  <ItemGroup Condition="(('$(ClrRuntimeBuildSubsets)' != '' and '$(PrimaryRuntimeFlavor)' == 'CoreCLR' and '$(TargetsMobile)' != 'true') or $(_subset.Contains('+clr.crossarchtools+'))) and ('$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)') and '$(TargetArchitecture)' != 'wasm'">
-=======
   <!--
     Build the CoreCLR cross tools when we're doing a cross build and either we're building any CoreCLR native tools for platforms CoreCLR fully supports or when someone explicitly requests them.
     The cross tools are used as part of the build process with the downloaded build tools, so we need to build them for the host architecture and build them as unsanitized binaries.
     -->
-  <ItemGroup Condition="(('$(ClrRuntimeBuildSubsets)' != '' and '$(PrimaryRuntimeFlavor)' == 'CoreCLR') or $(_subset.Contains('+clr.crossarchtools+'))) and ('$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)' or '$(EnableNativeSanitizers)' != '')">
->>>>>>> runtime/main
+  <ItemGroup Condition="(('$(ClrRuntimeBuildSubsets)' != '' and '$(PrimaryRuntimeFlavor)' == 'CoreCLR') or $(_subset.Contains('+clr.crossarchtools+'))) and ('$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)' or '$(EnableNativeSanitizers)' != '') and '$(TargetArchitecture)' != 'wasm'">
     <ProjectToBuild
       Include="$(CoreClrProjectRoot)runtime.proj"
       AdditionalProperties="%(AdditionalProperties);

src/coreclr/gc/gc.cpp

@@ -10056,7 +10056,9 @@ void gc_heap::update_ro_segment (heap_segment* seg, uint8_t* allocated, uint8_t*
 {
     enter_spin_lock (&gc_heap::gc_lock);
 
+#ifdef FEATURE_EVENT_TRACE
     assert (use_frozen_segments_p);
+#endif // FEATURE_EVENT_TRACE
     assert (heap_segment_read_only_p (seg));
     assert (allocated <= committed);
     assert (committed <= heap_segment_reserved (seg));

src/coreclr/inc/targetosarch.h

@@ -46,7 +46,11 @@ class TargetOS
 class TargetArchitecture
 {
 public:
-<<<<<<< HEAD
+#ifdef TARGET_64BIT
+    static const bool Is64Bit = true;
+#else
+    static const bool Is64Bit = false;
+#endif
 #ifdef TARGET_WASM32
     static const bool IsWasm32 = true;
     static const bool IsWasm64 = false;
@@ -68,16 +72,6 @@ class TargetArchitecture
     static const bool IsLoongArch64 = false;
     static const bool IsRiscv64 = false;
 #elif TARGET_ARM
-    static const bool IsWasm32 = false;
-    static const bool IsWasm64 = false;
-=======
-#ifdef TARGET_64BIT
-    static const bool Is64Bit = true;
-#else
-    static const bool Is64Bit = false;
-#endif
-#ifdef TARGET_ARM
->>>>>>> runtime/main
     static const bool IsX86 = false;
     static const bool IsX64 = false;
     static const bool IsArm64 = false;

src/coreclr/jit/CMakeLists.txt

@@ -713,8 +713,7 @@ if (CLR_CMAKE_BUILD_LLVM_JIT)
     list(FILTER JIT_SOURCES EXCLUDE REGEX regalloc\.cpp)
 
     # We'll be linking against LLVM built without /guard:ehcont, so disable it.
-    string(REPLACE "/guard:ehcont" "" CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS})
-    string(REPLACE "/guard:ehcont" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+    set_property(GLOBAL PROPERTY CLR_EH_CONTINUATION OFF)
 
     create_standalone_jit(TARGET clrjit_browser_wasm32_${ARCH_HOST_NAME} OS browser ARCH wasm32 DESTINATIONS .)
     install_clr(TARGETS clrjit_browser_wasm32_${ARCH_HOST_NAME} DESTINATIONS . COMPONENT wasmjit)

src/coreclr/jit/llvm.cpp

@@ -557,6 +557,7 @@ bool Llvm::helperCallMayPhysicallyThrow(CorInfoHelpFunc helperFunc) const
 
         // Not used in NativeAOT.
         { FUNC(CORINFO_HELP_THROW_AMBIGUOUS_RESOLUTION_EXCEPTION) },
+        { FUNC(CORINFO_HELP_THROW_ENTRYPOINT_NOT_FOUND_EXCEPTION) },
 
         // [R]PI helpers, implemented in "Runtime\thread.cpp".
         { FUNC(CORINFO_HELP_JIT_PINVOKE_BEGIN) CORINFO_TYPE_VOID, { CORINFO_TYPE_PTR }, HFIF_NO_RPI_OR_GC },
@@ -666,8 +667,6 @@ CorInfoType Llvm::getLlvmReturnType(CorInfoType sigRetType, CORINFO_CLASS_HANDLE
 {
     switch (type)
     {
-        case TYP_BOOL:
-            return CORINFO_TYPE_BOOL;
         case TYP_BYREF:
             return CORINFO_TYPE_BYREF;
         case TYP_BYTE:

src/coreclr/jit/llvmcodegen.cpp

@@ -1516,7 +1516,6 @@ void Llvm::buildCast(GenTreeCast* cast)
                     lowerBound = -129.0;
                     upperBound = 128.0;
                     break;
-                case TYP_BOOL:
                 case TYP_UBYTE:
                     lowerBound = -1.0;
                     upperBound = 256.0;
@@ -1614,7 +1613,6 @@ void Llvm::buildCast(GenTreeCast* cast)
         case TYP_LONG:
             switch (castToType)
             {
-                case TYP_BOOL:
                 case TYP_BYTE:
                 case TYP_UBYTE:
                 case TYP_SHORT:
@@ -1661,7 +1659,6 @@ void Llvm::buildCast(GenTreeCast* cast)
                     castValue = _builder.CreateFPToSI(castFromValue, castToLlvmType);
                     break;
 
-                case TYP_BOOL:
                 case TYP_UBYTE:
                 case TYP_USHORT:
                 case TYP_UINT:

src/coreclr/jit/llvmtypes.cpp

@@ -169,7 +169,6 @@ Type* Llvm::getLlvmTypeForVarType(var_types type)
     {
         case TYP_VOID:
             return Type::getVoidTy(m_context->Context);
-        case TYP_BOOL:
         case TYP_BYTE:
         case TYP_UBYTE:
             return Type::getInt8Ty(m_context->Context);

src/coreclr/jit/morph.cpp

@@ -295,9 +295,7 @@ GenTree* Compiler::fgMorphExpandCast(GenTreeCast* tree)
     var_types dstType = tree->CastToType();
     unsigned  dstSize = genTypeSize(dstType);
 
-<<<<<<< HEAD
 #if !defined(TARGET_WASM) // LLVM codegen supports all casts directly.
-=======
 #if defined(TARGET_AMD64)
     // If AVX512 is present, we have intrinsic available to convert
     // ulong directly to float. Hence, we need to combine the 2 nodes
@@ -329,7 +327,6 @@ GenTree* Compiler::fgMorphExpandCast(GenTreeCast* tree)
         }
     }
 #endif // TARGET_AMD64
->>>>>>> runtime/main
 
     // See if the cast has to be done in two steps.  R -> I
     if (varTypeIsFloating(srcType) && varTypeIsIntegral(dstType))

src/coreclr/nativeaot/Bootstrap/main.cpp

@@ -269,16 +269,3 @@ int main(int argc, char* argv[])
 #endif // HAS_ADDRESS_SANITIZER
 
 #endif // !NATIVEAOT_DLL
-<<<<<<< HEAD
-=======
-
-#ifdef NATIVEAOT_DLL
-static struct InitializeRuntimePointerHelper
-{
-    InitializeRuntimePointerHelper()
-    {
-        RhSetRuntimeInitializationCallback(&InitializeRuntime);
-    }
-} initializeRuntimePointerHelper;
-#endif // NATIVEAOT_DLL
->>>>>>> runtime/main

src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets

@@ -357,23 +357,6 @@ The .NET Foundation licenses this file to you under the MIT license.
       <Copy SourceFiles="@(NativeObjects)" DestinationFolder="$(NativeOutputPath)" />
   </Target>
 
-<<<<<<< HEAD
-  <PropertyGroup>
-    <_Win32ResFile>$(NativeIntermediateOutputPath)$(TargetName).res</_Win32ResFile>
-  </PropertyGroup>
-
-  <UsingTask TaskName="DumpNativeResources" AssemblyFile="$(IlcBuildTasksPath)" />
-  <Target Name="GenerateResFile"
-      Inputs="$(IntermediateOutputPath)$(TargetName)$(TargetExt)"
-      Outputs="$(_Win32ResFile)"
-      Condition="'$(_targetOS)' == 'win'">
-
-    <DumpNativeResources
-        MainAssembly="$(IntermediateOutputPath)$(TargetName)$(TargetExt)"
-        ResourceFile="$(_Win32ResFile)" />
-
-  </Target>
-
   <Target Name="InitializeTheListOfLlvmObjects"
       AfterTargets="IlcCompile"
       BeforeTargets="CompileWasmObjects;LinkNativeLlvm">
@@ -399,7 +382,7 @@ The .NET Foundation licenses this file to you under the MIT license.
   <Target Name="CompileWasmObjects"
       Inputs="@(LlvmObjects)"
       Outputs="@(LlvmObjects->'%(NativeObject)')"
-      DependsOnTargets="IlcCompile;GenerateResFile;CheckWasmSdks"
+      DependsOnTargets="IlcCompile;CheckWasmSdks"
       Condition="'$(NativeCodeGen)' == 'llvm'">
 
     <MakeDir Directories="$([System.IO.Path]::GetDirectoryName($(NativeBinary)))" />
@@ -442,9 +425,6 @@ The .NET Foundation licenses this file to you under the MIT license.
   </Target>
 
   <Target Name="LinkNativeSingle" Condition="'$(_targetOS)' != 'browser' and '$(_targetOS)' != 'wasi'"
-=======
-  <Target Name="LinkNative"
->>>>>>> runtime/main
       Inputs="$(NativeObject);@(NativeLibrary)"
       Outputs="$(NativeBinary)"
       DependsOnTargets="$(LinkNativeDependsOn)">
@@ -513,15 +493,15 @@ The .NET Foundation licenses this file to you under the MIT license.
   <Target Name="LinkNativeLlvm"
       Inputs="@(NativeObjects);@(NativeLibrary)"
       Outputs="$(NativeBinary)"
-      DependsOnTargets="$(LinkNativeDependsOn);GenerateResFile">
+      DependsOnTargets="$(LinkNativeDependsOn)">
 
     <MakeDir Directories="$([System.IO.Path]::GetDirectoryName($(NativeBinary)))" />
 
     <ItemGroup>
       <NativeLibrary Include="$(IlcFrameworkNativePath)libSystem.Native.a" />
       <NativeLibrary Include="$(IlcFrameworkNativePath)libSystem.Globalization.Native.a" />
-      <NativeLibrary Condition="$(NativeLib) == '' and '$(CustomNativeMain)' != 'true'" Include="$(IlcSdkPath)libbootstrapper.a" />
-      <NativeLibrary Condition="$(NativeLib) != '' or '$(CustomNativeMain)' == 'true'" Include="$(IlcSdkPath)libbootstrapperdll.a" />
+      <NativeLibrary Condition="$(NativeLib) == '' and '$(CustomNativeMain)' != 'true'" Include="$(IlcSdkPath)libbootstrapper.o" />
+      <NativeLibrary Condition="$(NativeLib) != '' or '$(CustomNativeMain)' == 'true'" Include="$(IlcSdkPath)libbootstrapperdll.o" />
       <NativeLibrary Include="$(IlcSdkPath)libPortableRuntime.a" />
       <NativeLibrary Condition="'$(IlcLlvmExceptionHandlingModel)' == 'cpp'" Include="$(IlcSdkPath)libCppExceptionHandling.a" />
       <NativeLibrary Condition="'$(IlcLlvmExceptionHandlingModel)' == 'wasm'" Include="$(IlcSdkPath)libWasmExceptionHandling.a" />

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

@@ -80,7 +80,7 @@ private static void DispatchException(object exception, RhEHFrameType flags)
                     }
                     else
                     {
-                        if (ShouldTypedClauseCatchThisException(exception, clause.ClauseType))
+                        if (ShouldTypedClauseCatchThisException(exception, clause.ClauseType, false /* tryUnwrapException, not used for NATIVEAOT */))
                         {
                             goto FoundHandler;
                         }

src/coreclr/nativeaot/Runtime/CommonMacros.h

@@ -160,12 +160,9 @@ inline bool IS_ALIGNED(T* val, uintptr_t alignment);
 #elif defined(HOST_WASM)
 
 #define DATA_ALIGNMENT  4
-<<<<<<< HEAD
 #ifndef OS_PAGE_SIZE
 #define OS_PAGE_SIZE    0x1000
 #endif
-=======
->>>>>>> runtime/main
 
 #else
 #error Unsupported target architecture

src/coreclr/nativeaot/Runtime/gcrhenv.cpp

@@ -749,10 +749,12 @@ void GCToEEInterface::DiagGCEnd(size_t index, int gen, int reason, bool fConcurr
     UNREFERENCED_PARAMETER(gen);
     UNREFERENCED_PARAMETER(reason);
 
+#ifdef FEATURE_EVENT_TRACE
     if (!fConcurrent)
     {
         ETW::GCLog::WalkHeap();
     }
+#endif // FEATURE_EVENT_TRACE
 }
 
 // Note on last parameter: when calling this for bgc, only ETW

src/coreclr/nativeaot/Runtime/portable.cpp

@@ -74,17 +74,7 @@ COOP_PINVOKE_HELPER(Object *, RhpNewFast, (MethodTable* pEEType))
         return pObject;
     }
 
-<<<<<<< HEAD
-    pObject = (Object *)RhpGcAlloc(pEEType, 0, 0, NULL);
-    if (pObject == nullptr)
-    {
-        ASSERT_UNCONDITIONALLY("NYI");  // TODO: Throw OOM
-    }
-
-    return pObject;
-=======
     return AllocateObject(pEEType, 0, 0);
->>>>>>> runtime/main
 }
 
 #define GC_ALLOC_FINALIZE    0x1 // TODO: Defined in gc.h
@@ -94,18 +84,7 @@ COOP_PINVOKE_HELPER(Object *, RhpNewFast, (MethodTable* pEEType))
 COOP_PINVOKE_HELPER(Object *, RhpNewFinalizable, (MethodTable* pEEType))
 {
     ASSERT(pEEType->HasFinalizer());
-<<<<<<< HEAD
-
-    Object * pObject = (Object *)RhpGcAlloc(pEEType, GC_ALLOC_FINALIZE, 0, NULL);
-    if (pObject == nullptr)
-    {
-        ASSERT_UNCONDITIONALLY("NYI");  // TODO: Throw OOM
-    }
-
-    return pObject;
-=======
     return AllocateObject(pEEType, GC_ALLOC_FINALIZE, 0);
->>>>>>> runtime/main
 }
 
 COOP_PINVOKE_HELPER(Array *, RhpNewArray, (MethodTable * pArrayEEType, int numElements))
@@ -142,17 +121,7 @@ COOP_PINVOKE_HELPER(Array *, RhpNewArray, (MethodTable * pArrayEEType, int numEl
         return pObject;
     }
 
-<<<<<<< HEAD
-    pObject = (Array *)RhpGcAlloc(pArrayEEType, 0, numElements, NULL);
-    if (pObject == nullptr)
-    {
-        ASSERT_UNCONDITIONALLY("NYI");  // TODO: Throw OOM
-    }
-
-    return pObject;
-=======
     return (Array*)AllocateObject(pArrayEEType, 0, numElements);
->>>>>>> runtime/main
 }
 
 COOP_PINVOKE_HELPER(String *, RhNewString, (MethodTable * pArrayEEType, int numElements))
@@ -167,16 +136,7 @@ GPTR_DECL(MethodTable, g_pFreeObjectEEType);
 
 COOP_PINVOKE_HELPER(Object *, RhpNewFinalizableAlign8, (MethodTable* pEEType))
 {
-<<<<<<< HEAD
-    Object* pObject = (Object*)RhpGcAlloc(pEEType, GC_ALLOC_FINALIZE | GC_ALLOC_ALIGN8, 0, NULL);
-    if (pObject == nullptr)
-    {
-        ASSERT_UNCONDITIONALLY("NYI");  // TODO: Throw OOM
-    }
-    return pObject;
-=======
     return AllocateObject(pEEType, GC_ALLOC_FINALIZE | GC_ALLOC_ALIGN8, 0);
->>>>>>> runtime/main
 }
 
 #ifndef HOST_64BIT
@@ -213,17 +173,7 @@ COOP_PINVOKE_HELPER(Object*, RhpNewFastAlign8, (MethodTable* pEEType))
         return pObject;
     }
 
-<<<<<<< HEAD
-    pObject = (Object*)RhpGcAlloc(pEEType, GC_ALLOC_ALIGN8, 0, NULL);
-    if (pObject == nullptr)
-    {
-        ASSERT_UNCONDITIONALLY("NYI");  // TODO: Throw OOM
-    }
-
-    return pObject;
-=======
     return AllocateObject(pEEType, GC_ALLOC_ALIGN8, 0);
->>>>>>> runtime/main
 }
 
 COOP_PINVOKE_HELPER(Object*, RhpNewFastMisalign, (MethodTable* pEEType))
@@ -256,17 +206,7 @@ COOP_PINVOKE_HELPER(Object*, RhpNewFastMisalign, (MethodTable* pEEType))
         return pObject;
     }
 
-<<<<<<< HEAD
-    pObject = (Object*)RhpGcAlloc(pEEType, GC_ALLOC_ALIGN8 | GC_ALLOC_ALIGN8_BIAS, 0, NULL);
-    if (pObject == nullptr)
-    {
-        ASSERT_UNCONDITIONALLY("NYI");  // TODO: Throw OOM
-    }
-
-    return pObject;
-=======
     return AllocateObject(pEEType, GC_ALLOC_ALIGN8 | GC_ALLOC_ALIGN8_BIAS, 0);
->>>>>>> runtime/main
 }
 
 COOP_PINVOKE_HELPER(Array*, RhpNewArrayAlign8, (MethodTable* pArrayEEType, int numElements))
@@ -315,17 +255,7 @@ COOP_PINVOKE_HELPER(Array*, RhpNewArrayAlign8, (MethodTable* pArrayEEType, int n
         return pObject;
     }
 
-<<<<<<< HEAD
-    pObject = (Array*)RhpGcAlloc(pArrayEEType, GC_ALLOC_ALIGN8, numElements, NULL);
-    if (pObject == nullptr)
-    {
-        ASSERT_UNCONDITIONALLY("NYI");  // TODO: Throw OOM
-    }
-
-    return pObject;
-=======
     return (Array*)AllocateObject(pArrayEEType, GC_ALLOC_ALIGN8, numElements);
->>>>>>> runtime/main
 }
 #endif // !HOST_64BIT
 #endif // FEATURE_64BIT_ALIGNMENT

src/coreclr/runtime.proj

@@ -96,8 +96,5 @@
           IgnoreStandardErrorWarningFormat="true" />
   </Target>
 
-<<<<<<< HEAD
-=======
   <Import Project="$(RepositoryEngineeringDir)nativeSanitizers.targets" />
->>>>>>> runtime/main
 </Project>