Auto merge of #58010 - Zoxc:parallel-passes, r=michaelwoerister

Move privacy checking later in the pipeline and make some passes run in parallel r? @michaelwoerister

Author: bors

src/librustc/hir/mod.rs

@@ -30,7 +30,7 @@ use syntax::util::parser::ExprPrecedence;
 use crate::ty::AdtKind;
 use crate::ty::query::Providers;
 
-use rustc_data_structures::sync::{ParallelIterator, par_iter, Send, Sync, scope};
+use rustc_data_structures::sync::{ParallelIterator, par_iter, Send, Sync};
 use rustc_data_structures::thin_vec::ThinVec;
 
 use serialize::{self, Encoder, Encodable, Decoder, Decodable};
@@ -763,23 +763,17 @@ impl Crate {
  pub fn par_visit_all_item_likes<'hir, V>(&'hir self, visitor: &V)
  where V: itemlikevisit::ParItemLikeVisitor<'hir> + Sync + Send
  {
- scope(|s| {
- s.spawn(|_| {
- par_iter(&self.items).for_each(|(_, item)| {
- visitor.visit_item(item);
- });
+ parallel!({
+ par_iter(&self.items).for_each(|(_, item)| {
+ visitor.visit_item(item);
  });
-
- s.spawn(|_| {
- par_iter(&self.trait_items).for_each(|(_, trait_item)| {
- visitor.visit_trait_item(trait_item);
- });
+ }, {
+ par_iter(&self.trait_items).for_each(|(_, trait_item)| {
+ visitor.visit_trait_item(trait_item);
  });
-
- s.spawn(|_| {
- par_iter(&self.impl_items).for_each(|(_, impl_item)| {
- visitor.visit_impl_item(impl_item);
- });
+ }, {
+ par_iter(&self.impl_items).for_each(|(_, impl_item)| {
+ visitor.visit_impl_item(impl_item);
  });
  });
  }

src/librustc/middle/liveness.rs

@@ -189,7 +189,6 @@ pub fn check_crate<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>) {
  for &module in tcx.hir().krate().modules.keys() {
  tcx.ensure().check_mod_liveness(tcx.hir().local_def_id(module));
  }
- tcx.sess.abort_if_errors();
 }
 
 pub fn provide(providers: &mut Providers<'_>) {

src/librustc/session/mod.rs

@@ -85,7 +85,7 @@ pub struct Session {
  /// in order to avoid redundantly verbose output (Issue #24690, #44953).
  pub one_time_diagnostics: Lock<FxHashSet<(DiagnosticMessageId, Option<Span>, String)>>,
  pub plugin_llvm_passes: OneThread<RefCell<Vec<String>>>,
- pub plugin_attributes: OneThread<RefCell<Vec<(String, AttributeType)>>>,
+ pub plugin_attributes: Lock<Vec<(String, AttributeType)>>,
  pub crate_types: Once<Vec<config::CrateType>>,
  pub dependency_formats: Once<dependency_format::Dependencies>,
  /// The crate_disambiguator is constructed out of all the `-C metadata`
@@ -1178,7 +1178,7 @@ pub fn build_session_(
  buffered_lints: Lock::new(Some(Default::default())),
  one_time_diagnostics: Default::default(),
  plugin_llvm_passes: OneThread::new(RefCell::new(Vec::new())),
- plugin_attributes: OneThread::new(RefCell::new(Vec::new())),
+ plugin_attributes: Lock::new(Vec::new()),
  crate_types: Once::new(),
  dependency_formats: Once::new(),
  crate_disambiguator: Once::new(),

src/librustc_data_structures/sync.rs

@@ -127,6 +127,13 @@ cfg_if! {
  pub use self::serial_join as join;
  pub use self::serial_scope as scope;
 
+ #[macro_export]
+ macro_rules! parallel {
+ ($($blocks:tt),*) => {
+ $($blocks)*;
+ }
+ }
+
  pub use std::iter::Iterator as ParallelIterator;
 
  pub fn par_iter<T: IntoIterator>(t: T) -> T::IntoIter {
@@ -271,6 +278,26 @@ cfg_if! {
  use std::thread;
  pub use rayon::{join, scope};
 
+ #[macro_export]
+ macro_rules! parallel {
+ (impl [$($c:tt,)*] [$block:tt $(, $rest:tt)*]) => {
+ parallel!(impl [$block, $($c,)*] [$($rest),*])
+ };
+ (impl [$($blocks:tt,)*] []) => {
+ ::rustc_data_structures::sync::scope(|s| {
+ $(
+ s.spawn(|_| $blocks);
+ )*
+ })
+ };
+ ($($blocks:tt),*) => {
+ // Reverse the order of the blocks since Rayon executes them in reverse order
+ // when using a single thread. This ensures the execution order matches that
+ // of a single threaded rustc
+ parallel!(impl [] [$($blocks),*]);
+ };
+ }
+
  pub use rayon_core::WorkerLocal;
 
  pub use rayon::iter::ParallelIterator;

src/librustc_driver/driver.rs

@@ -1222,26 +1222,28 @@ where
  // tcx available.
  time(sess, "dep graph tcx init", || rustc_incremental::dep_graph_tcx_init(tcx));
 
- time(sess, "looking for entry point", || {
- middle::entry::find_entry_point(tcx)
- });
-
- time(sess, "looking for plugin registrar", || {
- plugin::build::find_plugin_registrar(tcx)
- });
-
- time(sess, "looking for derive registrar", || {
- proc_macro_decls::find(tcx)
- });
-
- time(sess, "loop checking", || loops::check_crate(tcx));
+ parallel!({
+ time(sess, "looking for entry point", || {
+ middle::entry::find_entry_point(tcx)
+ });
 
- time(sess, "attribute checking", || {
- hir::check_attr::check_crate(tcx)
- });
+  time(sess, "looking for plugin registrar", || {
+  plugin::build::find_plugin_registrar(tcx)
+  });
 
- time(sess, "stability checking", || {
- stability::check_unstable_api_usage(tcx)
+ time(sess, "looking for derive registrar", || {
+ proc_macro_decls::find(tcx)
+ });
+ }, {
+ time(sess, "loop checking", || loops::check_crate(tcx));
+ }, {
+ time(sess, "attribute checking", || {
+ hir::check_attr::check_crate(tcx)
+ });
+ }, {
+ time(sess, "stability checking", || {
+ stability::check_unstable_api_usage(tcx)
+ });
  });
 
  // passes are timed inside typeck
@@ -1253,27 +1255,31 @@ where
  }
  }
 
- time(sess, "rvalue promotion", || {
- rvalue_promotion::check_crate(tcx)
- });
-
- time(sess, "privacy checking", || {
- rustc_privacy::check_crate(tcx)
- });
-
- time(sess, "intrinsic checking", || {
- middle::intrinsicck::check_crate(tcx)
+ time(sess, "misc checking", || {
+ parallel!({
+ time(sess, "rvalue promotion", || {
+ rvalue_promotion::check_crate(tcx)
+ });
+ }, {
+ time(sess, "intrinsic checking", || {
+ middle::intrinsicck::check_crate(tcx)
+ });
+ }, {
+ time(sess, "match checking", || mir::matchck_crate(tcx));
+ }, {
+ // this must run before MIR dump, because
+ // "not all control paths return a value" is reported here.
+ //
+ // maybe move the check to a MIR pass?
+ time(sess, "liveness checking", || {
+ middle::liveness::check_crate(tcx)
+ });
+ });
  });
 
- time(sess, "match checking", || mir::matchck_crate(tcx));
-
- // this must run before MIR dump, because
- // "not all control paths return a value" is reported here.
- //
- // maybe move the check to a MIR pass?
- time(sess, "liveness checking", || {
- middle::liveness::check_crate(tcx)
- });
+ // Abort so we don't try to construct MIR with liveness errors.
+ // We also won't want to continue with errors from rvalue promotion
+ tcx.sess.abort_if_errors();
 
  time(sess, "borrow checking", || {
  if tcx.use_ast_borrowck() {
@@ -1297,7 +1303,7 @@ where
 
  time(sess, "layout testing", || layout_test::test_layout(tcx));
 
- // Avoid overwhelming user with errors if type checking failed.
+ // Avoid overwhelming user with errors if borrow checking failed.
  // I'm not sure how helpful this is, to be honest, but it avoids
  // a
  // lot of annoying errors in the compile-fail tests (basically,
@@ -1307,14 +1313,22 @@ where
  return Ok(f(tcx, rx, sess.compile_status()));
  }
 
- time(sess, "death checking", || middle::dead::check_crate(tcx));
-
- time(sess, "unused lib feature checking", || {
- stability::check_unused_or_stable_features(tcx)
+ time(sess, "misc checking", || {
+ parallel!({
+ time(sess, "privacy checking", || {
+ rustc_privacy::check_crate(tcx)
+ });
+ }, {
+ time(sess, "death checking", || middle::dead::check_crate(tcx));
+ }, {
+ time(sess, "unused lib feature checking", || {
+ stability::check_unused_or_stable_features(tcx)
+ });
+ }, {
+ time(sess, "lint checking", || lint::check_crate(tcx));
+ });
  });
 
- time(sess, "lint checking", || lint::check_crate(tcx));
-
  return Ok(f(tcx, rx, tcx.sess.compile_status()));
  },
  )

src/librustc_driver/lib.rs

@@ -30,6 +30,7 @@ extern crate rustc;
 extern crate rustc_allocator;
 extern crate rustc_target;
 extern crate rustc_borrowck;
+#[macro_use]
 extern crate rustc_data_structures;
 extern crate rustc_errors as errors;
 extern crate rustc_passes;

src/librustc_passes/rvalue_promotion.rs

@@ -44,7 +44,6 @@ pub fn check_crate<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>) {
  let def_id = tcx.hir().body_owner_def_id(body_id);
  tcx.const_is_rvalue_promotable_to_static(def_id);
  }
- tcx.sess.abort_if_errors();
 }
 
 fn const_is_rvalue_promotable_to_static<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,

src/test/ui/error-codes/E0446.rs

@@ -1,4 +1,4 @@
-mod Foo {
+mod foo {
  struct Bar(u32);
 
  pub fn bar() -> Bar { //~ ERROR E0446

src/test/ui/error-codes/E0446.stderr

@@ -1,8 +1,8 @@
-error[E0446]: private type `Foo::Bar` in public interface
+error[E0446]: private type `foo::Bar` in public interface
  --> $DIR/E0446.rs:4:5
  |
 LL | struct Bar(u32);
- | - `Foo::Bar` declared as private
+ | - `foo::Bar` declared as private
 LL | 
 LL | / pub fn bar() -> Bar { //~ ERROR E0446
 LL | | Bar(0)

src/test/ui/error-codes/E0451.rs

@@ -1,4 +1,4 @@
-mod Bar {
+mod bar {
  pub struct Foo {
  pub a: isize,
  b: isize,
@@ -10,10 +10,10 @@ mod Bar {
  );
 }
 
-fn pat_match(foo: Bar::Foo) {
- let Bar::Foo{a:a, b:b} = foo; //~ ERROR E0451
+fn pat_match(foo: bar::Foo) {
+ let bar::Foo{a, b} = foo; //~ ERROR E0451
 }
 
 fn main() {
- let f = Bar::Foo{ a: 0, b: 0 }; //~ ERROR E0451
+ let f = bar::Foo{ a: 0, b: 0 }; //~ ERROR E0451
 }