diff options
Diffstat (limited to 'gcc/rust/typecheck/rust-type-util.cc')
| -rw-r--r-- | gcc/rust/typecheck/rust-type-util.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gcc/rust/typecheck/rust-type-util.cc b/gcc/rust/typecheck/rust-type-util.cc index eed3ff417c8..05bf7aeb5c7 100644 --- a/gcc/rust/typecheck/rust-type-util.cc +++ b/gcc/rust/typecheck/rust-type-util.cc @@ -33,7 +33,7 @@ namespace Resolver { bool query_type (HirId reference, TyTy::BaseType **result) { - Analysis::Mappings *mappings = Analysis::Mappings::get (); + auto &mappings = Analysis::Mappings::get (); TypeCheckContext *context = TypeCheckContext::get (); if (context->query_in_progress (reference)) @@ -45,7 +45,7 @@ query_type (HirId reference, TyTy::BaseType **result) context->insert_query (reference); std::pair<HIR::Enum *, HIR::EnumItem *> enum_candidiate - = mappings->lookup_hir_enumitem (reference); + = mappings.lookup_hir_enumitem (reference); bool enum_candidiate_ok = enum_candidiate.first != nullptr && enum_candidiate.second != nullptr; if (enum_candidiate_ok) @@ -61,7 +61,7 @@ query_type (HirId reference, TyTy::BaseType **result) return true; } - HIR::Item *item = mappings->lookup_hir_item (reference); + HIR::Item *item = mappings.lookup_hir_item (reference); if (item != nullptr) { rust_debug_loc (item->get_locus (), "resolved item {%u} to", reference); @@ -72,11 +72,11 @@ query_type (HirId reference, TyTy::BaseType **result) HirId parent_impl_id = UNKNOWN_HIRID; HIR::ImplItem *impl_item - = mappings->lookup_hir_implitem (reference, &parent_impl_id); + = mappings.lookup_hir_implitem (reference, &parent_impl_id); if (impl_item != nullptr) { HIR::ImplBlock *impl_block - = mappings->lookup_hir_impl_block (parent_impl_id); + = mappings.lookup_hir_impl_block (parent_impl_id); rust_assert (impl_block != nullptr); // found an impl item @@ -91,7 +91,7 @@ query_type (HirId reference, TyTy::BaseType **result) // is it an impl_type? HIR::ImplBlock *impl_block_by_type = nullptr; bool found_impl_block_type - = mappings->lookup_impl_block_type (reference, &impl_block_by_type); + = mappings.lookup_impl_block_type (reference, &impl_block_by_type); if (found_impl_block_type) { *result = TypeCheckItem::ResolveImplBlockSelf (*impl_block_by_type); @@ -102,11 +102,11 @@ query_type (HirId reference, TyTy::BaseType **result) // is it an extern item? HirId parent_extern_block_id = UNKNOWN_HIRID; HIR::ExternalItem *extern_item - = mappings->lookup_hir_extern_item (reference, &parent_extern_block_id); + = mappings.lookup_hir_extern_item (reference, &parent_extern_block_id); if (extern_item != nullptr) { HIR::ExternBlock *block - = mappings->lookup_hir_extern_block (parent_extern_block_id); + = mappings.lookup_hir_extern_block (parent_extern_block_id); rust_assert (block != nullptr); *result = TypeCheckTopLevelExternItem::Resolve (extern_item, *block); @@ -115,7 +115,7 @@ query_type (HirId reference, TyTy::BaseType **result) } // more? - location_t possible_locus = mappings->lookup_location (reference); + location_t possible_locus = mappings.lookup_location (reference); rust_debug_loc (possible_locus, "query system failed to resolve: [%u]", reference); context->query_completed (reference); |