From 2cf9f2a03cfacd00ee22c461c6cd89a8b1123cf3 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Mon, 17 Jun 2024 17:59:05 +0200 Subject: [PATCH 01/16] Bump LLVM to 19.x branch --- NuGet.config | 1 + eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 44 ++++++++++----------- 3 files changed, 67 insertions(+), 66 deletions(-) diff --git a/NuGet.config b/NuGet.config index c9f91b5327322..a2f361ba992c5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,6 +20,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fc62b7ee3024f..38c2881f93628 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,37 +16,37 @@ https://github.com/dotnet/emsdk f4198024fa141eb95217fa03652db48757ffc1ce - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 https://github.com/dotnet/command-line-api @@ -226,61 +226,61 @@ https://github.com/dotnet/runtime-assets 40711d8fe9f9971dada6d9f8388f19978bb14223 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index ab07dd990a528..a86bfb0d9eb12 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -219,20 +219,20 @@ 2.3.5 9.0.0-alpha.1.24167.3 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 3.1.7 1.0.406601 From efca5a258216a1ef0fceb61c2496bf81487eb2b0 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Thu, 27 Jun 2024 17:00:34 +0200 Subject: [PATCH 02/16] Update llvm deps --- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 44 ++++++++++----------- 2 files changed, 66 insertions(+), 66 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 38c2881f93628..fc62b7ee3024f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,37 +16,37 @@ https://github.com/dotnet/emsdk f4198024fa141eb95217fa03652db48757ffc1ce - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 https://github.com/dotnet/command-line-api @@ -226,61 +226,61 @@ https://github.com/dotnet/runtime-assets 40711d8fe9f9971dada6d9f8388f19978bb14223 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index a86bfb0d9eb12..ab07dd990a528 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -219,20 +219,20 @@ 2.3.5 9.0.0-alpha.1.24167.3 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 + 16.0.5-alpha.1.24204.1 + 16.0.5-alpha.1.24204.1 + 16.0.5-alpha.1.24204.1 + 16.0.5-alpha.1.24204.1 + 16.0.5-alpha.1.24204.1 + 16.0.5-alpha.1.24204.1 + 16.0.5-alpha.1.24204.1 + 16.0.5-alpha.1.24204.1 + 16.0.5-alpha.1.24204.1 + 16.0.5-alpha.1.24204.1 + 16.0.5-alpha.1.24204.1 + 16.0.5-alpha.1.24204.1 + 16.0.5-alpha.1.24204.1 + 16.0.5-alpha.1.24204.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 + 16.0.5-alpha.1.24204.1 + 16.0.5-alpha.1.24204.1 + 16.0.5-alpha.1.24204.1 + 16.0.5-alpha.1.24204.1 + 16.0.5-alpha.1.24204.1 + 16.0.5-alpha.1.24204.1 + 16.0.5-alpha.1.24204.1 + 16.0.5-alpha.1.24204.1 3.1.7 1.0.406601 From bffa322984373bcbb2f8ff77ef8773a547baeab8 Mon Sep 17 00:00:00 2001 From: Aleksey Kliger Date: Wed, 19 Jun 2024 11:17:57 -0400 Subject: [PATCH 03/16] [llvm] update header for llvm::sys:::getHostCPUFeatures --- src/mono/mono/mini/mini-llvm-cpp.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/mono/mono/mini/mini-llvm-cpp.cpp b/src/mono/mono/mini/mini-llvm-cpp.cpp index beb9a8b8a09a5..e15619703e511 100644 --- a/src/mono/mono/mini/mini-llvm-cpp.cpp +++ b/src/mono/mono/mini/mini-llvm-cpp.cpp @@ -56,7 +56,11 @@ #include #include // CallBase +#if LLVM_API_VERSION < 1900 #include // llvm::sys::getHostCPUFeatures +#else +#include // llvm::sys::getHostCPUFeatures +#endif #include // Intrinsic::ID #include #include From 0665f1f2f516fc5e80072c2ef9ccd146be258668 Mon Sep 17 00:00:00 2001 From: Aleksey Kliger Date: Wed, 19 Jun 2024 11:18:33 -0400 Subject: [PATCH 04/16] [llvm] NO MERGE - Disable old pass manager on LLVM 19 They dont' have a C API for it anymore. We should use the new PassBuilder API instead. But temporarily just disable optimizations entirely --- src/mono/mono/mini/mini-llvm.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/mono/mono/mini/mini-llvm.c b/src/mono/mono/mini/mini-llvm.c index 650a5a775e670..2b5c8eec9a7c1 100644 --- a/src/mono/mono/mini/mini-llvm.c +++ b/src/mono/mono/mini/mini-llvm.c @@ -33,9 +33,17 @@ #include "llvm-c/Core.h" #include "llvm-c/BitWriter.h" #include "llvm-c/Analysis.h" +#if LLVM_API_VERSION < 1900 #include "llvm-c/Transforms/InstCombine.h" #include "llvm-c/Transforms/Scalar.h" #include "llvm-c/Transforms/IPO.h" +#else +#ifdef _MSC_VER +#pragma message("llvm 19 doesn't have the old pass manager") +#else +#warning "llvm 19 doesn't have the old pass manager" +#endif +#endif #include "mini-llvm-cpp.h" #include "llvm-jit.h" @@ -14098,11 +14106,13 @@ mono_llvm_create_aot_module (MonoAssembly *assembly, const char *global_prefix, mono_llvm_set_is_constant (module->sentinel_exception); } +#if LLVM_API_VERSION < 1900 module->func_pass_manager = LLVMCreateFunctionPassManagerForModule (module->lmodule); if (module->func_pass_manager) { LLVMAddCFGSimplificationPass (module->func_pass_manager); LLVMAddInstructionCombiningPass (module->func_pass_manager); } +#endif } void From 36604ea3fe330f8a5455b213359e77e5bfea333e Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Wed, 10 Jul 2024 10:43:02 +0200 Subject: [PATCH 05/16] Revert "Update llvm deps" This reverts commit efca5a258216a1ef0fceb61c2496bf81487eb2b0. --- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 44 ++++++++++----------- 2 files changed, 66 insertions(+), 66 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fc62b7ee3024f..38c2881f93628 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,37 +16,37 @@ https://github.com/dotnet/emsdk f4198024fa141eb95217fa03652db48757ffc1ce - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 https://github.com/dotnet/command-line-api @@ -226,61 +226,61 @@ https://github.com/dotnet/runtime-assets 40711d8fe9f9971dada6d9f8388f19978bb14223 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index ab07dd990a528..a86bfb0d9eb12 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -219,20 +219,20 @@ 2.3.5 9.0.0-alpha.1.24167.3 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 3.1.7 1.0.406601 From b99444ed13f838fcf1026efb5dfa5c61ef319c7d Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Wed, 10 Jul 2024 10:45:08 +0200 Subject: [PATCH 06/16] Update llvm deps Remove coherency between llvm and emscripten to be able to update llvm 19.x packages with darc --- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 44 ++++++++++----------- 2 files changed, 66 insertions(+), 66 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 38c2881f93628..cc2d75e747e77 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,37 +16,37 @@ https://github.com/dotnet/emsdk f4198024fa141eb95217fa03652db48757ffc1ce - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + e5c221b85dd192c33b60035c1540ed40324e271d - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + e5c221b85dd192c33b60035c1540ed40324e271d - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + e5c221b85dd192c33b60035c1540ed40324e271d - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + e5c221b85dd192c33b60035c1540ed40324e271d - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + e5c221b85dd192c33b60035c1540ed40324e271d - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + e5c221b85dd192c33b60035c1540ed40324e271d - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + e5c221b85dd192c33b60035c1540ed40324e271d - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + e5c221b85dd192c33b60035c1540ed40324e271d https://github.com/dotnet/command-line-api @@ -226,61 +226,61 @@ https://github.com/dotnet/runtime-assets 40711d8fe9f9971dada6d9f8388f19978bb14223 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + e5c221b85dd192c33b60035c1540ed40324e271d - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + e5c221b85dd192c33b60035c1540ed40324e271d - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + e5c221b85dd192c33b60035c1540ed40324e271d - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + e5c221b85dd192c33b60035c1540ed40324e271d - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + e5c221b85dd192c33b60035c1540ed40324e271d - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + e5c221b85dd192c33b60035c1540ed40324e271d - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + e5c221b85dd192c33b60035c1540ed40324e271d - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + e5c221b85dd192c33b60035c1540ed40324e271d - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + e5c221b85dd192c33b60035c1540ed40324e271d - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + e5c221b85dd192c33b60035c1540ed40324e271d - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + e5c221b85dd192c33b60035c1540ed40324e271d - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + e5c221b85dd192c33b60035c1540ed40324e271d - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + e5c221b85dd192c33b60035c1540ed40324e271d - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + e5c221b85dd192c33b60035c1540ed40324e271d https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index a86bfb0d9eb12..8fb2a3dc09244 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -219,20 +219,20 @@ 2.3.5 9.0.0-alpha.1.24167.3 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24359.1 + 19.0.0-alpha.1.24359.1 + 19.0.0-alpha.1.24359.1 + 19.0.0-alpha.1.24359.1 + 19.0.0-alpha.1.24359.1 + 19.0.0-alpha.1.24359.1 + 19.0.0-alpha.1.24359.1 + 19.0.0-alpha.1.24359.1 + 19.0.0-alpha.1.24359.1 + 19.0.0-alpha.1.24359.1 + 19.0.0-alpha.1.24359.1 + 19.0.0-alpha.1.24359.1 + 19.0.0-alpha.1.24359.1 + 19.0.0-alpha.1.24359.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24359.1 + 19.0.0-alpha.1.24359.1 + 19.0.0-alpha.1.24359.1 + 19.0.0-alpha.1.24359.1 + 19.0.0-alpha.1.24359.1 + 19.0.0-alpha.1.24359.1 + 19.0.0-alpha.1.24359.1 + 19.0.0-alpha.1.24359.1 3.1.7 1.0.406601 From b95766a1de9305ed38e193d87a6aa8f6f3a07bb1 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Mon, 15 Jul 2024 21:49:13 +0200 Subject: [PATCH 07/16] Remove the warning to let the CI build progress, add comment --- src/mono/mono/mini/mini-llvm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mono/mono/mini/mini-llvm.c b/src/mono/mono/mini/mini-llvm.c index dc484b4a6d0ab..918ea4c8c57cc 100644 --- a/src/mono/mono/mini/mini-llvm.c +++ b/src/mono/mono/mini/mini-llvm.c @@ -38,10 +38,11 @@ #include "llvm-c/Transforms/Scalar.h" #include "llvm-c/Transforms/IPO.h" #else +// llvm 19 doesn't have the old pass manager +// it is only used in the LLVM/JIT +// we don't support that anymore. it will need to be rewritten to use the new pass manager if we want to support it again #ifdef _MSC_VER #pragma message("llvm 19 doesn't have the old pass manager") -#else -#warning "llvm 19 doesn't have the old pass manager" #endif #endif From def58eda27e9008e4d7a864cf1e330224be45e9a Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Tue, 16 Jul 2024 17:20:32 +0200 Subject: [PATCH 08/16] Update llvm deps --- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 44 ++++++++++----------- 2 files changed, 66 insertions(+), 66 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9b0765febc562..4a03fbc953127 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,37 +16,37 @@ https://github.com/dotnet/emsdk d3583522209829d1ed0440662ba136c7b7700b16 - + https://github.com/dotnet/llvm-project - e5c221b85dd192c33b60035c1540ed40324e271d + ed3ebba88931f9017a13c4ffc95775e49225f06a - + https://github.com/dotnet/llvm-project - e5c221b85dd192c33b60035c1540ed40324e271d + ed3ebba88931f9017a13c4ffc95775e49225f06a - + https://github.com/dotnet/llvm-project - e5c221b85dd192c33b60035c1540ed40324e271d + ed3ebba88931f9017a13c4ffc95775e49225f06a - + https://github.com/dotnet/llvm-project - e5c221b85dd192c33b60035c1540ed40324e271d + ed3ebba88931f9017a13c4ffc95775e49225f06a - + https://github.com/dotnet/llvm-project - e5c221b85dd192c33b60035c1540ed40324e271d + ed3ebba88931f9017a13c4ffc95775e49225f06a - + https://github.com/dotnet/llvm-project - e5c221b85dd192c33b60035c1540ed40324e271d + ed3ebba88931f9017a13c4ffc95775e49225f06a - + https://github.com/dotnet/llvm-project - e5c221b85dd192c33b60035c1540ed40324e271d + ed3ebba88931f9017a13c4ffc95775e49225f06a - + https://github.com/dotnet/llvm-project - e5c221b85dd192c33b60035c1540ed40324e271d + ed3ebba88931f9017a13c4ffc95775e49225f06a https://github.com/dotnet/command-line-api @@ -226,61 +226,61 @@ https://github.com/dotnet/runtime-assets 0cab6ca16f49b666163d4e1c0e3c080faf5a4e05 - + https://github.com/dotnet/llvm-project - e5c221b85dd192c33b60035c1540ed40324e271d + ed3ebba88931f9017a13c4ffc95775e49225f06a - + https://github.com/dotnet/llvm-project - e5c221b85dd192c33b60035c1540ed40324e271d + ed3ebba88931f9017a13c4ffc95775e49225f06a - + https://github.com/dotnet/llvm-project - e5c221b85dd192c33b60035c1540ed40324e271d + ed3ebba88931f9017a13c4ffc95775e49225f06a - + https://github.com/dotnet/llvm-project - e5c221b85dd192c33b60035c1540ed40324e271d + ed3ebba88931f9017a13c4ffc95775e49225f06a - + https://github.com/dotnet/llvm-project - e5c221b85dd192c33b60035c1540ed40324e271d + ed3ebba88931f9017a13c4ffc95775e49225f06a - + https://github.com/dotnet/llvm-project - e5c221b85dd192c33b60035c1540ed40324e271d + ed3ebba88931f9017a13c4ffc95775e49225f06a - + https://github.com/dotnet/llvm-project - e5c221b85dd192c33b60035c1540ed40324e271d + ed3ebba88931f9017a13c4ffc95775e49225f06a - + https://github.com/dotnet/llvm-project - e5c221b85dd192c33b60035c1540ed40324e271d + ed3ebba88931f9017a13c4ffc95775e49225f06a - + https://github.com/dotnet/llvm-project - e5c221b85dd192c33b60035c1540ed40324e271d + ed3ebba88931f9017a13c4ffc95775e49225f06a - + https://github.com/dotnet/llvm-project - e5c221b85dd192c33b60035c1540ed40324e271d + ed3ebba88931f9017a13c4ffc95775e49225f06a - + https://github.com/dotnet/llvm-project - e5c221b85dd192c33b60035c1540ed40324e271d + ed3ebba88931f9017a13c4ffc95775e49225f06a - + https://github.com/dotnet/llvm-project - e5c221b85dd192c33b60035c1540ed40324e271d + ed3ebba88931f9017a13c4ffc95775e49225f06a - + https://github.com/dotnet/llvm-project - e5c221b85dd192c33b60035c1540ed40324e271d + ed3ebba88931f9017a13c4ffc95775e49225f06a - + https://github.com/dotnet/llvm-project - e5c221b85dd192c33b60035c1540ed40324e271d + ed3ebba88931f9017a13c4ffc95775e49225f06a https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index f9b74a89b8e80..2ec436f19f6a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,20 +221,20 @@ 2.3.5 9.0.0-alpha.1.24167.3 - 19.0.0-alpha.1.24359.1 - 19.0.0-alpha.1.24359.1 - 19.0.0-alpha.1.24359.1 - 19.0.0-alpha.1.24359.1 - 19.0.0-alpha.1.24359.1 - 19.0.0-alpha.1.24359.1 - 19.0.0-alpha.1.24359.1 - 19.0.0-alpha.1.24359.1 - 19.0.0-alpha.1.24359.1 - 19.0.0-alpha.1.24359.1 - 19.0.0-alpha.1.24359.1 - 19.0.0-alpha.1.24359.1 - 19.0.0-alpha.1.24359.1 - 19.0.0-alpha.1.24359.1 + 19.0.0-alpha.1.24366.1 + 19.0.0-alpha.1.24366.1 + 19.0.0-alpha.1.24366.1 + 19.0.0-alpha.1.24366.1 + 19.0.0-alpha.1.24366.1 + 19.0.0-alpha.1.24366.1 + 19.0.0-alpha.1.24366.1 + 19.0.0-alpha.1.24366.1 + 19.0.0-alpha.1.24366.1 + 19.0.0-alpha.1.24366.1 + 19.0.0-alpha.1.24366.1 + 19.0.0-alpha.1.24366.1 + 19.0.0-alpha.1.24366.1 + 19.0.0-alpha.1.24366.1 - 19.0.0-alpha.1.24359.1 - 19.0.0-alpha.1.24359.1 - 19.0.0-alpha.1.24359.1 - 19.0.0-alpha.1.24359.1 - 19.0.0-alpha.1.24359.1 - 19.0.0-alpha.1.24359.1 - 19.0.0-alpha.1.24359.1 - 19.0.0-alpha.1.24359.1 + 19.0.0-alpha.1.24366.1 + 19.0.0-alpha.1.24366.1 + 19.0.0-alpha.1.24366.1 + 19.0.0-alpha.1.24366.1 + 19.0.0-alpha.1.24366.1 + 19.0.0-alpha.1.24366.1 + 19.0.0-alpha.1.24366.1 + 19.0.0-alpha.1.24366.1 3.1.7 1.0.406601 From 9a5f0e8f2f2d0b69b3e33000272d58773ffc8a64 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Wed, 17 Jul 2024 23:30:55 +0200 Subject: [PATCH 09/16] Update to get new packages --- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 44 ++++++++++----------- 2 files changed, 66 insertions(+), 66 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7552191065bb5..6231e6686e35e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,37 +16,37 @@ https://github.com/dotnet/emsdk d3583522209829d1ed0440662ba136c7b7700b16 - + https://github.com/dotnet/llvm-project - ed3ebba88931f9017a13c4ffc95775e49225f06a + d34279805c817fe2b5265210fe7545cc45a741f4 - + https://github.com/dotnet/llvm-project - ed3ebba88931f9017a13c4ffc95775e49225f06a + d34279805c817fe2b5265210fe7545cc45a741f4 - + https://github.com/dotnet/llvm-project - ed3ebba88931f9017a13c4ffc95775e49225f06a + d34279805c817fe2b5265210fe7545cc45a741f4 - + https://github.com/dotnet/llvm-project - ed3ebba88931f9017a13c4ffc95775e49225f06a + d34279805c817fe2b5265210fe7545cc45a741f4 - + https://github.com/dotnet/llvm-project - ed3ebba88931f9017a13c4ffc95775e49225f06a + d34279805c817fe2b5265210fe7545cc45a741f4 - + https://github.com/dotnet/llvm-project - ed3ebba88931f9017a13c4ffc95775e49225f06a + d34279805c817fe2b5265210fe7545cc45a741f4 - + https://github.com/dotnet/llvm-project - ed3ebba88931f9017a13c4ffc95775e49225f06a + d34279805c817fe2b5265210fe7545cc45a741f4 - + https://github.com/dotnet/llvm-project - ed3ebba88931f9017a13c4ffc95775e49225f06a + d34279805c817fe2b5265210fe7545cc45a741f4 https://github.com/dotnet/command-line-api @@ -226,61 +226,61 @@ https://github.com/dotnet/runtime-assets 0cab6ca16f49b666163d4e1c0e3c080faf5a4e05 - + https://github.com/dotnet/llvm-project - ed3ebba88931f9017a13c4ffc95775e49225f06a + d34279805c817fe2b5265210fe7545cc45a741f4 - + https://github.com/dotnet/llvm-project - ed3ebba88931f9017a13c4ffc95775e49225f06a + d34279805c817fe2b5265210fe7545cc45a741f4 - + https://github.com/dotnet/llvm-project - ed3ebba88931f9017a13c4ffc95775e49225f06a + d34279805c817fe2b5265210fe7545cc45a741f4 - + https://github.com/dotnet/llvm-project - ed3ebba88931f9017a13c4ffc95775e49225f06a + d34279805c817fe2b5265210fe7545cc45a741f4 - + https://github.com/dotnet/llvm-project - ed3ebba88931f9017a13c4ffc95775e49225f06a + d34279805c817fe2b5265210fe7545cc45a741f4 - + https://github.com/dotnet/llvm-project - ed3ebba88931f9017a13c4ffc95775e49225f06a + d34279805c817fe2b5265210fe7545cc45a741f4 - + https://github.com/dotnet/llvm-project - ed3ebba88931f9017a13c4ffc95775e49225f06a + d34279805c817fe2b5265210fe7545cc45a741f4 - + https://github.com/dotnet/llvm-project - ed3ebba88931f9017a13c4ffc95775e49225f06a + d34279805c817fe2b5265210fe7545cc45a741f4 - + https://github.com/dotnet/llvm-project - ed3ebba88931f9017a13c4ffc95775e49225f06a + d34279805c817fe2b5265210fe7545cc45a741f4 - + https://github.com/dotnet/llvm-project - ed3ebba88931f9017a13c4ffc95775e49225f06a + d34279805c817fe2b5265210fe7545cc45a741f4 - + https://github.com/dotnet/llvm-project - ed3ebba88931f9017a13c4ffc95775e49225f06a + d34279805c817fe2b5265210fe7545cc45a741f4 - + https://github.com/dotnet/llvm-project - ed3ebba88931f9017a13c4ffc95775e49225f06a + d34279805c817fe2b5265210fe7545cc45a741f4 - + https://github.com/dotnet/llvm-project - ed3ebba88931f9017a13c4ffc95775e49225f06a + d34279805c817fe2b5265210fe7545cc45a741f4 - + https://github.com/dotnet/llvm-project - ed3ebba88931f9017a13c4ffc95775e49225f06a + d34279805c817fe2b5265210fe7545cc45a741f4 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index b0d02f2793894..6a91162b8a8ed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,20 +221,20 @@ 2.3.5 9.0.0-alpha.1.24167.3 - 19.0.0-alpha.1.24366.1 - 19.0.0-alpha.1.24366.1 - 19.0.0-alpha.1.24366.1 - 19.0.0-alpha.1.24366.1 - 19.0.0-alpha.1.24366.1 - 19.0.0-alpha.1.24366.1 - 19.0.0-alpha.1.24366.1 - 19.0.0-alpha.1.24366.1 - 19.0.0-alpha.1.24366.1 - 19.0.0-alpha.1.24366.1 - 19.0.0-alpha.1.24366.1 - 19.0.0-alpha.1.24366.1 - 19.0.0-alpha.1.24366.1 - 19.0.0-alpha.1.24366.1 + 19.0.0-alpha.1.24367.1 + 19.0.0-alpha.1.24367.1 + 19.0.0-alpha.1.24367.1 + 19.0.0-alpha.1.24367.1 + 19.0.0-alpha.1.24367.1 + 19.0.0-alpha.1.24367.1 + 19.0.0-alpha.1.24367.1 + 19.0.0-alpha.1.24367.1 + 19.0.0-alpha.1.24367.1 + 19.0.0-alpha.1.24367.1 + 19.0.0-alpha.1.24367.1 + 19.0.0-alpha.1.24367.1 + 19.0.0-alpha.1.24367.1 + 19.0.0-alpha.1.24367.1 - 19.0.0-alpha.1.24366.1 - 19.0.0-alpha.1.24366.1 - 19.0.0-alpha.1.24366.1 - 19.0.0-alpha.1.24366.1 - 19.0.0-alpha.1.24366.1 - 19.0.0-alpha.1.24366.1 - 19.0.0-alpha.1.24366.1 - 19.0.0-alpha.1.24366.1 + 19.0.0-alpha.1.24367.1 + 19.0.0-alpha.1.24367.1 + 19.0.0-alpha.1.24367.1 + 19.0.0-alpha.1.24367.1 + 19.0.0-alpha.1.24367.1 + 19.0.0-alpha.1.24367.1 + 19.0.0-alpha.1.24367.1 + 19.0.0-alpha.1.24367.1 3.1.7 1.0.406601 From 62ab049f35c2c04bc30a36cafaae5c1e3978315e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Thu, 18 Jul 2024 08:24:42 +0200 Subject: [PATCH 10/16] Update llvm packages --- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 44 ++++++++++----------- 2 files changed, 66 insertions(+), 66 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6231e6686e35e..856cba161142b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,37 +16,37 @@ https://github.com/dotnet/emsdk d3583522209829d1ed0440662ba136c7b7700b16 - + https://github.com/dotnet/llvm-project - d34279805c817fe2b5265210fe7545cc45a741f4 + d1f384c29d3ec4dbcaafd9da7f9cf1d9037ff5f4 - + https://github.com/dotnet/llvm-project - d34279805c817fe2b5265210fe7545cc45a741f4 + d1f384c29d3ec4dbcaafd9da7f9cf1d9037ff5f4 - + https://github.com/dotnet/llvm-project - d34279805c817fe2b5265210fe7545cc45a741f4 + d1f384c29d3ec4dbcaafd9da7f9cf1d9037ff5f4 - + https://github.com/dotnet/llvm-project - d34279805c817fe2b5265210fe7545cc45a741f4 + d1f384c29d3ec4dbcaafd9da7f9cf1d9037ff5f4 - + https://github.com/dotnet/llvm-project - d34279805c817fe2b5265210fe7545cc45a741f4 + d1f384c29d3ec4dbcaafd9da7f9cf1d9037ff5f4 - + https://github.com/dotnet/llvm-project - d34279805c817fe2b5265210fe7545cc45a741f4 + d1f384c29d3ec4dbcaafd9da7f9cf1d9037ff5f4 - + https://github.com/dotnet/llvm-project - d34279805c817fe2b5265210fe7545cc45a741f4 + d1f384c29d3ec4dbcaafd9da7f9cf1d9037ff5f4 - + https://github.com/dotnet/llvm-project - d34279805c817fe2b5265210fe7545cc45a741f4 + d1f384c29d3ec4dbcaafd9da7f9cf1d9037ff5f4 https://github.com/dotnet/command-line-api @@ -226,61 +226,61 @@ https://github.com/dotnet/runtime-assets 0cab6ca16f49b666163d4e1c0e3c080faf5a4e05 - + https://github.com/dotnet/llvm-project - d34279805c817fe2b5265210fe7545cc45a741f4 + d1f384c29d3ec4dbcaafd9da7f9cf1d9037ff5f4 - + https://github.com/dotnet/llvm-project - d34279805c817fe2b5265210fe7545cc45a741f4 + d1f384c29d3ec4dbcaafd9da7f9cf1d9037ff5f4 - + https://github.com/dotnet/llvm-project - d34279805c817fe2b5265210fe7545cc45a741f4 + d1f384c29d3ec4dbcaafd9da7f9cf1d9037ff5f4 - + https://github.com/dotnet/llvm-project - d34279805c817fe2b5265210fe7545cc45a741f4 + d1f384c29d3ec4dbcaafd9da7f9cf1d9037ff5f4 - + https://github.com/dotnet/llvm-project - d34279805c817fe2b5265210fe7545cc45a741f4 + d1f384c29d3ec4dbcaafd9da7f9cf1d9037ff5f4 - + https://github.com/dotnet/llvm-project - d34279805c817fe2b5265210fe7545cc45a741f4 + d1f384c29d3ec4dbcaafd9da7f9cf1d9037ff5f4 - + https://github.com/dotnet/llvm-project - d34279805c817fe2b5265210fe7545cc45a741f4 + d1f384c29d3ec4dbcaafd9da7f9cf1d9037ff5f4 - + https://github.com/dotnet/llvm-project - d34279805c817fe2b5265210fe7545cc45a741f4 + d1f384c29d3ec4dbcaafd9da7f9cf1d9037ff5f4 - + https://github.com/dotnet/llvm-project - d34279805c817fe2b5265210fe7545cc45a741f4 + d1f384c29d3ec4dbcaafd9da7f9cf1d9037ff5f4 - + https://github.com/dotnet/llvm-project - d34279805c817fe2b5265210fe7545cc45a741f4 + d1f384c29d3ec4dbcaafd9da7f9cf1d9037ff5f4 - + https://github.com/dotnet/llvm-project - d34279805c817fe2b5265210fe7545cc45a741f4 + d1f384c29d3ec4dbcaafd9da7f9cf1d9037ff5f4 - + https://github.com/dotnet/llvm-project - d34279805c817fe2b5265210fe7545cc45a741f4 + d1f384c29d3ec4dbcaafd9da7f9cf1d9037ff5f4 - + https://github.com/dotnet/llvm-project - d34279805c817fe2b5265210fe7545cc45a741f4 + d1f384c29d3ec4dbcaafd9da7f9cf1d9037ff5f4 - + https://github.com/dotnet/llvm-project - d34279805c817fe2b5265210fe7545cc45a741f4 + d1f384c29d3ec4dbcaafd9da7f9cf1d9037ff5f4 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 6a91162b8a8ed..84939bd24ea62 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,20 +221,20 @@ 2.3.5 9.0.0-alpha.1.24167.3 - 19.0.0-alpha.1.24367.1 - 19.0.0-alpha.1.24367.1 - 19.0.0-alpha.1.24367.1 - 19.0.0-alpha.1.24367.1 - 19.0.0-alpha.1.24367.1 - 19.0.0-alpha.1.24367.1 - 19.0.0-alpha.1.24367.1 - 19.0.0-alpha.1.24367.1 - 19.0.0-alpha.1.24367.1 - 19.0.0-alpha.1.24367.1 - 19.0.0-alpha.1.24367.1 - 19.0.0-alpha.1.24367.1 - 19.0.0-alpha.1.24367.1 - 19.0.0-alpha.1.24367.1 + 19.0.0-alpha.1.24367.2 + 19.0.0-alpha.1.24367.2 + 19.0.0-alpha.1.24367.2 + 19.0.0-alpha.1.24367.2 + 19.0.0-alpha.1.24367.2 + 19.0.0-alpha.1.24367.2 + 19.0.0-alpha.1.24367.2 + 19.0.0-alpha.1.24367.2 + 19.0.0-alpha.1.24367.2 + 19.0.0-alpha.1.24367.2 + 19.0.0-alpha.1.24367.2 + 19.0.0-alpha.1.24367.2 + 19.0.0-alpha.1.24367.2 + 19.0.0-alpha.1.24367.2 - 19.0.0-alpha.1.24367.1 - 19.0.0-alpha.1.24367.1 - 19.0.0-alpha.1.24367.1 - 19.0.0-alpha.1.24367.1 - 19.0.0-alpha.1.24367.1 - 19.0.0-alpha.1.24367.1 - 19.0.0-alpha.1.24367.1 - 19.0.0-alpha.1.24367.1 + 19.0.0-alpha.1.24367.2 + 19.0.0-alpha.1.24367.2 + 19.0.0-alpha.1.24367.2 + 19.0.0-alpha.1.24367.2 + 19.0.0-alpha.1.24367.2 + 19.0.0-alpha.1.24367.2 + 19.0.0-alpha.1.24367.2 + 19.0.0-alpha.1.24367.2 3.1.7 1.0.406601 From d6cb2308ddca197183aaf57cf0d914c1f5c75015 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Thu, 18 Jul 2024 10:07:22 +0200 Subject: [PATCH 11/16] Disable tests which crash during LLVM AOT compilation --- src/tests/issues.targets | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/tests/issues.targets b/src/tests/issues.targets index 1ceab90a73d64..68c1860e40b4f 100644 --- a/src/tests/issues.targets +++ b/src/tests/issues.targets @@ -1267,6 +1267,19 @@ Crashes during LLVM AOT compilation. + + Crashes during LLVM AOT compilation. + + + Crashes during LLVM AOT compilation. + + + Crashes during LLVM AOT compilation. + + + Crashes during LLVM AOT compilation. + + Doesn't pass after LLVM AOT compilation. From 0e065f7e7035501d2915a3c9599f53bcc31e5c7d Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Fri, 19 Jul 2024 11:29:25 +0200 Subject: [PATCH 12/16] Show progress of smoke AOT test on browser --- .../tests/System.Runtime.Tests/System.Runtime.Tests.csproj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/libraries/System.Runtime/tests/System.Runtime.Tests/System.Runtime.Tests.csproj b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System.Runtime.Tests.csproj index 92bc092999191..09aaeb77aa2f9 100644 --- a/src/libraries/System.Runtime/tests/System.Runtime.Tests/System.Runtime.Tests.csproj +++ b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System.Runtime.Tests.csproj @@ -17,6 +17,9 @@ false + + true + - 19.0.0-alpha.1.24367.2 - 19.0.0-alpha.1.24367.2 - 19.0.0-alpha.1.24367.2 - 19.0.0-alpha.1.24367.2 - 19.0.0-alpha.1.24367.2 - 19.0.0-alpha.1.24367.2 - 19.0.0-alpha.1.24367.2 - 19.0.0-alpha.1.24367.2 - 19.0.0-alpha.1.24367.2 - 19.0.0-alpha.1.24367.2 - 19.0.0-alpha.1.24367.2 - 19.0.0-alpha.1.24367.2 - 19.0.0-alpha.1.24367.2 - 19.0.0-alpha.1.24367.2 + 19.0.0-alpha.1.24370.2 + 19.0.0-alpha.1.24370.2 + 19.0.0-alpha.1.24370.2 + 19.0.0-alpha.1.24370.2 + 19.0.0-alpha.1.24370.2 + 19.0.0-alpha.1.24370.2 + 19.0.0-alpha.1.24370.2 + 19.0.0-alpha.1.24370.2 + 19.0.0-alpha.1.24370.2 + 19.0.0-alpha.1.24370.2 + 19.0.0-alpha.1.24370.2 + 19.0.0-alpha.1.24370.2 + 19.0.0-alpha.1.24370.2 + 19.0.0-alpha.1.24370.2 - 19.0.0-alpha.1.24367.2 - 19.0.0-alpha.1.24367.2 - 19.0.0-alpha.1.24367.2 - 19.0.0-alpha.1.24367.2 - 19.0.0-alpha.1.24367.2 - 19.0.0-alpha.1.24367.2 - 19.0.0-alpha.1.24367.2 - 19.0.0-alpha.1.24367.2 + 19.0.0-alpha.1.24370.2 + 19.0.0-alpha.1.24370.2 + 19.0.0-alpha.1.24370.2 + 19.0.0-alpha.1.24370.2 + 19.0.0-alpha.1.24370.2 + 19.0.0-alpha.1.24370.2 + 19.0.0-alpha.1.24370.2 + 19.0.0-alpha.1.24370.2 3.1.7 1.0.406601 From fd769e719c447aa72fa18ffd082390f4726c2ee4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Mon, 22 Jul 2024 16:48:33 +0200 Subject: [PATCH 14/16] [mono] Exit early to prevent endless loop when crashing We hit an issue where we got into an endless loop of crashes while trying to dump the stack trace. Move the existing code to protect against this up to make sure we abort early enough. --- src/mono/mono/mini/mini-posix.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/mono/mono/mini/mini-posix.c b/src/mono/mono/mini/mini-posix.c index 075cdd07081a5..429d1dc3744f3 100644 --- a/src/mono/mono/mini/mini-posix.c +++ b/src/mono/mono/mini/mini-posix.c @@ -788,7 +788,8 @@ dump_native_stacktrace (const char *signal, MonoContext *mctx) g_assertion_disable_global (assert_printer_callback); } else { g_async_safe_printf ("\nAn error has occurred in the native fault reporting. Some diagnostic information will be unavailable.\n"); - + g_async_safe_printf ("\nExiting early due to double fault.\n"); + _exit (-1); } #ifdef HAVE_BACKTRACE_SYMBOLS @@ -847,11 +848,6 @@ dump_native_stacktrace (const char *signal, MonoContext *mctx) // If we can't fork, do as little as possible before exiting } - if (double_faulted) { - g_async_safe_printf("\nExiting early due to double fault.\n"); - _exit (-1); - } - #endif #else #ifdef HOST_ANDROID From 3aa56ebbd1587aa55df2a7991f7a584ef934e52f Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Mon, 22 Jul 2024 17:09:55 +0200 Subject: [PATCH 15/16] Disable failing tests with EnsureInitialized --- .../tests/System.Runtime.Tests/System/LazyTests.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/LazyTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/LazyTests.cs index 6068d6609148f..76c3639e72989 100644 --- a/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/LazyTests.cs +++ b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/LazyTests.cs @@ -385,6 +385,7 @@ public static void Value_ThrownException_DoesntCreateValue_PublicationOnly() Assert.False(lazy.IsValueCreated); } + [ActiveIssue("https://github.com/dotnet/runtime/issues/105251", TestPlatforms.tvOS)] [Fact] public static void EnsureInitialized_SimpleRefTypes() { @@ -416,6 +417,7 @@ public static void EnsureInitialized_SimpleRefTypes() Assert.Equal(strTemplate, d); } + [ActiveIssue("https://github.com/dotnet/runtime/issues/105251", TestPlatforms.tvOS)] [Fact] public static void EnsureInitialized_SimpleRefTypes_Invalid() { @@ -428,6 +430,7 @@ public static void EnsureInitialized_SimpleRefTypes_Invalid() Assert.Throws(() => LazyInitializer.EnsureInitialized(ref ndc)); } + [ActiveIssue("https://github.com/dotnet/runtime/issues/105251", TestPlatforms.tvOS)] [Fact] public static void EnsureInitialized_ComplexRefTypes() { @@ -484,6 +487,7 @@ public static void EnsureInitialized_ComplexRefTypes() Assert.Null(LazyInitializer.EnsureInitialized(ref e, ref einit, ref elock, () => { initCount++; return null; })); } + [ActiveIssue("https://github.com/dotnet/runtime/issues/105251", TestPlatforms.tvOS)] [Fact] public static void EnsureInitialized_ComplexRefTypes_Invalid() { @@ -494,6 +498,7 @@ public static void EnsureInitialized_ComplexRefTypes_Invalid() Assert.Throws(() => LazyInitializer.EnsureInitialized(ref ndc, ref ndcInit, ref ndcLock)); } + [ActiveIssue("https://github.com/dotnet/runtime/issues/105251", TestPlatforms.tvOS)] [Fact] public static void LazyInitializerComplexValueTypes() { @@ -548,6 +553,7 @@ public static void Ctor_Value_ValueType() VerifyLazy(lazyObject, 123, hasValue: true, isValueCreated: true); } + [ActiveIssue("https://github.com/dotnet/runtime/issues/105251", TestPlatforms.tvOS)] [Fact] public static void EnsureInitialized_FuncInitializationWithoutTrackingBool_Uninitialized() { @@ -559,6 +565,7 @@ public static void EnsureInitialized_FuncInitializationWithoutTrackingBool_Unini Assert.NotNull(syncLock); } + [ActiveIssue("https://github.com/dotnet/runtime/issues/105251", TestPlatforms.tvOS)] [Fact] public static void EnsureInitialized_FuncInitializationWithoutTrackingBool_Initialized() { @@ -570,6 +577,7 @@ public static void EnsureInitialized_FuncInitializationWithoutTrackingBool_Initi Assert.Null(syncLock); } + [ActiveIssue("https://github.com/dotnet/runtime/issues/105251", TestPlatforms.tvOS)] [Fact] public static void EnsureInitializer_FuncInitializationWithoutTrackingBool_Null() { From 0c9e00c1b3e55c40ed867cb6ea96d681ba391efc Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Mon, 22 Jul 2024 23:00:28 +0200 Subject: [PATCH 16/16] Remove testing channel from nuget config --- NuGet.config | 1 - 1 file changed, 1 deletion(-) diff --git a/NuGet.config b/NuGet.config index a2f361ba992c5..c9f91b5327322 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,6 @@ -