Remove profiler_builtins crate

bogon-right · bogon-right · commit 36068ca07979 · 2022-10-24T03:35:34.000+08:00
diff --git a/Cargo.lock b/Cargo.lock
@@ -2736,13 +2736,6 @@ dependencies = [
  "std",
 ]
 
-[[package]]
-name = "profiler_builtins"
-version = "0.0.0"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "psm"
 version = "0.1.16"
@@ -4682,7 +4675,6 @@ dependencies = [
  "object 0.26.2",
  "panic_abort",
  "panic_unwind",
- "profiler_builtins",
  "rand 0.7.3",
  "rustc-demangle",
  "std_detect",
diff --git a/compiler/rustc_feature/src/builtin_attrs.rs b/compiler/rustc_feature/src/builtin_attrs.rs
@@ -578,7 +578,7 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
     ),
     gated!(
         profiler_runtime, Normal, template!(Word), WarnFollowing,
-        "the `#[profiler_runtime]` attribute is used to identify the `profiler_builtins` crate \
+        "the `#[profiler_runtime]` attribute is used to identify the crate \
         which contains the profiler runtime and will never be stable",
     ),
 
diff --git a/compiler/rustc_metadata/src/creader.rs b/compiler/rustc_metadata/src/creader.rs
@@ -764,6 +764,7 @@ impl<'a> CrateLoader<'a> {
             || !(self.sess.instrument_coverage()
                 || self.sess.opts.unstable_opts.profile
                 || self.sess.opts.cg.profile_generate.enabled())
+            || self.sess.opts.unstable_opts.profiler_runtime == "profiler_builtins"
         {
             return;
         }
diff --git a/compiler/rustc_metadata/src/rmeta/decoder.rs b/compiler/rustc_metadata/src/rmeta/decoder.rs
@@ -1509,7 +1509,6 @@ impl<'a, 'tcx> CrateMetadataRef<'a> {
                                     "proc_macro",
                                     "panic_abort",
                                     "panic_unwind",
-                                    "profiler_builtins",
                                     "rtstartup",
                                     "rustc-std-workspace-core",
                                     "rustc-std-workspace-alloc",
diff --git a/compiler/rustc_session/src/options.rs b/compiler/rustc_session/src/options.rs
@@ -1423,7 +1423,7 @@ options! {
     no_parallel_llvm: bool = (false, parse_no_flag, [UNTRACKED],
         "run LLVM in non-parallel mode (while keeping codegen-units and ThinLTO)"),
     no_profiler_runtime: bool = (false, parse_no_flag, [TRACKED],
-        "prevent automatic injection of the profiler_builtins crate"),
+        "prevent automatic injection of the profiler runtime"),
     no_unique_section_names: bool = (false, parse_bool, [TRACKED],
         "do not use unique names for text and data sections when -Z function-sections is used"),
     normalize_docs: bool = (false, parse_bool, [TRACKED],
diff --git a/library/profiler_builtins/Cargo.toml b/library/profiler_builtins/Cargo.toml
diff --git a/library/profiler_builtins/build.rs b/library/profiler_builtins/build.rs
diff --git a/library/profiler_builtins/src/lib.rs b/library/profiler_builtins/src/lib.rs
diff --git a/library/std/Cargo.toml b/library/std/Cargo.toml
@@ -17,7 +17,6 @@ panic_abort = { path = "../panic_abort" }
 core = { path = "../core" }
 libc = { version = "0.2.126", default-features = false, features = ['rustc-dep-of-std'] }
 compiler_builtins = { version = "0.1.73" }
-profiler_builtins = { path = "../profiler_builtins", optional = true }
 unwind = { path = "../unwind" }
 hashbrown = { version = "0.12", default-features = false, features = ['rustc-dep-of-std'] }
 std_detect = { path = "../stdarch/crates/std_detect", default-features = false, features = ['rustc-dep-of-std'] }
@@ -57,7 +56,7 @@ backtrace = [
 gimli-symbolize = []
 
 panic-unwind = ["panic_unwind"]
-profiler = ["profiler_builtins"]
+profiler = []
 compiler-builtins-c = ["alloc/compiler-builtins-c"]
 compiler-builtins-mem = ["alloc/compiler-builtins-mem"]
 compiler-builtins-no-asm = ["alloc/compiler-builtins-no-asm"]
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
@@ -406,7 +406,7 @@ impl<'a> ShouldRun<'a> {
     /// `all_krates` should probably be removed at some point.
     pub fn all_krates(mut self, name: &str) -> Self {
         let mut set = BTreeSet::new();
-        for krate in self.builder.in_tree_crates(name, None) {
+        for krate in self.builder.in_tree_crates(name) {
             let path = krate.local_path(self.builder);
             set.insert(TaskPath { path, kind: Some(self.kind) });
         }
@@ -419,7 +419,7 @@ impl<'a> ShouldRun<'a> {
     ///
     /// `make_run` will be called a single time with all matching command-line paths.
     pub fn crate_or_deps(self, name: &str) -> Self {
-        let crates = self.builder.in_tree_crates(name, None);
+        let crates = self.builder.in_tree_crates(name);
         self.crates(crates)
     }
 
diff --git a/src/bootstrap/check.rs b/src/bootstrap/check.rs
@@ -152,7 +152,7 @@ impl Step for Std {
         // Explicitly pass -p for all dependencies krates -- this will force cargo
         // to also check the tests/benches/examples for these crates, rather
         // than just the leaf crate.
-        for krate in builder.in_tree_crates("test", Some(target)) {
+        for krate in builder.in_tree_crates("test") {
             cargo.arg("-p").arg(krate.name);
         }
 
@@ -228,7 +228,7 @@ impl Step for Rustc {
         // Explicitly pass -p for all compiler krates -- this will force cargo
         // to also check the tests/benches/examples for these crates, rather
         // than just the leaf crate.
-        for krate in builder.in_tree_crates("rustc-main", Some(target)) {
+        for krate in builder.in_tree_crates("rustc-main") {
             cargo.arg("-p").arg(krate.name);
         }
 
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
@@ -327,8 +327,6 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car
 
         builder.update_submodule(&Path::new("src").join("llvm-project"));
         let compiler_builtins_root = builder.src.join("src/llvm-project/compiler-rt");
-        // Note that `libprofiler_builtins/build.rs` also computes this so if
-        // you're changing something here please also change that.
         cargo.env("RUST_COMPILER_RT_ROOT", &compiler_builtins_root);
         " compiler-builtins-c"
     } else {
@@ -617,7 +615,7 @@ impl Step for Rustc {
     const DEFAULT: bool = false;
 
     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
-        let mut crates = run.builder.in_tree_crates("rustc-main", None);
+        let mut crates = run.builder.in_tree_crates("rustc-main");
         for (i, krate) in crates.iter().enumerate() {
             if krate.name == "rustc-main" {
                 crates.swap_remove(i);
diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs
@@ -709,9 +709,9 @@ impl Step for Rustc {
             paths.into_iter().map(|p| builder.crate_paths[p]).collect()
         };
         // Find dependencies for top level crates.
-        let compiler_crates = root_crates.iter().flat_map(|krate| {
-            builder.in_tree_crates(krate, Some(target)).into_iter().map(|krate| krate.name)
-        });
+        let compiler_crates = root_crates
+            .iter()
+            .flat_map(|krate| builder.in_tree_crates(krate).into_iter().map(|krate| krate.name));
 
         let mut to_open = None;
         for krate in compiler_crates {
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
@@ -1368,7 +1368,7 @@ impl Build {
     /// Returns a Vec of all the dependencies of the given root crate,
     /// including transitive dependencies and the root itself. Only includes
     /// "local" crates (those in the local source tree, not from a registry).
-    fn in_tree_crates(&self, root: &str, target: Option<TargetSelection>) -> Vec<&Crate> {
+    fn in_tree_crates(&self, root: &str) -> Vec<&Crate> {
         let mut ret = Vec::new();
         let mut list = vec![INTERNER.intern_str(root)];
         let mut visited = HashSet::new();
@@ -1386,10 +1386,6 @@ impl Build {
                 // the future, we may want to consider just filtering all
                 // build and dev dependencies in metadata::build.
                 if visited.insert(dep)
-                    && (dep != "profiler_builtins"
-                        || target
-                            .map(|t| self.config.profiler_enabled(t))
-                            .unwrap_or_else(|| self.config.any_profiler_enabled()))
                     && (dep != "rustc_codegen_llvm" || self.config.llvm_enabled())
                 {
                     list.push(*dep);
diff --git a/src/doc/unstable-book/src/library-features/profiler-runtime-lib.md b/src/doc/unstable-book/src/library-features/profiler-runtime-lib.md
diff --git a/src/test/rustdoc-ui/z-help.stdout b/src/test/rustdoc-ui/z-help.stdout
@@ -94,7 +94,7 @@
     -Z                           no-leak-check=val -- disable the 'leak check' for subtyping; unsound, but useful for tests
     -Z                                 no-link=val -- compile without linking
     -Z                        no-parallel-llvm=val -- run LLVM in non-parallel mode (while keeping codegen-units and ThinLTO)
-    -Z                     no-profiler-runtime=val -- prevent automatic injection of the profiler_builtins crate
+    -Z                     no-profiler-runtime=val -- prevent automatic injection of the profiler runtime
     -Z                 no-unique-section-names=val -- do not use unique names for text and data sections when -Z function-sections is used
     -Z                          normalize-docs=val -- normalize associated items in rustdoc when generating documentation
     -Z                                     oom=val -- panic strategy for out-of-memory handling
@@ -123,7 +123,7 @@
     -Z                        profile-closures=val -- profile size of closures
     -Z                            profile-emit=val -- file path to emit profiling data at runtime when using 'profile' (default based on relative source path)
     -Z                      profile-sample-use=val -- use the given `.prof` file for sampled profile-guided optimization (also known as AutoFDO)
-    -Z                        profiler-runtime=val -- name of the profiler runtime crate to automatically inject (default: `profiler_builtins`)
+    -Z                        profiler-runtime=val -- name of the profiler runtime crate to automatically inject
     -Z                         query-dep-graph=val -- enable queries of the dependency graph for regression testing (default: no)
     -Z                        randomize-layout=val -- randomize the layout of types (default: no)
     -Z                   relax-elf-relocations=val -- whether ELF relocations can be relaxed
diff --git a/src/test/ui/feature-gates/feature-gate-profiler-runtime.stderr b/src/test/ui/feature-gates/feature-gate-profiler-runtime.stderr
@@ -1,4 +1,4 @@
-error[E0658]: the `#[profiler_runtime]` attribute is used to identify the `profiler_builtins` crate which contains the profiler runtime and will never be stable
+error[E0658]: the `#[profiler_runtime]` attribute is used to identify the crate which contains the profiler runtime and will never be stable
   --> $DIR/feature-gate-profiler-runtime.rs:1:1
    |
 LL | #![profiler_runtime]
diff --git a/src/tools/rust-analyzer/crates/ide-db/src/generated/lints.rs b/src/tools/rust-analyzer/crates/ide-db/src/generated/lints.rs
@@ -3722,15 +3722,6 @@ This feature is internal to the Rust compiler and is not intended for general us
 
 The tracking issue for this feature is: [#42524](https://github.com/rust-lang/rust/issues/42524).
 
-------------------------
-"##,
-    },
-    Lint {
-        label: "profiler_runtime_lib",
-        description: r##"# `profiler_runtime_lib`
-
-This feature is internal to the Rust compiler and is not intended for general use.
-
 ------------------------
 "##,
     },

Original file line number	Diff line number	Diff line change
`@@ -764,6 +764,7 @@ impl<'a> CrateLoader<'a> {`
`764`	`764`	`\|\| !(self.sess.instrument_coverage()`
`765`	`765`	`\|\| self.sess.opts.unstable_opts.profile`
`766`	`766`	`\|\| self.sess.opts.cg.profile_generate.enabled())`
	`767`	`+ \|\| self.sess.opts.unstable_opts.profiler_runtime == "profiler_builtins"`
`767`	`768`	`{`
`768`	`769`	`return;`
`769`	`770`	`}`