Skip to content

Commit ca5a383

Browse files
committed
remove remark filtering on the rust side
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.
1 parent 77d0110 commit ca5a383

File tree

1 file changed

+16
-23
lines changed
  • compiler/rustc_codegen_llvm/src/back

1 file changed

+16
-23
lines changed

compiler/rustc_codegen_llvm/src/back/write.rs

+16-23
Original file line numberDiff line numberDiff line change
@@ -382,29 +382,22 @@ unsafe extern "C" fn diagnostic_handler(info: &DiagnosticInfo, user: *mut c_void
382382
}
383383

384384
llvm::diagnostic::Optimization(opt) => {
385-
let enabled = match cgcx.remark {
386-
Passes::All => true,
387-
Passes::Some(ref v) => v.iter().any(|s| *s == opt.pass_name),
388-
};
389-
390-
if enabled {
391-
diag_handler.emit_note(FromLlvmOptimizationDiag {
392-
filename: &opt.filename,
393-
line: opt.line,
394-
column: opt.column,
395-
pass_name: &opt.pass_name,
396-
kind: match opt.kind {
397-
OptimizationDiagnosticKind::OptimizationRemark => "success",
398-
OptimizationDiagnosticKind::OptimizationMissed
399-
| OptimizationDiagnosticKind::OptimizationFailure => "missed",
400-
OptimizationDiagnosticKind::OptimizationAnalysis
401-
| OptimizationDiagnosticKind::OptimizationAnalysisFPCommute
402-
| OptimizationDiagnosticKind::OptimizationAnalysisAliasing => "analysis",
403-
OptimizationDiagnosticKind::OptimizationRemarkOther => "other",
404-
},
405-
message: &opt.message,
406-
});
407-
}
385+
diag_handler.emit_note(FromLlvmOptimizationDiag {
386+
filename: &opt.filename,
387+
line: opt.line,
388+
column: opt.column,
389+
pass_name: &opt.pass_name,
390+
kind: match opt.kind {
391+
OptimizationDiagnosticKind::OptimizationRemark => "success",
392+
OptimizationDiagnosticKind::OptimizationMissed
393+
| OptimizationDiagnosticKind::OptimizationFailure => "missed",
394+
OptimizationDiagnosticKind::OptimizationAnalysis
395+
| OptimizationDiagnosticKind::OptimizationAnalysisFPCommute
396+
| OptimizationDiagnosticKind::OptimizationAnalysisAliasing => "analysis",
397+
OptimizationDiagnosticKind::OptimizationRemarkOther => "other",
398+
},
399+
message: &opt.message,
400+
});
408401
}
409402
llvm::diagnostic::PGO(diagnostic_ref) | llvm::diagnostic::Linker(diagnostic_ref) => {
410403
let message = llvm::build_string(|s| {

0 commit comments

Comments
 (0)