From 03d0ac62aa9bed564cdfb394da199f4479d84705 Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Mon, 4 Dec 2023 10:03:38 -0500 Subject: [PATCH 1/3] copy 1.74.1 release notes to master --- RELEASES.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/RELEASES.md b/RELEASES.md index 9eb8755dad99a..a18b5264bbd6b 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -1,3 +1,10 @@ +Version 1.74.1 (2023-12-07) +=========================== + +- [Resolved spurious STATUS_ACCESS_VIOLATIONs in LLVM](https://github.com/rust-lang/rust/pull/118464) +- [Clarify guarantees for std::mem::discriminant](https://github.com/rust-lang/rust/pull/118006) +- [Fix some subtyping-related regressions](https://github.com/rust-lang/rust/pull/116415) + Version 1.74.0 (2023-11-16) ========================== From 0a285e8de7eec36e1de68c83764d23f2522a4274 Mon Sep 17 00:00:00 2001 From: Krasimir Georgiev Date: Thu, 14 Dec 2023 15:02:23 +0000 Subject: [PATCH 2/3] llvm-wrapper: adapt for LLVM API changes Adapt for https://github.com/llvm/llvm-project/commit/8ecbb0404d740d1ab173554e47cef39cd5e3ef8c. --- compiler/rustc_llvm/llvm-wrapper/CoverageMappingWrapper.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/compiler/rustc_llvm/llvm-wrapper/CoverageMappingWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/CoverageMappingWrapper.cpp index d61ec0b641c9d..373bc5cc58185 100644 --- a/compiler/rustc_llvm/llvm-wrapper/CoverageMappingWrapper.cpp +++ b/compiler/rustc_llvm/llvm-wrapper/CoverageMappingWrapper.cpp @@ -139,6 +139,9 @@ extern "C" void LLVMRustCoverageWriteMappingToBuffer( RustMappingRegions, NumMappingRegions)) { MappingRegions.emplace_back( fromRust(Region.Count), fromRust(Region.FalseCount), +#if LLVM_VERSION_GE(18, 0) + coverage::CounterMappingRegion::MCDCParameters{}, +#endif Region.FileID, Region.ExpandedFileID, Region.LineStart, Region.ColumnStart, Region.LineEnd, Region.ColumnEnd, fromRust(Region.Kind)); From ce2eaa6325d9cc7e976be8f83097f07c5fb7941a Mon Sep 17 00:00:00 2001 From: onur-ozkan Date: Mon, 18 Dec 2023 15:54:10 +0300 Subject: [PATCH 3/3] Comment out `change-id` in `config.example.toml` This way, we only update CONFIG_CHANGE_HISTORY for major changes, which is much simpler (and updating example.toml doesn't make much sense) Signed-off-by: onur-ozkan --- config.example.toml | 4 ++-- triagebot.toml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config.example.toml b/config.example.toml index 14e0b9d521fde..a7d4df545a6fb 100644 --- a/config.example.toml +++ b/config.example.toml @@ -29,8 +29,8 @@ # - A change in the default values # # If `change-id` does not match the version that is currently running, -# `x.py` will prompt you to update it and check the related PR for more details. -change-id = 118703 +# `x.py` will inform you about the changes made on bootstrap. +# change-id = # ============================================================================= # Tweaking how LLVM is compiled diff --git a/triagebot.toml b/triagebot.toml index 30f049c79d68e..7ee0f5b13f936 100644 --- a/triagebot.toml +++ b/triagebot.toml @@ -597,19 +597,19 @@ cc = ["@davidtwco", "@wesleywiser"] message = """ This PR modifies `src/bootstrap/src/core/config`. -If appropriate, please update `CONFIG_CHANGE_HISTORY` in `src/bootstrap/src/utils/change_tracker.rs` and `change-id` in `config.example.toml`. +If appropriate, please update `CONFIG_CHANGE_HISTORY` in `src/bootstrap/src/utils/change_tracker.rs`. """ [mentions."src/bootstrap/defaults"] message = """ This PR modifies `src/bootstrap/defaults`. -If appropriate, please update `CONFIG_CHANGE_HISTORY` in `src/bootstrap/src/utils/change_tracker.rs` and `change-id` in `config.example.toml`. +If appropriate, please update `CONFIG_CHANGE_HISTORY` in `src/bootstrap/src/utils/change_tracker.rs`. """ [mentions."config.example.toml"] message = """ This PR modifies `config.example.toml`. -If appropriate, please update `CONFIG_CHANGE_HISTORY` in `src/bootstrap/src/utils/change_tracker.rs` and `change-id` in `config.example.toml`. +If appropriate, please update `CONFIG_CHANGE_HISTORY` in `src/bootstrap/src/utils/change_tracker.rs`. """ [mentions."src/bootstrap/defaults/config.compiler.toml"]