diff options
| author | Jonas Schievink <jonasschievink@gmail.com> | 2021-01-24 22:10:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-24 22:10:02 +0100 |
| commit | 9089dd2248c2bdca89140f6af514b5fcbb1b97da (patch) | |
| tree | 8004630c2dafaaec8273b4444ab5ab4dc0281df2 | |
| parent | 70be327f2a1732e0e7bb464e067bcf8b8d0801dc (diff) | |
| parent | 794880c6b564d67b75cc89eed1d839d301facadf (diff) | |
| download | rust-9089dd2248c2bdca89140f6af514b5fcbb1b97da.tar.gz rust-9089dd2248c2bdca89140f6af514b5fcbb1b97da.zip | |
Rollup merge of #81297 - bjorn3:no_extern_backend_optimization_level_query_provider, r=cjgillot
Don't provide backend_optimization_level query for extern crates Fixes #71291
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/base.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/lib.rs | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/compiler/rustc_codegen_ssa/src/base.rs b/compiler/rustc_codegen_ssa/src/base.rs index 2ce5fe5ad50..b205ea9cf6c 100644 --- a/compiler/rustc_codegen_ssa/src/base.rs +++ b/compiler/rustc_codegen_ssa/src/base.rs @@ -783,7 +783,7 @@ impl CrateInfo { } } -pub fn provide_both(providers: &mut Providers) { +pub fn provide(providers: &mut Providers) { providers.backend_optimization_level = |tcx, cratenum| { let for_speed = match tcx.sess.opts.optimize { // If globally no optimisation is done, #[optimize] has no effect. diff --git a/compiler/rustc_codegen_ssa/src/lib.rs b/compiler/rustc_codegen_ssa/src/lib.rs index e27eac3f69b..0307117e1c8 100644 --- a/compiler/rustc_codegen_ssa/src/lib.rs +++ b/compiler/rustc_codegen_ssa/src/lib.rs @@ -160,13 +160,12 @@ pub struct CodegenResults { pub fn provide(providers: &mut Providers) { crate::back::symbol_export::provide(providers); - crate::base::provide_both(providers); + crate::base::provide(providers); crate::target_features::provide(providers); } pub fn provide_extern(providers: &mut Providers) { crate::back::symbol_export::provide_extern(providers); - crate::base::provide_both(providers); } /// Checks if the given filename ends with the `.rcgu.o` extension that `rustc` |
