diff options
| author | bors <bors@rust-lang.org> | 2022-05-29 08:20:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-05-29 08:20:13 +0000 |
| commit | 0f06824013761ed6829887019033f1001e68f623 (patch) | |
| tree | f509b63cc8fe6c83d8157c1040810a481199ccb2 /compiler/rustc_codegen_llvm/src | |
| parent | 303d916867040e269b54adf3cfc7f5c903dc26ff (diff) | |
| parent | 46389159403ca0973bf88a4c153a2707cdb257d2 (diff) | |
| download | rust-0f06824013761ed6829887019033f1001e68f623.tar.gz rust-0f06824013761ed6829887019033f1001e68f623.zip | |
Auto merge of #97287 - compiler-errors:type-interner, r=jackh726,oli-obk
Move things to `rustc_type_ir` Finishes some work proposed in https://github.com/rust-lang/compiler-team/issues/341. r? `@ghost`
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs b/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs index 97d3acb34ce..dd3adbf70a6 100644 --- a/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs +++ b/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs @@ -33,7 +33,7 @@ use rustc_middle::mir::{self, GeneratorLayout}; use rustc_middle::ty::layout::LayoutOf; use rustc_middle::ty::layout::TyAndLayout; use rustc_middle::ty::subst::GenericArgKind; -use rustc_middle::ty::{self, AdtKind, Instance, ParamEnv, Ty, TyCtxt, COMMON_VTABLE_ENTRIES}; +use rustc_middle::ty::{self, AdtKind, Instance, ParamEnv, Ty, TyCtxt}; use rustc_session::config::{self, DebugInfo}; use rustc_span::symbol::Symbol; use rustc_span::FileName; @@ -1392,7 +1392,7 @@ fn build_vtable_type_di_node<'ll, 'tcx>( tcx.vtable_entries(trait_ref) } else { - COMMON_VTABLE_ENTRIES + TyCtxt::COMMON_VTABLE_ENTRIES }; // All function pointers are described as opaque pointers. This could be improved in the future |