diff options
| author | CohenArthur <arthur.cohen@epita.fr> | 2021-11-08 22:44:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-08 22:44:02 +0100 |
| commit | 07fee63db7b06207917849410e12de750bdb646f (patch) | |
| tree | 1bbb8b1cc483cd37180cc3197cc1780fc9824935 /gcc/rust/util/rust-hir-map.cc | |
| parent | d11a50eca3773fb29430db6d3ea3ccc2bb4335fa (diff) | |
| parent | a7c31383def5c499864d61c5d00a1575d1cbff81 (diff) | |
| download | gcc-07fee63db7b06207917849410e12de750bdb646f.zip gcc-07fee63db7b06207917849410e12de750bdb646f.tar.gz gcc-07fee63db7b06207917849410e12de750bdb646f.tar.bz2 | |
Merge pull request #792 from npate012/defid_to_struct
Change DefId type from uint64_t to be struct
Diffstat (limited to 'gcc/rust/util/rust-hir-map.cc')
| -rw-r--r-- | gcc/rust/util/rust-hir-map.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/rust/util/rust-hir-map.cc b/gcc/rust/util/rust-hir-map.cc index e965c23..9e5b509 100644 --- a/gcc/rust/util/rust-hir-map.cc +++ b/gcc/rust/util/rust-hir-map.cc @@ -63,7 +63,7 @@ NodeMapping::get_defid () const DefId NodeMapping::get_defid (CrateNum crate_num, LocalDefId local_defid) { - return ((uint64_t) crate_num << 32) | local_defid; + return DefId{crate_num, local_defid}; } std::string @@ -209,8 +209,8 @@ Mappings::insert_hir_crate (HIR::Crate *crate) void Mappings::insert_defid_mapping (DefId id, HIR::Item *item) { - CrateNum crate_num = (id & DEF_ID_CRATE_MASK) >> 32; - LocalDefId local_def_id = id & DEF_ID_LOCAL_DEF_MASK; + CrateNum crate_num = id.crateNum; + LocalDefId local_def_id = id.localDefId; rust_assert (lookup_defid (id) == nullptr); rust_assert (lookup_local_defid (crate_num, local_def_id) == nullptr); |