diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2023-02-12 16:22:35 +0100 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2023-02-12 16:22:35 +0100 |
| commit | 09e9d996b0a7f12b713807b5d166a014c392b0a2 (patch) | |
| tree | 4b1167984adda7d97edd2db604faf256a542612d | |
| parent | 81007c525482143fdee017545ac44438b37da0e6 (diff) | |
| parent | 95dc11475dac06b5eecd904079de8aa94827a36a (diff) | |
| download | gcc-09e9d996b0a7f12b713807b5d166a014c392b0a2.zip gcc-09e9d996b0a7f12b713807b5d166a014c392b0a2.tar.gz gcc-09e9d996b0a7f12b713807b5d166a014c392b0a2.tar.bz2 | |
Merge commit '95dc11475dac06b5eecd904079de8aa94827a36a' into HEAD [#1619]
Conflicts:
gcc/rust/parse/rust-parse-impl.h
This overrides GCC/Rust #1619 commit db4b399c25fd3c37e52c6b8dbdf6bc9c0f1deb6c
"parser: Fix ICE in closure parsing"
with upstream GCC commit r13-4697-g95dc11475dac06b5eecd904079de8aa94827a36a
"rust: Fix up aarch64-linux bootstrap [PR106072]".
| -rw-r--r-- | gcc/rust/parse/rust-parse-impl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/rust/parse/rust-parse-impl.h b/gcc/rust/parse/rust-parse-impl.h index 0bac0f5..d250ef5 100644 --- a/gcc/rust/parse/rust-parse-impl.h +++ b/gcc/rust/parse/rust-parse-impl.h @@ -9053,8 +9053,8 @@ Parser<ManagedTokenSource>::parse_closure_param () } } - auto locus = pattern->get_locus (); - return AST::ClosureParam (std::move (pattern), locus, std::move (type), + Location loc = pattern->get_locus (); + return AST::ClosureParam (std::move (pattern), loc, std::move (type), std::move (outer_attrs)); } |