bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

remove remark filtering on the rust side

Browse source 
now that remarks are filtered before cg_llvm's diagnostic handler callback
is called, we don't need to do the filtering post c++-to-rust conversion
of the diagnostic.
This commit is contained in:
Rémy Rakic 2023-07-14 16:09:04 +00:00
parent 77d01103a3
commit ca5a383fb6
1 changed files with 16 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

39
compiler/rustc_codegen_llvm/src/back/write.rs
View file

@ -382,29 +382,22 @@ unsafe extern "C" fn diagnostic_handler(info: &DiagnosticInfo, user: *mut c_void
} }
llvm::diagnostic::Optimization(opt) => { llvm::diagnostic::Optimization(opt) => {
let enabled = match cgcx.remark { diag_handler.emit_note(FromLlvmOptimizationDiag {
Passes::All => true, filename: &opt.filename,
Passes::Some(ref v) => v.iter().any(|s| *s == opt.pass_name), line: opt.line,
}; column: opt.column,
pass_name: &opt.pass_name,
if enabled { kind: match opt.kind {
diag_handler.emit_note(FromLlvmOptimizationDiag { OptimizationDiagnosticKind::OptimizationRemark => "success",
filename: &opt.filename, OptimizationDiagnosticKind::OptimizationMissed
line: opt.line, | OptimizationDiagnosticKind::OptimizationFailure => "missed",
column: opt.column, OptimizationDiagnosticKind::OptimizationAnalysis
pass_name: &opt.pass_name, | OptimizationDiagnosticKind::OptimizationAnalysisFPCommute
kind: match opt.kind { | OptimizationDiagnosticKind::OptimizationAnalysisAliasing => "analysis",
OptimizationDiagnosticKind::OptimizationRemark => "success", OptimizationDiagnosticKind::OptimizationRemarkOther => "other",
OptimizationDiagnosticKind::OptimizationMissed },
| OptimizationDiagnosticKind::OptimizationFailure => "missed", message: &opt.message,
OptimizationDiagnosticKind::OptimizationAnalysis });
| OptimizationDiagnosticKind::OptimizationAnalysisFPCommute
| OptimizationDiagnosticKind::OptimizationAnalysisAliasing => "analysis",
OptimizationDiagnosticKind::OptimizationRemarkOther => "other",
},
message: &opt.message,
});
}
} }
llvm::diagnostic::PGO(diagnostic_ref) | llvm::diagnostic::Linker(diagnostic_ref) => { llvm::diagnostic::PGO(diagnostic_ref) | llvm::diagnostic::Linker(diagnostic_ref) => {
let message = llvm::build_string(|s| { let message = llvm::build_string(|s| {