From: Jakub Dupak <dev@jakubdupak.com>
gcc/rust/ChangeLog:
* typecheck/rust-tyty.cc (BaseType::BaseType): Store orig ref.
(BaseType::get_orig_ref): Add getter.
* typecheck/rust-tyty.h: Store orig ref.
Signed-off-by: Jakub Dupak <dev@jakubdupak.com>
---
gcc/rust/typecheck/rust-tyty.cc | 10 ++++++++--
gcc/rust/typecheck/rust-tyty.h | 3 +++
2 files changed, 11 insertions(+), 2 deletions(-)
@@ -140,14 +140,15 @@ is_primitive_type_kind (TypeKind kind)
BaseType::BaseType (HirId ref, HirId ty_ref, TypeKind kind, RustIdent ident,
std::set<HirId> refs)
: TypeBoundsMappings ({}), kind (kind), ref (ref), ty_ref (ty_ref),
- combined (refs), ident (ident), mappings (Analysis::Mappings::get ())
+ orig_ref (ref), combined (refs), ident (ident),
+ mappings (Analysis::Mappings::get ())
{}
BaseType::BaseType (HirId ref, HirId ty_ref, TypeKind kind, RustIdent ident,
std::vector<TypeBoundPredicate> specified_bounds,
std::set<HirId> refs)
: TypeBoundsMappings (specified_bounds), kind (kind), ref (ref),
- ty_ref (ty_ref), combined (refs), ident (ident),
+ ty_ref (ty_ref), orig_ref (ref), combined (refs), ident (ident),
mappings (Analysis::Mappings::get ())
{}
@@ -178,6 +179,11 @@ BaseType::set_ty_ref (HirId id)
{
ty_ref = id;
}
+HirId
+BaseType::get_orig_ref () const
+{
+ return orig_ref;
+}
bool
BaseType::is_equal (const BaseType &other) const
@@ -99,6 +99,8 @@ public:
HirId get_ty_ref () const;
void set_ty_ref (HirId id);
+ HirId get_orig_ref () const;
+
virtual void accept_vis (TyVisitor &vis) = 0;
virtual void accept_vis (TyConstVisitor &vis) const = 0;
@@ -243,6 +245,7 @@ protected:
TypeKind kind;
HirId ref;
HirId ty_ref;
+ const HirId orig_ref;
std::set<HirId> combined;
RustIdent ident;