Skip to content

Commit 977ad50

Browse files
borsbors
committed
Auto merge of #132631 - workingjubilee:rollup-dx0krqp, r=workingjubilee
Rollup of 4 pull requests Successful merges: - #132153 (Stabilise `const_char_encode_utf16`.) - #132473 ([core/fmt] Replace checked slice indexing by unchecked to support panic-free code) - #132600 (PassWrapper: adapt for new parameter in LLVM) - #132630 (triagebot: ping wg-const-eval when relevant files change) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 096277e + 5b1c626 commit 977ad50

File tree

5 files changed

+56
-11
lines changed

5 files changed

+56
-11
lines changed

‎compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp

+41-5
Original file line numberDiff line numberDiff line change
@@ -784,8 +784,14 @@ extern "C" LLVMRustResult LLVMRustOptimize(
784784
// the PassBuilder does not create a pipeline.
785785
std::vector<std::function<void(ModulePassManager &, OptimizationLevel)>>
786786
PipelineStartEPCallbacks;
787+
#if LLVM_VERSION_GE(20, 0)
788+
std::vector<std::function<void(ModulePassManager &, OptimizationLevel,
789+
ThinOrFullLTOPhase)>>
790+
OptimizerLastEPCallbacks;
791+
#else
787792
std::vector<std::function<void(ModulePassManager &, OptimizationLevel)>>
788793
OptimizerLastEPCallbacks;
794+
#endif
789795

790796
if (!IsLinkerPluginLTO && SanitizerOptions && SanitizerOptions->SanitizeCFI &&
791797
!NoPrepopulatePasses) {
@@ -832,7 +838,12 @@ extern "C" LLVMRustResult LLVMRustOptimize(
832838
SanitizerOptions->SanitizeDataFlowABIList +
833839
SanitizerOptions->SanitizeDataFlowABIListLen);
834840
OptimizerLastEPCallbacks.push_back(
841+
#if LLVM_VERSION_GE(20, 0)
842+
[ABIListFiles](ModulePassManager &MPM, OptimizationLevel Level,
843+
ThinOrFullLTOPhase phase) {
844+
#else
835845
[ABIListFiles](ModulePassManager &MPM, OptimizationLevel Level) {
846+
#endif
836847
MPM.addPass(DataFlowSanitizerPass(ABIListFiles));
837848
});
838849
}
@@ -844,23 +855,39 @@ extern "C" LLVMRustResult LLVMRustOptimize(
844855
/*CompileKernel=*/false,
845856
/*EagerChecks=*/true);
846857
OptimizerLastEPCallbacks.push_back(
858+
#if LLVM_VERSION_GE(20, 0)
859+
[Options](ModulePassManager &MPM, OptimizationLevel Level,
860+
ThinOrFullLTOPhase phase) {
861+
#else
847862
[Options](ModulePassManager &MPM, OptimizationLevel Level) {
863+
#endif
848864
MPM.addPass(MemorySanitizerPass(Options));
849865
});
850866
}
851867

852868
if (SanitizerOptions->SanitizeThread) {
853-
OptimizerLastEPCallbacks.push_back([](ModulePassManager &MPM,
854-
OptimizationLevel Level) {
855-
MPM.addPass(ModuleThreadSanitizerPass());
856-
MPM.addPass(createModuleToFunctionPassAdaptor(ThreadSanitizerPass()));
857-
});
869+
OptimizerLastEPCallbacks.push_back(
870+
#if LLVM_VERSION_GE(20, 0)
871+
[](ModulePassManager &MPM, OptimizationLevel Level,
872+
ThinOrFullLTOPhase phase) {
873+
#else
874+
[](ModulePassManager &MPM, OptimizationLevel Level) {
875+
#endif
876+
MPM.addPass(ModuleThreadSanitizerPass());
877+
MPM.addPass(
878+
createModuleToFunctionPassAdaptor(ThreadSanitizerPass()));
879+
});
858880
}
859881

860882
if (SanitizerOptions->SanitizeAddress ||
861883
SanitizerOptions->SanitizeKernelAddress) {
862884
OptimizerLastEPCallbacks.push_back(
885+
#if LLVM_VERSION_GE(20, 0)
886+
[SanitizerOptions](ModulePassManager &MPM, OptimizationLevel Level,
887+
ThinOrFullLTOPhase phase) {
888+
#else
863889
[SanitizerOptions](ModulePassManager &MPM, OptimizationLevel Level) {
890+
#endif
864891
auto CompileKernel = SanitizerOptions->SanitizeKernelAddress;
865892
AddressSanitizerOptions opts = AddressSanitizerOptions{
866893
CompileKernel,
@@ -874,7 +901,12 @@ extern "C" LLVMRustResult LLVMRustOptimize(
874901
}
875902
if (SanitizerOptions->SanitizeHWAddress) {
876903
OptimizerLastEPCallbacks.push_back(
904+
#if LLVM_VERSION_GE(20, 0)
905+
[SanitizerOptions](ModulePassManager &MPM, OptimizationLevel Level,
906+
ThinOrFullLTOPhase phase) {
907+
#else
877908
[SanitizerOptions](ModulePassManager &MPM, OptimizationLevel Level) {
909+
#endif
878910
HWAddressSanitizerOptions opts(
879911
/*CompileKernel=*/false,
880912
SanitizerOptions->SanitizeHWAddressRecover,
@@ -935,7 +967,11 @@ extern "C" LLVMRustResult LLVMRustOptimize(
935967
for (const auto &C : PipelineStartEPCallbacks)
936968
C(MPM, OptLevel);
937969
for (const auto &C : OptimizerLastEPCallbacks)
970+
#if LLVM_VERSION_GE(20, 0)
971+
C(MPM, OptLevel, ThinOrFullLTOPhase::None);
972+
#else
938973
C(MPM, OptLevel);
974+
#endif
939975
}
940976

941977
if (ExtraPassesLen) {

‎library/core/src/char/methods.rs

+5-2
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,7 @@ impl char {
711711
/// '𝕊'.encode_utf16(&mut b);
712712
/// ```
713713
#[stable(feature = "unicode_encode_char", since = "1.15.0")]
714-
#[rustc_const_unstable(feature = "const_char_encode_utf16", issue = "130660")]
714+
#[rustc_const_stable(feature = "const_char_encode_utf16", since = "CURRENT_RUSTC_VERSION")]
715715
#[inline]
716716
pub const fn encode_utf16(self, dst: &mut [u16]) -> &mut [u16] {
717717
encode_utf16_raw(self as u32, dst)
@@ -1819,7 +1819,10 @@ pub const fn encode_utf8_raw(code: u32, dst: &mut [u8]) -> &mut [u8] {
18191819
/// Panics if the buffer is not large enough.
18201820
/// A buffer of length 2 is large enough to encode any `char`.
18211821
#[unstable(feature = "char_internals", reason = "exposed only for libstd", issue = "none")]
1822-
#[rustc_const_unstable(feature = "const_char_encode_utf16", issue = "130660")]
1822+
#[cfg_attr(
1823+
bootstrap,
1824+
rustc_const_stable(feature = "const_char_encode_utf16", since = "CURRENT_RUSTC_VERSION")
1825+
)]
18231826
#[doc(hidden)]
18241827
#[inline]
18251828
pub const fn encode_utf16_raw(mut code: u32, dst: &mut [u16]) -> &mut [u16] {

‎library/core/src/fmt/num.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,10 @@ unsafe trait GenericRadix: Sized {
8888
};
8989
}
9090
}
91-
let buf = &buf[curr..];
91+
// SAFETY: `curr` is initialized to `buf.len()` and is only decremented, so it can't overflow. It is
92+
// decremented exactly once for each digit. Since u128 is the widest fixed width integer format supported,
93+
// the maximum number of digits (bits) is 128 for base-2, so `curr` won't underflow as well.
94+
let buf = unsafe { buf.get_unchecked(curr..) };
9295
// SAFETY: The only chars in `buf` are created by `Self::digit` which are assumed to be
9396
// valid UTF-8
9497
let buf = unsafe {

‎library/core/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@
115115
#![feature(const_align_of_val_raw)]
116116
#![feature(const_alloc_layout)]
117117
#![feature(const_black_box)]
118-
#![feature(const_char_encode_utf16)]
119118
#![feature(const_eval_select)]
120119
#![feature(const_float_methods)]
121120
#![feature(const_heap)]

‎triagebot.toml

+6-2
Original file line numberDiff line numberDiff line change
@@ -611,6 +611,10 @@ cc = ["@bjorn3"]
611611
[mentions."compiler/rustc_codegen_gcc"]
612612
cc = ["@antoyo", "@GuillaumeGomez"]
613613

614+
[mentions."compiler/rustc_const_eval/src/"]
615+
message = "Some changes occurred to the CTFE machinery"
616+
cc = ["@rust-lang/wg-const-eval"]
617+
614618
[mentions."compiler/rustc_const_eval/src/interpret"]
615619
message = "Some changes occurred to the CTFE / Miri interpreter"
616620
cc = ["@rust-lang/miri"]
@@ -633,7 +637,7 @@ cc = ["@compiler-errors", "@lcnr"]
633637

634638
[mentions."compiler/rustc_middle/src/mir/interpret"]
635639
message = "Some changes occurred to the CTFE / Miri interpreter"
636-
cc = ["@rust-lang/miri"]
640+
cc = ["@rust-lang/miri", "@rust-lang/wg-const-eval"]
637641

638642
[mentions."compiler/rustc_mir_transform/src/"]
639643
message = "Some changes occurred to MIR optimizations"
@@ -706,7 +710,7 @@ message = """
706710
Some changes occurred to the intrinsics. Make sure the CTFE / Miri interpreter
707711
gets adapted for the changes, if necessary.
708712
"""
709-
cc = ["@rust-lang/miri"]
713+
cc = ["@rust-lang/miri", "@rust-lang/wg-const-eval"]
710714

711715
[mentions."library/portable-simd"]
712716
message = """

0 commit comments

Comments
 (0)