diff options
| author | Michael Woerister <michaelwoerister@posteo> | 2019-05-21 13:41:44 +0200 |
|---|---|---|
| committer | Michael Woerister <michaelwoerister@posteo> | 2019-05-21 13:48:29 +0200 |
| commit | 46e3d04b2baab130be52dc2b3a26085b3582f8ba (patch) | |
| tree | 155c9d0261bb0a88b6c6b4336df4a759bd91c91a | |
| parent | c2e49bf1a279ec704bfe39fa149b64783454d72d (diff) | |
| download | rust-46e3d04b2baab130be52dc2b3a26085b3582f8ba.tar.gz rust-46e3d04b2baab130be52dc2b3a26085b3582f8ba.zip | |
debuginfo: Revert to old/more verbose behavior for -Cdebuginfo=1.
https://github.com/rust-lang/rust/commit/cff075009 made LLVM emit less debuginfo when compiling with "line-tables-only". The change was essentially correct but the reduced amount of debuginfo broke a number of tools. This commit reverts the change so we get back the old behavior, until we figure out how to do this properly and give external tools to adapt to the new format. See https://github.com/rust-lang/rust/issues/60020 for more info.
| -rw-r--r-- | src/librustc_codegen_llvm/debuginfo/metadata.rs | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/src/librustc_codegen_llvm/debuginfo/metadata.rs b/src/librustc_codegen_llvm/debuginfo/metadata.rs index 9bdce37b8ba..13590faa123 100644 --- a/src/librustc_codegen_llvm/debuginfo/metadata.rs +++ b/src/librustc_codegen_llvm/debuginfo/metadata.rs @@ -31,7 +31,7 @@ use rustc::ty::{self, AdtKind, ParamEnv, Ty, TyCtxt}; use rustc::ty::layout::{self, Align, Integer, IntegerExt, LayoutOf, PrimitiveExt, Size, TyLayout, VariantIdx}; use rustc::ty::subst::UnpackedKind; -use rustc::session::config; +use rustc::session::config::{self, DebugInfo}; use rustc::util::nodemap::FxHashMap; use rustc_fs_util::path_to_c_string; use rustc_data_structures::small_c_str::SmallCStr; @@ -925,7 +925,26 @@ pub fn compile_unit_metadata(tcx: TyCtxt<'_, '_, '_>, let producer = CString::new(producer).unwrap(); let flags = "\0"; let split_name = "\0"; - let kind = DebugEmissionKind::from_generic(tcx.sess.opts.debuginfo); + + // FIXME(#60020): + // + // This should actually be + // + // ``` + // let kind = DebugEmissionKind::from_generic(tcx.sess.opts.debuginfo); + // ``` + // + // that is, we should set LLVM's emission kind to `LineTablesOnly` if + // we are compiling with "limited" debuginfo. However, some of the + // existing tools relied on slightly more debuginfo being generated than + // would be the case with `LineTablesOnly`, and we did not want to break + // these tools in a "drive-by fix", without a good idea or plan about + // what limited debuginfo should exactly look like. So for now we keep + // the emission kind as `FullDebug`. + // + // See https://github.com/rust-lang/rust/issues/60020 for details. + let kind = DebugEmissionKind::FullDebug; + assert!(tcx.sess.opts.debuginfo != DebugInfo::None); unsafe { let file_metadata = llvm::LLVMRustDIBuilderCreateFile( |