Rollup merge of #81297 - bjorn3:no_extern_backend_optimization_level_query_provider, r=cjgillot

jonas-schievink · web-flow · commit 9089dd2248c2 · 2021-01-24T22:10:02.000+01:00
Don't provide backend_optimization_level query for extern crates Fixes #71291
diff --git 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
@@ -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`

Original file line number	Diff line number	Diff line change
`@@ -783,7 +783,7 @@ impl CrateInfo {`
`783`	`783`	`}`
`784`	`784`	`}`
`785`	`785`
`786`		`-pub fn provide_both(providers: &mut Providers) {`
	`786`	`+pub fn provide(providers: &mut Providers) {`
`787`	`787`	`providers.backend_optimization_level = \|tcx, cratenum\| {`
`788`	`788`	`let for_speed = match tcx.sess.opts.optimize {`
`789`	`789`	`// If globally no optimisation is done, #[optimize] has no effect.`
Original file line number	Diff line number	Diff line change
`@@ -160,13 +160,12 @@ pub struct CodegenResults {`
`160`	`160`
`161`	`161`	`pub fn provide(providers: &mut Providers) {`
`162`	`162`	`crate::back::symbol_export::provide(providers);`
`163`		`- crate::base::provide_both(providers);`
	`163`	`+ crate::base::provide(providers);`
`164`	`164`	`crate::target_features::provide(providers);`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`pub fn provide_extern(providers: &mut Providers) {`
`168`	`168`	`crate::back::symbol_export::provide_extern(providers);`
`169`		`- crate::base::provide_both(providers);`
`170`	`169`	`}`
`171`	`170`
`172`	`171`	/// Checks if the given filename ends with the `.rcgu.o` extension that `rustc`