mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Small comment adjustments

Browse source
This commit is contained in:
oli 2020-12-26 14:50:32 +00:00
parent caeb3d525d
commit 9eaec139d0
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
compiler/rustc_middle/src/query/mod.rs
View file

@ -935,7 +935,6 @@ rustc_queries! {
} }
Codegen { Codegen {
// FIXME: remove after figuring out how to make miri able to detect non-Rust function calls
query is_ctfe_mir_available(key: DefId) -> bool { query is_ctfe_mir_available(key: DefId) -> bool {
desc { |tcx| "checking if item has ctfe mir available: `{}`", tcx.def_path_str(key) } desc { |tcx| "checking if item has ctfe mir available: `{}`", tcx.def_path_str(key) }
} }

3
compiler/rustc_mir/src/transform/mod.rs
View file

@ -542,6 +542,9 @@ fn inner_optimized_mir(tcx: TyCtxt<'_>, did: LocalDefId) -> Body<'_> {
} }
match tcx.hir().body_const_context(did) { match tcx.hir().body_const_context(did) {
/// Run the `mir_for_ctfe` query, which depends on `mir_drops_elaborated_and_const_checked`
/// which we are going to steal below. Thus we need to run `mir_for_ctfe` first, so it
/// computes and caches its result.
Some(hir::ConstContext::ConstFn) => tcx.ensure().mir_for_ctfe(did), Some(hir::ConstContext::ConstFn) => tcx.ensure().mir_for_ctfe(did),
None => {} None => {}
Some(other) => panic!("do not use `optimized_mir` for constants: {:?}", other), Some(other) => panic!("do not use `optimized_mir` for constants: {:?}", other),