diff options
| author | Philip Herron <herron.philip@googlemail.com> | 2023-06-30 22:08:10 +0100 |
|---|---|---|
| committer | Arthur Cohen <arthur.cohen@embecosm.com> | 2024-01-16 18:49:30 +0100 |
| commit | 90f6b7b56b027c229b519a17ed4bda180b54883d (patch) | |
| tree | 5edc5d116d2409dfd5431aaf1c626d5f55560ed4 /gcc/rust/backend/rust-compile-expr.cc | |
| parent | 3913845305f7a20cb3d0b372492716687d823b98 (diff) | |
| download | gcc-90f6b7b56b027c229b519a17ed4bda180b54883d.zip gcc-90f6b7b56b027c229b519a17ed4bda180b54883d.tar.gz gcc-90f6b7b56b027c229b519a17ed4bda180b54883d.tar.bz2 | |
gccrs: fix ICE with inserting autoderef mappings
We were using the call-expr id for the autoderef mappings but this doesn't
work when the call expression itself is part of a coercion-site so this
changes the code to use the call-expression function path expression for
the id instead which will not be duplicated again.
Addresses #2105
gcc/rust/ChangeLog:
* backend/rust-compile-expr.cc (CompileExpr::generate_possible_fn_trait_call): use fnexpr
* typecheck/rust-hir-type-check-expr.cc (TypeCheckExpr::resolve_fn_trait_call): likewise
Signed-off-by: Philip Herron <herron.philip@googlemail.com>
Diffstat (limited to 'gcc/rust/backend/rust-compile-expr.cc')
| -rw-r--r-- | gcc/rust/backend/rust-compile-expr.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gcc/rust/backend/rust-compile-expr.cc b/gcc/rust/backend/rust-compile-expr.cc index eaf4a67..ed425ed 100644 --- a/gcc/rust/backend/rust-compile-expr.cc +++ b/gcc/rust/backend/rust-compile-expr.cc @@ -2893,7 +2893,8 @@ CompileExpr::generate_possible_fn_trait_call (HIR::CallExpr &expr, } // need to apply any autoderef's to the self argument - HirId autoderef_mappings_id = expr.get_mappings ().get_hirid (); + HIR::Expr *fnexpr = expr.get_fnexpr (); + HirId autoderef_mappings_id = fnexpr->get_mappings ().get_hirid (); std::vector<Resolver::Adjustment> *adjustments = nullptr; bool ok = ctx->get_tyctx ()->lookup_autoderef_mappings (autoderef_mappings_id, &adjustments); |