Skip to content

Commit 905b1bf

Browse files
borsbors
committed
Auto merge of rust-lang#137010 - workingjubilee:rollup-g00c07v, r=workingjubilee
Rollup of 9 pull requests Successful merges: - rust-lang#135439 (Make `-O` mean `OptLevel::Aggressive`) - rust-lang#136460 (Simplify `rustc_span` `analyze_source_file`) - rust-lang#136904 (add `IntoBounds` trait) - rust-lang#136908 ([AIX] expect `EINVAL` for `pthread_mutex_destroy`) - rust-lang#136924 (Add profiling of bootstrap commands using Chrome events) - rust-lang#136951 (Use the right binder for rebinding `PolyTraitRef`) - rust-lang#136981 (ci: switch loongarch jobs to free runners) - rust-lang#136992 (Update backtrace) - rust-lang#136993 ([cg_llvm] Remove dead error message) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 6dfeab5 + e8d0d00 commit 905b1bf

File tree

33 files changed

+315
-187
lines changed

33 files changed

+315
-187
lines changed

‎compiler/rustc_codegen_cranelift/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ fn build_isa(sess: &Session) -> Arc<dyn TargetIsa + 'static> {
289289
flags_builder.set("opt_level", "none").unwrap();
290290
}
291291
OptLevel::Less
292-
| OptLevel::Default
292+
| OptLevel::More
293293
| OptLevel::Size
294294
| OptLevel::SizeMin
295295
| OptLevel::Aggressive => {

‎compiler/rustc_codegen_gcc/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ fn to_gcc_opt_level(optlevel: Option<OptLevel>) -> OptimizationLevel {
476476
Some(level) => match level {
477477
OptLevel::No => OptimizationLevel::None,
478478
OptLevel::Less => OptimizationLevel::Limited,
479-
OptLevel::Default => OptimizationLevel::Standard,
479+
OptLevel::More => OptimizationLevel::Standard,
480480
OptLevel::Aggressive => OptimizationLevel::Aggressive,
481481
OptLevel::Size | OptLevel::SizeMin => OptimizationLevel::Limited,
482482
},

‎compiler/rustc_codegen_llvm/messages.ftl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ codegen_llvm_lto_proc_macro = lto cannot be used for `proc-macro` crate type wit
3838
codegen_llvm_mismatch_data_layout =
3939
data-layout for target `{$rustc_target}`, `{$rustc_layout}`, differs from LLVM target's `{$llvm_target}` default layout, `{$llvm_layout}`
4040
41-
codegen_llvm_multiple_source_dicompileunit = multiple source DICompileUnits found
42-
codegen_llvm_multiple_source_dicompileunit_with_llvm_err = multiple source DICompileUnits found: {$llvm_err}
43-
4441
codegen_llvm_parse_bitcode = failed to parse bitcode for LTO module
4542
codegen_llvm_parse_bitcode_with_llvm_err = failed to parse bitcode for LTO module: {$llvm_err}
4643

‎compiler/rustc_codegen_llvm/src/back/write.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ fn to_llvm_opt_settings(cfg: config::OptLevel) -> (llvm::CodeGenOptLevel, llvm::
141141
match cfg {
142142
No => (llvm::CodeGenOptLevel::None, llvm::CodeGenOptSizeNone),
143143
Less => (llvm::CodeGenOptLevel::Less, llvm::CodeGenOptSizeNone),
144-
Default => (llvm::CodeGenOptLevel::Default, llvm::CodeGenOptSizeNone),
144+
More => (llvm::CodeGenOptLevel::Default, llvm::CodeGenOptSizeNone),
145145
Aggressive => (llvm::CodeGenOptLevel::Aggressive, llvm::CodeGenOptSizeNone),
146146
Size => (llvm::CodeGenOptLevel::Default, llvm::CodeGenOptSizeDefault),
147147
SizeMin => (llvm::CodeGenOptLevel::Default, llvm::CodeGenOptSizeAggressive),
@@ -153,7 +153,7 @@ fn to_pass_builder_opt_level(cfg: config::OptLevel) -> llvm::PassBuilderOptLevel
153153
match cfg {
154154
No => llvm::PassBuilderOptLevel::O0,
155155
Less => llvm::PassBuilderOptLevel::O1,
156-
Default => llvm::PassBuilderOptLevel::O2,
156+
More => llvm::PassBuilderOptLevel::O2,
157157
Aggressive => llvm::PassBuilderOptLevel::O3,
158158
Size => llvm::PassBuilderOptLevel::Os,
159159
SizeMin => llvm::PassBuilderOptLevel::Oz,

‎compiler/rustc_codegen_llvm/src/errors.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,6 @@ pub enum LlvmError<'a> {
131131
LoadBitcode { name: CString },
132132
#[diag(codegen_llvm_write_thinlto_key)]
133133
WriteThinLtoKey { err: std::io::Error },
134-
#[diag(codegen_llvm_multiple_source_dicompileunit)]
135-
MultipleSourceDiCompileUnit,
136134
#[diag(codegen_llvm_prepare_thin_lto_module)]
137135
PrepareThinLtoModule,
138136
#[diag(codegen_llvm_parse_bitcode)]
@@ -155,9 +153,6 @@ impl<G: EmissionGuarantee> Diagnostic<'_, G> for WithLlvmError<'_> {
155153
PrepareThinLtoContext => fluent::codegen_llvm_prepare_thin_lto_context_with_llvm_err,
156154
LoadBitcode { .. } => fluent::codegen_llvm_load_bitcode_with_llvm_err,
157155
WriteThinLtoKey { .. } => fluent::codegen_llvm_write_thinlto_key_with_llvm_err,
158-
MultipleSourceDiCompileUnit => {
159-
fluent::codegen_llvm_multiple_source_dicompileunit_with_llvm_err
160-
}
161156
PrepareThinLtoModule => fluent::codegen_llvm_prepare_thin_lto_module_with_llvm_err,
162157
ParseBitcode => fluent::codegen_llvm_parse_bitcode_with_llvm_err,
163158
PrepareAutoDiff { .. } => fluent::codegen_llvm_prepare_autodiff_with_llvm_err,

‎compiler/rustc_codegen_ssa/src/back/linker.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ impl<'a> GccLinker<'a> {
410410
let opt_level = match self.sess.opts.optimize {
411411
config::OptLevel::No => "O0",
412412
config::OptLevel::Less => "O1",
413-
config::OptLevel::Default | config::OptLevel::Size | config::OptLevel::SizeMin => "O2",
413+
config::OptLevel::More | config::OptLevel::Size | config::OptLevel::SizeMin => "O2",
414414
config::OptLevel::Aggressive => "O3",
415415
};
416416

@@ -685,7 +685,7 @@ impl<'a> Linker for GccLinker<'a> {
685685

686686
// GNU-style linkers support optimization with -O. GNU ld doesn't
687687
// need a numeric argument, but other linkers do.
688-
if self.sess.opts.optimize == config::OptLevel::Default
688+
if self.sess.opts.optimize == config::OptLevel::More
689689
|| self.sess.opts.optimize == config::OptLevel::Aggressive
690690
{
691691
self.link_arg("-O1");
@@ -1213,7 +1213,7 @@ impl<'a> Linker for EmLinker<'a> {
12131213
self.cc_arg(match self.sess.opts.optimize {
12141214
OptLevel::No => "-O0",
12151215
OptLevel::Less => "-O1",
1216-
OptLevel::Default => "-O2",
1216+
OptLevel::More => "-O2",
12171217
OptLevel::Aggressive => "-O3",
12181218
OptLevel::Size => "-Os",
12191219
OptLevel::SizeMin => "-Oz",
@@ -1384,7 +1384,7 @@ impl<'a> Linker for WasmLd<'a> {
13841384
self.link_arg(match self.sess.opts.optimize {
13851385
OptLevel::No => "-O0",
13861386
OptLevel::Less => "-O1",
1387-
OptLevel::Default => "-O2",
1387+
OptLevel::More => "-O2",
13881388
OptLevel::Aggressive => "-O3",
13891389
// Currently LLD doesn't support `Os` and `Oz`, so pass through `O2`
13901390
// instead.
@@ -1451,7 +1451,7 @@ impl<'a> WasmLd<'a> {
14511451
let opt_level = match self.sess.opts.optimize {
14521452
config::OptLevel::No => "O0",
14531453
config::OptLevel::Less => "O1",
1454-
config::OptLevel::Default => "O2",
1454+
config::OptLevel::More => "O2",
14551455
config::OptLevel::Aggressive => "O3",
14561456
// wasm-ld only handles integer LTO opt levels. Use O2
14571457
config::OptLevel::Size | config::OptLevel::SizeMin => "O2",
@@ -1525,7 +1525,7 @@ impl<'a> Linker for L4Bender<'a> {
15251525
fn optimize(&mut self) {
15261526
// GNU-style linkers support optimization with -O. GNU ld doesn't
15271527
// need a numeric argument, but other linkers do.
1528-
if self.sess.opts.optimize == config::OptLevel::Default
1528+
if self.sess.opts.optimize == config::OptLevel::More
15291529
|| self.sess.opts.optimize == config::OptLevel::Aggressive
15301530
{
15311531
self.link_arg("-O1");
@@ -1929,7 +1929,7 @@ impl<'a> Linker for LlbcLinker<'a> {
19291929
match self.sess.opts.optimize {
19301930
OptLevel::No => "-O0",
19311931
OptLevel::Less => "-O1",
1932-
OptLevel::Default => "-O2",
1932+
OptLevel::More => "-O2",
19331933
OptLevel::Aggressive => "-O3",
19341934
OptLevel::Size => "-Os",
19351935
OptLevel::SizeMin => "-Oz",
@@ -2006,7 +2006,7 @@ impl<'a> Linker for BpfLinker<'a> {
20062006
self.link_arg(match self.sess.opts.optimize {
20072007
OptLevel::No => "-O0",
20082008
OptLevel::Less => "-O1",
2009-
OptLevel::Default => "-O2",
2009+
OptLevel::More => "-O2",
20102010
OptLevel::Aggressive => "-O3",
20112011
OptLevel::Size => "-Os",
20122012
OptLevel::SizeMin => "-Oz",

‎compiler/rustc_codegen_ssa/src/back/write.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ impl ModuleConfig {
236236
// Copy what clang does by turning on loop vectorization at O2 and
237237
// slp vectorization at O3.
238238
vectorize_loop: !sess.opts.cg.no_vectorize_loops
239-
&& (sess.opts.optimize == config::OptLevel::Default
239+
&& (sess.opts.optimize == config::OptLevel::More
240240
|| sess.opts.optimize == config::OptLevel::Aggressive),
241241
vectorize_slp: !sess.opts.cg.no_vectorize_slp
242242
&& sess.opts.optimize == config::OptLevel::Aggressive,
@@ -260,7 +260,7 @@ impl ModuleConfig {
260260
MergeFunctions::Trampolines | MergeFunctions::Aliases => {
261261
use config::OptLevel::*;
262262
match sess.opts.optimize {
263-
Aggressive | Default | SizeMin | Size => true,
263+
Aggressive | More | SizeMin | Size => true,
264264
Less | No => false,
265265
}
266266
}

‎compiler/rustc_codegen_ssa/src/base.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1054,12 +1054,12 @@ pub(crate) fn provide(providers: &mut Providers) {
10541054
config::OptLevel::No => return config::OptLevel::No,
10551055
// If globally optimise-speed is already specified, just use that level.
10561056
config::OptLevel::Less => return config::OptLevel::Less,
1057-
config::OptLevel::Default => return config::OptLevel::Default,
1057+
config::OptLevel::More => return config::OptLevel::More,
10581058
config::OptLevel::Aggressive => return config::OptLevel::Aggressive,
10591059
// If globally optimize-for-size has been requested, use -O2 instead (if optimize(size)
10601060
// are present).
1061-
config::OptLevel::Size => config::OptLevel::Default,
1062-
config::OptLevel::SizeMin => config::OptLevel::Default,
1061+
config::OptLevel::Size => config::OptLevel::More,
1062+
config::OptLevel::SizeMin => config::OptLevel::More,
10631063
};
10641064

10651065
let defids = tcx.collect_and_partition_mono_items(cratenum).all_mono_items;

‎compiler/rustc_mir_transform/src/inline.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@ impl<'tcx> crate::MirPass<'tcx> for Inline {
4949
match sess.mir_opt_level() {
5050
0 | 1 => false,
5151
2 => {
52-
(sess.opts.optimize == OptLevel::Default
53-
|| sess.opts.optimize == OptLevel::Aggressive)
52+
(sess.opts.optimize == OptLevel::More || sess.opts.optimize == OptLevel::Aggressive)
5453
&& sess.opts.incremental == None
5554
}
5655
_ => true,

‎compiler/rustc_session/src/config.rs

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,18 @@ pub enum CFProtection {
8686

8787
#[derive(Clone, Copy, Debug, PartialEq, Hash, HashStable_Generic)]
8888
pub enum OptLevel {
89-
No, // -O0
90-
Less, // -O1
91-
Default, // -O2
92-
Aggressive, // -O3
93-
Size, // -Os
94-
SizeMin, // -Oz
89+
/// `-Copt-level=0`
90+
No,
91+
/// `-Copt-level=1`
92+
Less,
93+
/// `-Copt-level=2`
94+
More,
95+
/// `-Copt-level=3` / `-O`
96+
Aggressive,
97+
/// `-Copt-level=s`
98+
Size,
99+
/// `-Copt-level=z`
100+
SizeMin,
95101
}
96102

97103
/// This is what the `LtoCli` values get mapped to after resolving defaults and
@@ -1253,7 +1259,7 @@ impl Options {
12531259
Some(setting) => setting,
12541260
None => match self.optimize {
12551261
OptLevel::No | OptLevel::Less | OptLevel::Size | OptLevel::SizeMin => true,
1256-
OptLevel::Default | OptLevel::Aggressive => false,
1262+
OptLevel::More | OptLevel::Aggressive => false,
12571263
},
12581264
}
12591265
}
@@ -1572,7 +1578,7 @@ pub fn rustc_optgroups() -> Vec<RustcOptGroup> {
15721578
stack-protector-strategies|link-args|deployment-target]",
15731579
),
15741580
opt(Stable, FlagMulti, "g", "", "Equivalent to -C debuginfo=2", ""),
1575-
opt(Stable, FlagMulti, "O", "", "Equivalent to -C opt-level=2", ""),
1581+
opt(Stable, FlagMulti, "O", "", "Equivalent to -C opt-level=3", ""),
15761582
opt(Stable, Opt, "o", "", "Write output to <filename>", "FILENAME"),
15771583
opt(Stable, Opt, "", "out-dir", "Write output to compiler-chosen filename in <dir>", "DIR"),
15781584
opt(
@@ -2127,12 +2133,12 @@ fn parse_opt_level(
21272133
})
21282134
.max();
21292135
if max_o > max_c {
2130-
OptLevel::Default
2136+
OptLevel::Aggressive
21312137
} else {
21322138
match cg.opt_level.as_ref() {
21332139
"0" => OptLevel::No,
21342140
"1" => OptLevel::Less,
2135-
"2" => OptLevel::Default,
2141+
"2" => OptLevel::More,
21362142
"3" => OptLevel::Aggressive,
21372143
"s" => OptLevel::Size,
21382144
"z" => OptLevel::SizeMin,

0 commit comments

Comments
 (0)