diff options
| author | Philip Herron <herron.philip@googlemail.com> | 2025-03-27 17:27:56 +0000 |
|---|---|---|
| committer | Philip Herron <philip.herron@embecosm.com> | 2025-03-27 18:19:43 +0000 |
| commit | 898d55ad7e2ae64a0184d736f29a1184a29867c3 (patch) | |
| tree | 43270c0b3788a3cbc0439ecec2e6d227a8902e74 /gcc/rust/backend | |
| parent | 08bfb3550e76b14d6cb6e6eb1478bff79bacf091 (diff) | |
| download | gcc-898d55ad7e2ae64a0184d736f29a1184a29867c3.zip gcc-898d55ad7e2ae64a0184d736f29a1184a29867c3.tar.gz gcc-898d55ad7e2ae64a0184d736f29a1184a29867c3.tar.bz2 | |
gccrs: Fix ICE during const expr eval on array expressions
Array expressions are still getting turned into VIEW_CONVERT_EXPR's becuase
TYPE_MAIN_VARIANT is not set so then we might as well reuse the type-hasher
to sort this out.
Fixes Rust-GCC#3588
gcc/rust/ChangeLog:
* backend/rust-compile-context.h: only push named types
* backend/rust-compile-type.cc (TyTyResolveCompile::visit): run the type hasher
gcc/testsuite/ChangeLog:
* rust/compile/issue-3588.rs: New test.
Signed-off-by: Philip Herron <herron.philip@googlemail.com>
Diffstat (limited to 'gcc/rust/backend')
| -rw-r--r-- | gcc/rust/backend/rust-compile-context.h | 5 | ||||
| -rw-r--r-- | gcc/rust/backend/rust-compile-type.cc | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/rust/backend/rust-compile-context.h b/gcc/rust/backend/rust-compile-context.h index 18d27f4..22e6e19 100644 --- a/gcc/rust/backend/rust-compile-context.h +++ b/gcc/rust/backend/rust-compile-context.h @@ -72,7 +72,10 @@ public: return it->second; compiled_type_map.insert ({h, type}); - push_type (type); + + if (TYPE_NAME (type) != NULL) + push_type (type); + return type; } diff --git a/gcc/rust/backend/rust-compile-type.cc b/gcc/rust/backend/rust-compile-type.cc index 0ab9e42..5be2b9e 100644 --- a/gcc/rust/backend/rust-compile-type.cc +++ b/gcc/rust/backend/rust-compile-type.cc @@ -481,6 +481,8 @@ TyTyResolveCompile::visit (const TyTy::ArrayType &type) tree folded_capacity_expr = fold_expr (capacity_expr); translated = Backend::array_type (element_type, folded_capacity_expr); + if (translated != error_mark_node) + translated = ctx->insert_compiled_type (translated); } void |