diff options
| author | Thomas Schwinge <tschwinge@baylibre.com> | 2024-03-19 16:45:47 +0100 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@baylibre.com> | 2024-03-19 16:46:40 +0100 |
| commit | 136c428abb4be874a3302e80a513301f298d3c70 (patch) | |
| tree | b9628be7f47c506e0a1bdc0ba11f2d13d6b09f9a /gcc/rust/resolve/rust-ast-resolve-expr.cc | |
| parent | d374f52a692c1a717328280b254b4ed860195b89 (diff) | |
| parent | 8fc4e6c397e1ce64bec6f9fed148950821cc79e7 (diff) | |
| download | gcc-136c428abb4be874a3302e80a513301f298d3c70.zip gcc-136c428abb4be874a3302e80a513301f298d3c70.tar.gz gcc-136c428abb4be874a3302e80a513301f298d3c70.tar.bz2 | |
Merge commit '8fc4e6c397e1ce64bec6f9fed148950821cc79e7' into HEAD
Accordingly also adjust #2086 "break rust 💥" code, to avoid:
[...]/source-gcc/gcc/rust/resolve/rust-ast-resolve-expr.cc: In member function ‘virtual void Rust::Resolver::ResolveExpr::visit(Rust::AST::IdentifierExpr&)’:
[...]/source-gcc/gcc/rust/resolve/rust-ast-resolve-expr.cc:164:42: error: invalid conversion from ‘void (*)(diagnostic_context*, diagnostic_info*, diagnostic_t)’ to ‘diagnostic_finalizer_fn’ {aka ‘void (*)(diagnostic_context*, con
iagnostic_info*, diagnostic_t)’} [-fpermissive]
164 | diagnostic_finalizer (global_dc) = funny_ice_finalizer;
| ^~~~~~~~~~~~~~~~~~~
| |
| void (*)(diagnostic_context*, diagnostic_info*, diagnostic_t)
Diffstat (limited to 'gcc/rust/resolve/rust-ast-resolve-expr.cc')
| -rw-r--r-- | gcc/rust/resolve/rust-ast-resolve-expr.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/rust/resolve/rust-ast-resolve-expr.cc b/gcc/rust/resolve/rust-ast-resolve-expr.cc index d42e7fe..1bb3fc6 100644 --- a/gcc/rust/resolve/rust-ast-resolve-expr.cc +++ b/gcc/rust/resolve/rust-ast-resolve-expr.cc @@ -131,8 +131,8 @@ ResolveExpr::visit (AST::AssignmentExpr &expr) the default bug reporting instructions, as there is no bug to report. */ static void ATTRIBUTE_NORETURN -funny_ice_finalizer (diagnostic_context *context, diagnostic_info *diagnostic, - diagnostic_t diag_kind) +funny_ice_finalizer (diagnostic_context *context, + const diagnostic_info *diagnostic, diagnostic_t diag_kind) { gcc_assert (diag_kind == DK_ICE_NOBT); default_diagnostic_finalizer (context, diagnostic, diag_kind); |