[NativeAOT-LLVM] Merge oct 01

docs/workflow/building/coreclr/nativeaot.md

@@ -63,8 +63,8 @@ It is also possible to publish an ordinary console project for Wasm using packag
 and the following two references to the project file itself:
 ```xml
 <ItemGroup>
-  <PackageReference Include="Microsoft.DotNet.ILCompiler.LLVM" Version="9.0.0-dev" />
-  <PackageReference Include="runtime.$(NETCoreSdkPortableRuntimeIdentifier).Microsoft.DotNet.ILCompiler.LLVM" Version="9.0.0-dev" />
+  <PackageReference Include="Microsoft.DotNet.ILCompiler.LLVM" Version="10.0.0-dev" />
+  <PackageReference Include="runtime.$(NETCoreSdkPortableRuntimeIdentifier).Microsoft.DotNet.ILCompiler.LLVM" Version="10.0.0-dev" />
 </ItemGroup>
 ```
 You should now be able to publish the project for Wasm: `dotnet publish -r browser-wasm /p:MSBuildEnableWorkloadResolver=false`. This produces `YourApp.html` and `YourApp.js` files under `bin\<Config>\<TFM>\browser-wasm\native`. The former can be opened in the browser, the latter - run via NodeJS.

src/coreclr/jit/compiler.h

@@ -6891,15 +6891,11 @@ class Compiler
 
 
 public:
-<<<<<<< HEAD
 #if defined(TARGET_WASM) // Accessed in llvmcodegen.cpp
     static unsigned acdHelper(SpecialCodeKind codeKind);
 #endif
 
-    AddCodeDsc* fgFindExcptnTarget(SpecialCodeKind kind, unsigned refData);
-=======
     AddCodeDsc* fgFindExcptnTarget(SpecialCodeKind kind, BasicBlock* fromBlock);
->>>>>>> 3ca4ec8011f153bb8aa7508ea323a9acfe6e8283
 
     bool fgUseThrowHelperBlocks();
 

src/coreclr/jit/llvmcodegen.cpp

@@ -2496,7 +2496,8 @@ void Llvm::emitJumpToThrowHelper(Value* jumpCondValue, CorInfoHelpFunc helperFun
 
         // For code with throw helper blocks, create and use the shared helper block for raising the exception.
         llvm::BasicBlock* throwLlvmBlock;
-        ThrowHelperKey throwBlockKey{_compiler->bbThrowIndex(CurrentBlock()), helperFunc};
+        Compiler::AcdKeyDesignator dsg = Compiler::AcdKeyDesignator::KD_NONE;
+        ThrowHelperKey throwBlockKey{_compiler->bbThrowIndex(CurrentBlock(), &dsg), helperFunc};
         if (!m_throwHelperBlocksMap.Lookup(throwBlockKey, &throwLlvmBlock))
         {
             LlvmBlockRange* currentLlvmBlocks = getCurrentLlvmBlocks();

src/coreclr/nativeaot/Runtime/unix/PalRedhawkUnix.cpp

@@ -738,7 +738,9 @@ REDHAWK_PALIMPORT bool REDHAWK_PALAPI PalSetCurrentThreadName(const char* name)
 #ifdef __APPLE__
     pthread_setname_np(name_copy);
 #else
+#if !HOST_WASM
     pthread_setname_np(pthread_self(), name_copy);
+#endif // !HOST_WASM
 #endif //__APPLE__
     return true;
 }

src/tests/nativeaot/SmokeTests/HelloWasm/HelloWasm.cs

@@ -1970,9 +1970,9 @@ private static void TestMetaData()
 
         var genericType = typeof(List<object>);
         StartTest("type of generic");
-        if (genericType.FullName.Substring(0, genericType.FullName.LastIndexOf(",")) != "System.Collections.Generic.List`1[[System.Object, System.Private.CoreLib, Version=9.0.0.0, Culture=neutral")
+        if (genericType.FullName.Substring(0, genericType.FullName.LastIndexOf(",")) != "System.Collections.Generic.List`1[[System.Object, System.Private.CoreLib, Version=10.0.0.0, Culture=neutral")
         {
-            FailTest("expected System.Collections.Generic.List`1[[System.Object, System.Private.CoreLib, Version=9.0.0.0, Culture=neutral  but was " + genericType.FullName);
+            FailTest("expected System.Collections.Generic.List`1[[System.Object, System.Private.CoreLib, Version=10.0.0.0, Culture=neutral  but was " + genericType.FullName);
         }
         else
         {

src/tests/nativeaot/SmokeTests/UnitTests/Interfaces.cs

@@ -44,7 +44,9 @@ public static int Run()
         TestGenericAnalysis.Run();
         TestRuntime108229Regression.Run();
         TestCovariantReturns.Run();
+#if !CODEGEN_WASM
         TestDynamicInterfaceCastable.Run();
+#endif
         TestStaticInterfaceMethodsAnalysis.Run();
         TestStaticInterfaceMethods.Run();
         TestSimpleStaticDefaultInterfaceMethods.Run();
@@ -955,6 +957,7 @@ public static void Run()
                     throw new Exception();
             }
 
+#if !CODEGEN_WASM
             {
                 IInterface o = (IInterface)new CastableClass<IInterface, IInterfaceCastableImpl<Atom>>();
                 if (o.GetCookie() != "Atom")
@@ -966,6 +969,7 @@ public static void Run()
                 if (o.GetCookie() != "Atom")
                     throw new Exception();
             }
+#endif
         }
     }
 

src/tests/nativeaot/SmokeTests/UnitTests/Main.cs

@@ -14,9 +14,8 @@
 success &= RunTest(Interfaces.Run);
 #if !CODEGEN_WASM
 success &= RunTest(Threading.Run);
-#endif
+// Devirtualization uses `IDynamicCastableGetInterfaceImplementation` and `RhGetCommonStubAddress`
 success &= RunTest(Devirtualization.Run);
-#if !CODEGEN_WASM
 success &= RunTest(StackTraces.Run);
 #endif