mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace potential ICE with graceful error (no_core only)

Browse Source
This commit is contained in:
Lukas Markeffsky 2022-11-11 10:01:06 +01:00
parent 8a6053618f
commit 60f352fd7d
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
compiler/rustc_const_eval/src/const_eval/machine.rs
View File

@ -1,4 +1,5 @@
use rustc_hir::def::DefKind; use rustc_hir::def::DefKind;
use rustc_hir::LangItem;
use rustc_middle::mir; use rustc_middle::mir;
use rustc_middle::mir::interpret::PointerArithmetic; use rustc_middle::mir::interpret::PointerArithmetic;
use rustc_middle::ty::layout::LayoutOf; use rustc_middle::ty::layout::LayoutOf;
@ -178,9 +179,7 @@ impl<'mir, 'tcx: 'mir> CompileTimeEvalContext<'mir, 'tcx> {
return Err(ConstEvalErrKind::Panic { msg, file, line, col }.into()); return Err(ConstEvalErrKind::Panic { msg, file, line, col }.into());
} else if Some(def_id) == self.tcx.lang_items().panic_fmt() { } else if Some(def_id) == self.tcx.lang_items().panic_fmt() {
// For panic_fmt, call const_panic_fmt instead. // For panic_fmt, call const_panic_fmt instead.
let Some(const_def_id) = self.tcx.lang_items().const_panic_fmt() else { let const_def_id = self.tcx.require_lang_item(LangItem::ConstPanicFmt, None);
bug!("`const_panic_fmt` must be defined to call `panic_fmt` in const eval")
};
let new_instance = ty::Instance::resolve( let new_instance = ty::Instance::resolve(
*self.tcx, *self.tcx,
ty::ParamEnv::reveal_all(), ty::ParamEnv::reveal_all(),