diff options
| author | Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de> | 2023-10-10 08:52:21 +0000 |
|---|---|---|
| committer | Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de> | 2024-02-15 10:25:18 +0000 |
| commit | e2386270df9d619bb6d3d62664e89c632baeb6cb (patch) | |
| tree | 98cbb823e890e3de7da9e25f12bf6130daf51f4e /compiler/rustc_metadata | |
| parent | be6ccf13e32e8b4b8d92d14eb555d75377d05e24 (diff) | |
| download | rust-e2386270df9d619bb6d3d62664e89c632baeb6cb.tar.gz rust-e2386270df9d619bb6d3d62664e89c632baeb6cb.zip | |
Return ConstAllocation from eval_static_initializer query directly
Diffstat (limited to 'compiler/rustc_metadata')
| -rw-r--r-- | compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs | 6 | ||||
| -rw-r--r-- | compiler/rustc_metadata/src/rmeta/encoder.rs | 4 | ||||
| -rw-r--r-- | compiler/rustc_metadata/src/rmeta/mod.rs | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs b/compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs index e27a21490d3..178bfc3a380 100644 --- a/compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs +++ b/compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs @@ -250,14 +250,14 @@ provide! { tcx, def_id, other, cdata, fn_arg_names => { table } coroutine_kind => { table_direct } coroutine_for_closure => { table } - eval_static_initializer_raw => { + eval_static_initializer => { Ok(cdata .root .tables - .eval_static_initializer_raw + .eval_static_initializer .get(cdata, def_id.index) .map(|lazy| lazy.decode((cdata, tcx))) - .unwrap_or_else(|| panic!("{def_id:?} does not have eval_static_initializer_raw"))) + .unwrap_or_else(|| panic!("{def_id:?} does not have eval_static_initializer"))) } trait_def => { table } deduced_param_attrs => { table } diff --git a/compiler/rustc_metadata/src/rmeta/encoder.rs b/compiler/rustc_metadata/src/rmeta/encoder.rs index eee8127b055..6f908f7752a 100644 --- a/compiler/rustc_metadata/src/rmeta/encoder.rs +++ b/compiler/rustc_metadata/src/rmeta/encoder.rs @@ -1454,8 +1454,8 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> { } if let DefKind::Static(_) = def_kind { if !self.tcx.is_foreign_item(def_id) { - let data = self.tcx.eval_static_initializer_raw(def_id).unwrap(); - record!(self.tables.eval_static_initializer_raw[def_id] <- data); + let data = self.tcx.eval_static_initializer(def_id).unwrap(); + record!(self.tables.eval_static_initializer[def_id] <- data); } } if let DefKind::Enum | DefKind::Struct | DefKind::Union = def_kind { diff --git a/compiler/rustc_metadata/src/rmeta/mod.rs b/compiler/rustc_metadata/src/rmeta/mod.rs index 14e48ea0a40..eac78a3cd7c 100644 --- a/compiler/rustc_metadata/src/rmeta/mod.rs +++ b/compiler/rustc_metadata/src/rmeta/mod.rs @@ -443,7 +443,7 @@ define_tables! { fn_arg_names: Table<DefIndex, LazyArray<Ident>>, coroutine_kind: Table<DefIndex, hir::CoroutineKind>, coroutine_for_closure: Table<DefIndex, RawDefId>, - eval_static_initializer_raw: Table<DefIndex, LazyValue<mir::interpret::AllocId>>, + eval_static_initializer: Table<DefIndex, LazyValue<mir::interpret::ConstAllocation<'static>>>, trait_def: Table<DefIndex, LazyValue<ty::TraitDef>>, trait_item_def_id: Table<DefIndex, RawDefId>, expn_that_defined: Table<DefIndex, LazyValue<ExpnId>>, |