aboutsummaryrefslogtreecommitdiff
path: root/gcc/rust/backend/rust-compile-expr.h
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2021-08-26 01:36:09 +0200
committerMark Wielaard <mark@klomp.org>2021-08-26 21:03:20 +0200
commitf9e5e530391d9a98b7c965b79bebf305d2630ad7 (patch)
tree5b21a3e1a29b6df29649ea993cb79434fe86d906 /gcc/rust/backend/rust-compile-expr.h
parent40042ce11fc5d7f62e31be99e82bf6a0db83234a (diff)
downloadgcc-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/backend/rust-compile-expr.h')
-rw-r--r--gcc/rust/backend/rust-compile-expr.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/rust/backend/rust-compile-expr.h b/gcc/rust/backend/rust-compile-expr.h
index 80cdc5e..ac33ccd 100644
--- a/gcc/rust/backend/rust-compile-expr.h
+++ b/gcc/rust/backend/rust-compile-expr.h
@@ -611,7 +611,7 @@ public:
if (!ctx->get_tyctx ()->lookup_type (
expr.get_receiver_expr ()->get_mappings ().get_hirid (), &receiver))
{
- rust_error_at (expr.get_receiver_expr ()->get_locus_slow (),
+ rust_error_at (expr.get_receiver_expr ()->get_locus (),
"unresolved type for receiver");
return;
}
@@ -772,7 +772,7 @@ public:
Bvariable *loop_result_holder = ctx->peek_loop_context ();
Bexpression *result_reference = ctx->get_backend ()->var_expression (
- loop_result_holder, expr.get_expr ()->get_locus_slow ());
+ loop_result_holder, expr.get_expr ()->get_locus ());
Bstatement *assignment = ctx->get_backend ()->assignment_statement (
fnctx.fndecl, result_reference, compiled_expr, expr.get_locus ());