diff options
| author | pawanbisht62 <36775517+pawanbisht62@users.noreply.github.com> | 2020-08-10 13:19:24 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-10 13:19:24 +0530 |
| commit | 7c4ef37e19c0f9f501c04dd7bb1d5b864f0b6a2b (patch) | |
| tree | db7bfedf0de60ca646cce61f54d70100dccb623c /src/librustc_codegen_llvm/debuginfo | |
| parent | bac939edcf2137f625cfd7b56dfa4aa7b814868f (diff) | |
| parent | 568f6195bbf3c04a601a297a386e0e1dc0ca8333 (diff) | |
| download | rust-7c4ef37e19c0f9f501c04dd7bb1d5b864f0b6a2b.tar.gz rust-7c4ef37e19c0f9f501c04dd7bb1d5b864f0b6a2b.zip | |
Merge branch 'master' into feature/incorporate-tracing
Diffstat (limited to 'src/librustc_codegen_llvm/debuginfo')
| -rw-r--r-- | src/librustc_codegen_llvm/debuginfo/gdb.rs | 7 | ||||
| -rw-r--r-- | src/librustc_codegen_llvm/debuginfo/metadata.rs | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/librustc_codegen_llvm/debuginfo/gdb.rs b/src/librustc_codegen_llvm/debuginfo/gdb.rs index 64d4076cbf0..29edd66049c 100644 --- a/src/librustc_codegen_llvm/debuginfo/gdb.rs +++ b/src/librustc_codegen_llvm/debuginfo/gdb.rs @@ -9,7 +9,6 @@ use rustc_codegen_ssa::traits::*; use rustc_middle::bug; use rustc_session::config::DebugInfo; -use rustc_ast::attr; use rustc_span::symbol::sym; /// Inserts a side-effect free instruction sequence that makes sure that the @@ -61,8 +60,10 @@ pub fn get_or_insert_gdb_debug_scripts_section_global(cx: &CodegenCx<'ll, '_>) - } pub fn needs_gdb_debug_scripts_section(cx: &CodegenCx<'_, '_>) -> bool { - let omit_gdb_pretty_printer_section = - attr::contains_name(&cx.tcx.hir().krate_attrs(), sym::omit_gdb_pretty_printer_section); + let omit_gdb_pretty_printer_section = cx + .tcx + .sess + .contains_name(&cx.tcx.hir().krate_attrs(), sym::omit_gdb_pretty_printer_section); !omit_gdb_pretty_printer_section && cx.sess().opts.debuginfo != DebugInfo::None diff --git a/src/librustc_codegen_llvm/debuginfo/metadata.rs b/src/librustc_codegen_llvm/debuginfo/metadata.rs index 836e490c1d6..f2881355962 100644 --- a/src/librustc_codegen_llvm/debuginfo/metadata.rs +++ b/src/librustc_codegen_llvm/debuginfo/metadata.rs @@ -960,7 +960,7 @@ fn pointer_type_metadata( fn param_type_metadata(cx: &CodegenCx<'ll, 'tcx>, t: Ty<'tcx>) -> &'ll DIType { debug!("param_type_metadata: {:?}", t); let name = format!("{:?}", t); - return unsafe { + unsafe { llvm::LLVMRustDIBuilderCreateBasicType( DIB(cx), name.as_ptr().cast(), @@ -968,7 +968,7 @@ fn param_type_metadata(cx: &CodegenCx<'ll, 'tcx>, t: Ty<'tcx>) -> &'ll DIType { Size::ZERO.bits(), DW_ATE_unsigned, ) - }; + } } pub fn compile_unit_metadata( |