Make 'profile' a stable option

src/doc/unstable-book/src/language-features/profiler-runtime.md

@@ -1,5 +1,5 @@
 # `profiler_runtime`
 
-The tracking issue for this feature is: [#42524](https://github.com/rust-lang/rust/issues/42524).
+This feature is internal to the Rust compiler and is not intended for general use.
 
 ------------------------

src/librustc/session/config.rs

@@ -908,6 +908,8 @@ options! {CodegenOptions, CodegenSetter, basic_codegen_options,
         "set the inlining threshold for"),
     panic: Option<PanicStrategy> = (None, parse_panic_strategy,
         [TRACKED], "panic strategy to compile crate with"),
+    profile: bool = (false, parse_bool, [TRACKED],
+        "insert gcov profiling code"),
 }
 
 options! {DebuggingOptions, DebuggingSetter, basic_debugging_options,
@@ -1065,8 +1067,6 @@ options! {DebuggingOptions, DebuggingSetter, basic_debugging_options,
         "a single extra argument to prepend the linker invocation (can be used several times)"),
     pre_link_args: Option<Vec<String>> = (None, parse_opt_list, [UNTRACKED],
         "extra arguments to prepend to the linker invocation (space separated)"),
-    profile: bool = (false, parse_bool, [TRACKED],
-                     "insert profiling code"),
     relro_level: Option<RelroLevel> = (None, parse_relro_level, [TRACKED],
         "choose which RELRO level to use"),
     nll: bool = (false, parse_bool, [UNTRACKED],

src/librustc_metadata/creader.rs

@@ -843,7 +843,7 @@ impl<'a> CrateLoader<'a> {
     }
 
     fn inject_profiler_runtime(&mut self) {
-        if self.sess.opts.debugging_opts.profile {
+        if self.sess.opts.cg.profile {
             info!("loading profiler");
 
             let symbol = Symbol::intern("profiler_builtins");

src/librustc_trans/back/write.rs

@@ -707,7 +707,7 @@ pub fn start_async_translation(sess: &Session,
         }
     }
 
-    if sess.opts.debugging_opts.profile {
+    if sess.opts.cg.profile {
         modules_config.passes.push("insert-gcov-profiling".to_owned())
     }
 

src/librustc_trans/debuginfo/metadata.rs

@@ -816,7 +816,7 @@ pub fn compile_unit_metadata(scc: &SharedCrateContext,
             0,
             split_name.as_ptr() as *const _);
 
-        if sess.opts.debugging_opts.profile {
+        if sess.opts.cg.profile {
             let cu_desc_metadata = llvm::LLVMRustMetadataAsValue(debug_context.llcontext,
                                                                  unit_metadata);
 

src/test/run-make/profile/Makefile

@@ -2,7 +2,7 @@
 
 all:
 ifeq ($(PROFILER_SUPPORT),1)
-	$(RUSTC) -g -Z profile test.rs
+	$(RUSTC) -g -C profile test.rs
 	$(call RUN,test) || exit 1
 	[ -e "$(TMPDIR)/test.gcno" ] || (echo "No .gcno file"; exit 1)
 	[ -e "$(TMPDIR)/test.gcda" ] || (echo "No .gcda file"; exit 1)