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

Move is_const_fn to under TyCtxt

Browse Source
This commit is contained in:
Deadbeef
2021-09-15 10:03:03 +00:00
parent cdeba02ff7
commit d3f981b144
6 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/rustc_const_eval/src/transform/promote_consts.rs
View File

@@ -26,7 +26,6 @@ use rustc_index::vec::{Idx, IndexVec};
use std::cell::Cell;
use std::{cmp, iter, mem};
use crate::const_eval::{is_const_fn, is_unstable_const_fn};
use crate::transform::check_consts::{is_lang_panic_fn, qualifs, ConstCx};
use crate::transform::MirPass;
@@ -656,8 +655,7 @@ impl<'tcx> Validator<'_, 'tcx> {
let is_const_fn = match *fn_ty.kind() {
ty::FnDef(def_id, _) => {
is_const_fn(self.tcx, def_id)
|| is_unstable_const_fn(self.tcx, def_id).is_some()
self.tcx.is_const_fn_raw(def_id)
|| is_lang_panic_fn(self.tcx, def_id)
}
_ => false,
@@ -1079,7 +1077,7 @@ pub fn is_const_fn_in_array_repeat_expression<'tcx>(
if let ty::FnDef(def_id, _) = *literal.ty().kind() {
if let Some((destination_place, _)) = destination {
if destination_place == place {
if is_const_fn(ccx.tcx, def_id) {
if ccx.tcx.is_const_fn(def_id) {
return true;
}
}