rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

use cherry-picked commit from #100754 to emit note without error

Browse Source
This commit is contained in:
Nathan Stocks
2022-09-22 10:15:51 -06:00
parent f8ebc72b4a
commit 3a748330af
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/rustc_passes/src/weak_lang_items.rs
View File

@@ -8,7 +8,8 @@ use rustc_middle::ty::TyCtxt;
use rustc_session::config::CrateType;
use crate::errors::{
MissingAllocErrorHandler, MissingLangItem, MissingPanicHandler, UnknownExternLangItem,
AllocFuncRequired, MissingAllocErrorHandler, MissingLangItem, MissingPanicHandler,
UnknownExternLangItem,
};
/// Checks the crate for usage of weak lang items, returning a vector of all the
@@ -70,7 +71,8 @@ fn verify<'tcx>(tcx: TyCtxt<'tcx>, items: &lang_items::LanguageItems) {
tcx.sess.emit_err(MissingPanicHandler);
} else if item == LangItem::Oom {
if !tcx.features().default_alloc_error_handler {
tcx.sess.emit_err(MissingAllocErrorHandler);
tcx.sess.emit_err(AllocFuncRequired);
tcx.sess.emit_note(MissingAllocErrorHandler);
}
} else {
tcx.sess.emit_err(MissingLangItem { name: *name });