Add support for -Cforce-frame-poiners=non-leaf

This brings the command-line option up to parity with the frame-pointers
field in the json target specs.

Author: jsgf

compiler/rustc_codegen_cranelift/src/lib.rs

@@ -45,6 +45,7 @@ use rustc_middle::dep_graph::{WorkProduct, WorkProductId};
 use rustc_session::config::OutputFilenames;
 use rustc_session::Session;
 use rustc_span::{sym, Symbol};
+use rustc_target::spec::FramePointer;
 
 pub use crate::config::*;
 use crate::prelude::*;
@@ -270,7 +271,10 @@ fn build_isa(sess: &Session, backend_config: &BackendConfig) -> Arc<dyn TargetIs
 
     let preserve_frame_pointer = sess.target.options.frame_pointer
         != rustc_target::spec::FramePointer::MayOmit
-        || matches!(sess.opts.cg.force_frame_pointers, Some(true));
+        || matches!(
+            sess.opts.cg.force_frame_pointers,
+            Some(FramePointer::Always | FramePointer::NonLeaf)
+        );
     flags_builder
         .set("preserve_frame_pointers", if preserve_frame_pointer { "true" } else { "false" })
         .unwrap();

compiler/rustc_codegen_llvm/src/attributes.rs

@@ -108,8 +108,10 @@ pub fn frame_pointer_type_attr<'ll>(cx: &CodegenCx<'ll, '_>) -> Option<&'ll Attr
     let opts = &cx.sess().opts;
     // "mcount" function relies on stack pointer.
     // See <https://sourceware.org/binutils/docs/gprof/Implementation.html>.
-    if opts.unstable_opts.instrument_mcount || matches!(opts.cg.force_frame_pointers, Some(true)) {
-        fp = FramePointer::Always;
+    match (opts.unstable_opts.instrument_mcount, opts.cg.force_frame_pointers) {
+        (true, _) => fp = FramePointer::Always,
+        (_, Some(fp_opt)) => fp = fp_opt,
+        (_, None) => {}
     }
     let attr_value = match fp {
         FramePointer::Always => "all",

compiler/rustc_interface/src/tests.rs

@@ -20,7 +20,8 @@ use rustc_span::source_map::{RealFileLoader, SourceMapInputs};
 use rustc_span::symbol::sym;
 use rustc_span::{FileName, SourceFileHashAlgorithm};
 use rustc_target::spec::{
-    CodeModel, LinkerFlavorCli, MergeFunctions, OnBrokenPipe, PanicStrategy, RelocModel, WasmCAbi,
+    CodeModel, FramePointer, LinkerFlavorCli, MergeFunctions, OnBrokenPipe, PanicStrategy,
+    RelocModel, WasmCAbi,
 };
 use rustc_target::spec::{RelroLevel, SanitizerSet, SplitDebuginfo, StackProtector, TlsModel};
 use std::collections::{BTreeMap, BTreeSet};
@@ -605,7 +606,7 @@ fn test_codegen_options_tracking_hash() {
     tracked!(debug_assertions, Some(true));
     tracked!(debuginfo, DebugInfo::Limited);
     tracked!(embed_bitcode, false);
-    tracked!(force_frame_pointers, Some(false));
+    tracked!(force_frame_pointers, Some(FramePointer::MayOmit));
     tracked!(force_unwind_tables, Some(true));
     tracked!(inline_threshold, Some(0xf007ba11));
     tracked!(instrument_coverage, InstrumentCoverage::Yes);

compiler/rustc_session/src/config.rs

@@ -2913,7 +2913,8 @@ pub(crate) mod dep_tracking {
         CodeModel, MergeFunctions, OnBrokenPipe, PanicStrategy, RelocModel, WasmCAbi,
     };
     use rustc_target::spec::{
-        RelroLevel, SanitizerSet, SplitDebuginfo, StackProtector, TargetTriple, TlsModel,
+        FramePointer, RelroLevel, SanitizerSet, SplitDebuginfo, StackProtector, TargetTriple,
+        TlsModel,
     };
     use std::collections::BTreeMap;
     use std::hash::{DefaultHasher, Hash};
@@ -2970,6 +2971,7 @@ pub(crate) mod dep_tracking {
         RelocModel,
         CodeModel,
         TlsModel,
+        FramePointer,
         InstrumentCoverage,
         CoverageOptions,
         InstrumentXRay,

compiler/rustc_session/src/options.rs

@@ -15,7 +15,7 @@ use rustc_target::spec::{
     CodeModel, LinkerFlavorCli, MergeFunctions, OnBrokenPipe, PanicStrategy, SanitizerSet, WasmCAbi,
 };
 use rustc_target::spec::{
-    RelocModel, RelroLevel, SplitDebuginfo, StackProtector, TargetTriple, TlsModel,
+    FramePointer, RelocModel, RelroLevel, SplitDebuginfo, StackProtector, TargetTriple, TlsModel,
 };
 use std::collections::BTreeMap;
 use std::hash::{DefaultHasher, Hasher};
@@ -395,6 +395,8 @@ mod desc {
     pub const parse_optimization_fuel: &str = "crate=integer";
     pub const parse_dump_mono_stats: &str = "`markdown` (default) or `json`";
     pub const parse_instrument_coverage: &str = parse_bool;
+    pub const parse_force_frame_pointers: &str =
+        "`always` (`yes`, `true`, etc), `never` (`no`, `false`, etc) or `non-leaf`";
     pub const parse_coverage_options: &str = "`block` | `branch` | `mcdc`";
     pub const parse_instrument_xray: &str = "either a boolean (`yes`, `no`, `on`, `off`, etc), or a comma separated list of settings: `always` or `never` (mutually exclusive), `ignore-loops`, `instruction-threshold=N`, `skip-entry`, `skip-exit`";
     pub const parse_unpretty: &str = "`string` or `string=string`";
@@ -1415,6 +1417,21 @@ mod parse {
         true
     }
 
+    pub(crate) fn parse_force_frame_pointers(
+        slot: &mut Option<FramePointer>,
+        v: Option<&str>,
+    ) -> bool {
+        match v {
+            Some("always" | "yes" | "y" | "on" | "true") | None => {
+                *slot = Some(FramePointer::Always)
+            }
+            Some("never" | "false" | "no" | "n" | "off") => *slot = Some(FramePointer::MayOmit),
+            Some("non-leaf") => *slot = Some(FramePointer::NonLeaf),
+            Some(_) => return false,
+        }
+        true
+    }
+
     pub(crate) fn parse_llvm_module_flag(
         slot: &mut Vec<(String, u32, String)>,
         v: Option<&str>,
@@ -1494,7 +1511,7 @@ options! {
         "emit bitcode in rlibs (default: yes)"),
     extra_filename: String = (String::new(), parse_string, [UNTRACKED],
         "extra data to put in each output filename"),
-    force_frame_pointers: Option<bool> = (None, parse_opt_bool, [TRACKED],
+    force_frame_pointers: Option<FramePointer> = (None, parse_force_frame_pointers, [TRACKED],
         "force use of the frame pointers"),
     #[rustc_lint_opt_deny_field_access("use `Session::must_emit_unwind_tables` instead of this field")]
     force_unwind_tables: Option<bool> = (None, parse_opt_bool, [TRACKED],