diff options
| author | Mark Wielaard <mark@klomp.org> | 2021-08-26 01:36:09 +0200 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2021-08-26 21:03:20 +0200 |
| commit | f9e5e530391d9a98b7c965b79bebf305d2630ad7 (patch) | |
| tree | 5b21a3e1a29b6df29649ea993cb79434fe86d906 /gcc/rust/util/rust-hir-map.cc | |
| parent | 40042ce11fc5d7f62e31be99e82bf6a0db83234a (diff) | |
| download | gcc-f9e5e530391d9a98b7c965b79bebf305d2630ad7.zip gcc-f9e5e530391d9a98b7c965b79bebf305d2630ad7.tar.gz gcc-f9e5e530391d9a98b7c965b79bebf305d2630ad7.tar.bz2 | |
Get rid of get_locus_slow
In various places there was the following hack:
/* HACK: slow way of getting location from base expression through
virtual methods. */
virtual Location get_locus_slow () const { return Location (); }
The problem with get_locus_slow () is that if a subclass didn't
override it then there was no real location. get_locus_slow was
missing for Module, ExternCrate, UseDeclaration, Function, TypeAlias,
StructStruct, TupleStruct, Enum, Union, ConstantItem, StaticItem,
Trait, ImplBlock, ExternBlock, EmptyStmt, ExprStmtWithoutBlock and
ExprStmtWithBlock. All do have a get_locus () function.
Simply replace the get_locus_slow virtual method with a real virtual
Location get_locus () const = 0 method so we know if something
really doesn't have a location. This was only the case for
MacroRulesDefinition.
Diffstat (limited to 'gcc/rust/util/rust-hir-map.cc')
| -rw-r--r-- | gcc/rust/util/rust-hir-map.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/rust/util/rust-hir-map.cc b/gcc/rust/util/rust-hir-map.cc index d544042..deade08 100644 --- a/gcc/rust/util/rust-hir-map.cc +++ b/gcc/rust/util/rust-hir-map.cc @@ -380,7 +380,7 @@ Mappings::insert_hir_expr (CrateNum crateNum, HirId id, HIR::Expr *expr) { hirExprMappings[crateNum][id] = expr; nodeIdToHirMappings[crateNum][expr->get_mappings ().get_nodeid ()] = id; - insert_location (crateNum, id, expr->get_locus_slow ()); + insert_location (crateNum, id, expr->get_locus ()); } HIR::Expr * @@ -430,7 +430,7 @@ Mappings::insert_hir_generic_param (CrateNum crateNum, HirId id, hirGenericParamMappings[crateNum][id] = param; nodeIdToHirMappings[crateNum][param->get_mappings ().get_nodeid ()] = id; - insert_location (crateNum, id, param->get_locus_slow ()); + insert_location (crateNum, id, param->get_locus ()); } HIR::GenericParam * |