bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Return ConstAllocation from eval_static_initializer query directly

Browse source
This commit is contained in:
Oli Scherer 2023-10-10 08:52:21 +00:00
parent be6ccf13e3
commit e2386270df
18 changed files with 53 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_middle/src/query/erase.rs
View file

@ -277,7 +277,6 @@ trivial! {
rustc_middle::mir::interpret::CtfeProvenance,
rustc_middle::mir::interpret::ErrorHandled,
rustc_middle::mir::interpret::LitToConstError,
rustc_middle::mir::interpret::EvalStaticInitializerRawResult,
rustc_middle::thir::ExprId,
rustc_middle::traits::CodegenObligationError,
rustc_middle::traits::EvaluationResult,
@ -338,6 +337,7 @@ tcx_lifetime! {
rustc_middle::mir::ConstValue,
rustc_middle::mir::interpret::GlobalId,
rustc_middle::mir::interpret::LitToConstInput,
rustc_middle::mir::interpret::EvalStaticInitializerRawResult,
rustc_middle::traits::query::MethodAutoderefStepsResult,
rustc_middle::traits::query::type_op::AscribeUserType,
rustc_middle::traits::query::type_op::Eq,

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

@ -1073,7 +1073,7 @@ rustc_queries! {
}
/// Evaluate a static's initializer, returning the allocation of the initializer's memory.
query eval_static_initializer_raw(key: DefId) -> EvalStaticInitializerRawResult {
query eval_static_initializer(key: DefId) -> EvalStaticInitializerRawResult<'tcx> {
desc { |tcx|
"evaluating initializer of static `{}`",
tcx.def_path_str(key)