diff options
| author | Philip Herron <herron.philip@googlemail.com> | 2024-09-20 17:38:14 +0100 |
|---|---|---|
| committer | Philip Herron <philip.herron@embecosm.com> | 2024-09-27 11:55:56 +0000 |
| commit | 18422c9c386ca49f8427cdd26a882749603d6da8 (patch) | |
| tree | 3827d8dfce1764e47243a06f273bacb26d102929 | |
| parent | c6a479fb9312b9166ca94a588aa85c9172f5ae19 (diff) | |
| download | gcc-18422c9c386ca49f8427cdd26a882749603d6da8.zip gcc-18422c9c386ca49f8427cdd26a882749603d6da8.tar.gz gcc-18422c9c386ca49f8427cdd26a882749603d6da8.tar.bz2 | |
rust: fix ICE during name resolution for impls on unit-types
The canonical paths need to support unit-types which are technically a
TupleType with no fields. This handles this case and adds an unreachable.
Fixes #3036
gcc/rust/ChangeLog:
* resolve/rust-ast-resolve-type.cc (ResolveTypeToCanonicalPath::visit): add unit-type catch
* resolve/rust-ast-resolve-type.h: likewise
gcc/testsuite/ChangeLog:
* rust/compile/nr2/exclude: nr2 cant handle this
* rust/compile/issue-3036.rs: New test.
Signed-off-by: Philip Herron <herron.philip@googlemail.com>
| -rw-r--r-- | gcc/rust/resolve/rust-ast-resolve-type.cc | 9 | ||||
| -rw-r--r-- | gcc/rust/resolve/rust-ast-resolve-type.h | 2 | ||||
| -rw-r--r-- | gcc/testsuite/rust/compile/issue-3036.rs | 14 | ||||
| -rw-r--r-- | gcc/testsuite/rust/compile/nr2/exclude | 1 |
4 files changed, 26 insertions, 0 deletions
diff --git a/gcc/rust/resolve/rust-ast-resolve-type.cc b/gcc/rust/resolve/rust-ast-resolve-type.cc index e935158..15ae8db 100644 --- a/gcc/rust/resolve/rust-ast-resolve-type.cc +++ b/gcc/rust/resolve/rust-ast-resolve-type.cc @@ -507,6 +507,15 @@ ResolveTypeToCanonicalPath::visit (AST::NeverType &type) result = CanonicalPath::new_seg (type.get_node_id (), "!"); } +void +ResolveTypeToCanonicalPath::visit (AST::TupleType &type) +{ + if (!type.is_unit_type ()) + rust_unreachable (); + + result = CanonicalPath::new_seg (type.get_node_id (), "()"); +} + ResolveTypeToCanonicalPath::ResolveTypeToCanonicalPath () : ResolverBase (), result (CanonicalPath::create_empty ()) {} diff --git a/gcc/rust/resolve/rust-ast-resolve-type.h b/gcc/rust/resolve/rust-ast-resolve-type.h index 1df0f26..50dd890 100644 --- a/gcc/rust/resolve/rust-ast-resolve-type.h +++ b/gcc/rust/resolve/rust-ast-resolve-type.h @@ -248,6 +248,8 @@ public: void visit (AST::NeverType &type) override; + void visit (AST::TupleType &type) override; + private: ResolveTypeToCanonicalPath (); diff --git a/gcc/testsuite/rust/compile/issue-3036.rs b/gcc/testsuite/rust/compile/issue-3036.rs new file mode 100644 index 0000000..4418ccc --- /dev/null +++ b/gcc/testsuite/rust/compile/issue-3036.rs @@ -0,0 +1,14 @@ +#[lang = "sized"] +trait Sized {} + +#[stable(feature = "rust1", since = "1.0.0")] +pub trait Default: Sized { + #[stable(feature = "rust1", since = "1.0.0")] + fn default() -> Self; +} + +impl Default for () { + fn default() -> () { + () + } +} diff --git a/gcc/testsuite/rust/compile/nr2/exclude b/gcc/testsuite/rust/compile/nr2/exclude index bfb51fd..50781e5 100644 --- a/gcc/testsuite/rust/compile/nr2/exclude +++ b/gcc/testsuite/rust/compile/nr2/exclude @@ -252,3 +252,4 @@ issue-3082.rs issue-3139-1.rs issue-3139-2.rs issue-3139-3.rs +issue-3036.rs |