diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2022-07-29 16:27:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-29 16:27:22 +0000 |
| commit | 8809ee8c6a5621e830f3cfe66c381f986e63c7f2 (patch) | |
| tree | e2faec377641b1cadb98f4941339a6d6c38a4c17 /gcc/rust/util/rust-hir-map.h | |
| parent | 2d824b796cde571d270f4c20af8183dbd93614d5 (diff) | |
| parent | f742538d13375aa90ccaa787b06e07835bba5887 (diff) | |
| download | gcc-8809ee8c6a5621e830f3cfe66c381f986e63c7f2.zip gcc-8809ee8c6a5621e830f3cfe66c381f986e63c7f2.tar.gz gcc-8809ee8c6a5621e830f3cfe66c381f986e63c7f2.tar.bz2 | |
Merge #1427
1427: unsafe: Check for unsafe function/method calls r=CohenArthur a=CohenArthur
Addresses #1411
Co-authored-by: Arthur Cohen <arthur.cohen@embecosm.com>
Diffstat (limited to 'gcc/rust/util/rust-hir-map.h')
| -rw-r--r-- | gcc/rust/util/rust-hir-map.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gcc/rust/util/rust-hir-map.h b/gcc/rust/util/rust-hir-map.h index c8cebef..98fcfe6 100644 --- a/gcc/rust/util/rust-hir-map.h +++ b/gcc/rust/util/rust-hir-map.h @@ -115,8 +115,11 @@ public: void insert_hir_trait_item (HIR::TraitItem *item); HIR::TraitItem *lookup_hir_trait_item (HirId id); - void insert_hir_extern_item (HIR::ExternalItem *item); - HIR::ExternalItem *lookup_hir_extern_item (HirId id); + void insert_hir_extern_block (HIR::ExternBlock *block); + HIR::ExternBlock *lookup_hir_extern_block (HirId id); + + void insert_hir_extern_item (HIR::ExternalItem *item, HirId parent_block); + HIR::ExternalItem *lookup_hir_extern_item (HirId id, HirId *parent_block); void insert_hir_impl_block (HIR::ImplBlock *item); HIR::ImplBlock *lookup_hir_impl_block (HirId id); @@ -312,7 +315,8 @@ private: std::map<HirId, HIR::ImplBlock *> hirImplItemsToImplMappings; std::map<HirId, HIR::ImplBlock *> hirImplBlockMappings; std::map<HirId, HIR::TraitItem *> hirTraitItemMappings; - std::map<HirId, HIR::ExternalItem *> hirExternItemMappings; + std::map<HirId, HIR::ExternBlock *> hirExternBlockMappings; + std::map<HirId, std::pair<HIR::ExternalItem *, HirId>> hirExternItemMappings; std::map<HirId, HIR::PathExprSegment *> hirPathSegMappings; std::map<HirId, HIR::GenericParam *> hirGenericParamMappings; std::map<HirId, HIR::Trait *> hirTraitItemsToTraitMappings; |