diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-10-25 15:22:35 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-25 15:22:35 +0000 |
| commit | d2b12ea8895a8539281bd2a87f0e63234c3203c6 (patch) | |
| tree | 15177a00bf9745776d1cba5061fbb1a9badb5ea6 /gcc | |
| parent | aefdb4d0365ce9f010be58afee74f81a1777f29f (diff) | |
| parent | 5d65ef58a991c811f16d35423ca3f2271fd20b7b (diff) | |
| download | gcc-d2b12ea8895a8539281bd2a87f0e63234c3203c6.zip gcc-d2b12ea8895a8539281bd2a87f0e63234c3203c6.tar.gz gcc-d2b12ea8895a8539281bd2a87f0e63234c3203c6.tar.bz2 | |
Merge #768
768: CompileExpr: fix copy pasta error message r=philberty a=mathstuf
Also downgrade from a fatal error to a compilation error.
Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
---
Fixes: #702
Here is a checklist to help you with your PR.
- \[x] GCC development requires copyright assignment or the Developer's Certificate of Origin sign-off, see https://gcc.gnu.org/contribute.html or https://gcc.gnu.org/dco.html
- \[x] Read contributing guidlines
- \[x] `make check-rust` passes locally
- \[x] Run `clang-format` (letting CI handle this)
- \[ ] Added any relevant test cases to `gcc/testsuite/rust/` (I don't see any existing tests that seem to test things like this; it's a gccrs internal error about lookup up the type it seems?)
Co-authored-by: Ben Boeckel <mathstuf@gmail.com>
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/rust/backend/rust-compile-expr.h | 4 |
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 58b6e39..0512373 100644 --- a/gcc/rust/backend/rust-compile-expr.h +++ b/gcc/rust/backend/rust-compile-expr.h @@ -317,8 +317,8 @@ public: if (!ctx->get_tyctx ()->lookup_type ( expr.get_mappings ().get_hirid (), &tyty)) { - rust_fatal_error (expr.get_locus (), - "did not resolve type for this array expr"); + rust_error_at (expr.get_locus (), + "did not resolve type for this byte string"); return; } |