diff options
| author | jyn <github@jyn.dev> | 2024-10-16 01:14:10 -0400 |
|---|---|---|
| committer | jyn <github@jyn.dev> | 2025-01-20 16:46:00 -0500 |
| commit | 537218afb2b7f6c8ef9793a52b45c73d1dcb4d4c (patch) | |
| tree | 53101f705b0ff888445a6fa4b993853bc1e69349 /compiler/rustc_codegen_ssa/src/back | |
| parent | c0822ed9b8807ff350e24377e9d1999cc28edf0f (diff) | |
make it possible to silence linker warnings with a crate-level attribute
this was slightly complicated because codegen_ssa doesn't have access to a tcx.
Diffstat (limited to 'compiler/rustc_codegen_ssa/src/back')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/back/link.rs | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs index 378b6a50f7f..80758aac134 100644 --- a/compiler/rustc_codegen_ssa/src/back/link.rs +++ b/compiler/rustc_codegen_ssa/src/back/link.rs @@ -15,13 +15,14 @@ use rustc_ast::CRATE_NODE_ID; use rustc_data_structures::fx::{FxIndexMap, FxIndexSet}; use rustc_data_structures::memmap::Mmap; use rustc_data_structures::temp_dir::MaybeTempDir; -use rustc_errors::DiagCtxtHandle; +use rustc_errors::{DiagCtxtHandle, LintDiagnostic}; use rustc_fs_util::{fix_windows_verbatim_for_gcc, try_canonicalize}; use rustc_hir::def_id::{CrateNum, LOCAL_CRATE}; -use rustc_macros::Diagnostic; +use rustc_macros::LintDiagnostic; use rustc_metadata::fs::{METADATA_FILENAME, copy_to_stdout, emit_wrapper_file}; use rustc_metadata::{find_native_static_library, walk_native_lib_search_dirs}; use rustc_middle::bug; +use rustc_middle::lint::lint_level; use rustc_middle::middle::debugger_visualizer::DebuggerVisualizerFile; use rustc_middle::middle::dependency_format::Linkage; use rustc_middle::middle::exported_symbols::SymbolExportKind; @@ -30,6 +31,7 @@ use rustc_session::config::{ OutputType, PrintKind, SplitDwarfKind, Strip, }; use rustc_session::cstore::DllImport; +use rustc_session::lint::builtin::LINKER_MESSAGES; use rustc_session::output::{check_file_is_writeable, invalid_output_for_target, out_filename}; use rustc_session::search_paths::PathKind; use rustc_session::utils::NativeLibKind; @@ -750,7 +752,7 @@ fn link_dwarf_object(sess: &Session, cg_results: &CodegenResults, executable_out } } -#[derive(Diagnostic)] +#[derive(LintDiagnostic)] #[diag(codegen_ssa_linker_output)] /// Translating this is kind of useless. We don't pass translation flags to the linker, so we'd just /// end up with inconsistent languages within the same diagnostic. @@ -1038,6 +1040,13 @@ fn link_natively( sess.dcx().abort_if_errors(); } + let (level, src) = codegen_results.crate_info.lint_levels.linker_messages; + let lint = |msg| { + lint_level(sess, LINKER_MESSAGES, level, src, None, |diag| { + LinkerOutput { inner: msg }.decorate_lint(diag) + }) + }; + if !prog.stderr.is_empty() { // We already print `warning:` at the start of the diagnostic. Remove it from the linker output if present. let stderr = escape_string(&prog.stderr); @@ -1046,12 +1055,10 @@ fn link_natively( .strip_prefix("warning: ") .unwrap_or(&stderr) .replace(": warning: ", ": "); - sess.dcx().emit_warn(LinkerOutput { inner: format!("linker stderr: {stderr}") }); + lint(format!("linker stderr: {stderr}")); } if !prog.stdout.is_empty() && sess.opts.verbose { - sess.dcx().emit_warn(LinkerOutput { - inner: format!("linker stdout: {}", escape_string(&prog.stdout)), - }); + lint(format!("linker stdout: {}", escape_string(&prog.stdout))) } } Err(e) => { |
