Return ConstAllocation from eval_static_initializer query directly

2023-10-10 08:52:21 +00:00
parent be6ccf13e3
commit e2386270df
18 changed files with 53 additions and 82 deletions
--- a/compiler/rustc_middle/src/query/mod.rs
+++ b/compiler/rustc_middle/src/query/mod.rs
@@ -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)