diff options
| author | Philip Herron <herron.philip@googlemail.com> | 2025-03-26 17:26:12 +0000 |
|---|---|---|
| committer | Philip Herron <philip.herron@embecosm.com> | 2025-03-27 13:22:39 +0000 |
| commit | 34b0a681598d52de442a0a21c3a7df20bf1485bc (patch) | |
| tree | 9f54054ef7a800f08ba1206b19be6827e5763cb8 /gcc | |
| parent | 6c14a3b702b4fc693705a64674285900b2ec8b47 (diff) | |
| download | gcc-34b0a681598d52de442a0a21c3a7df20bf1485bc.zip gcc-34b0a681598d52de442a0a21c3a7df20bf1485bc.tar.gz gcc-34b0a681598d52de442a0a21c3a7df20bf1485bc.tar.bz2 | |
gccrs: Fix ICE when using super mid way though path
Fixes Rust-GCC#3568
gcc/rust/ChangeLog:
* resolve/rust-ast-resolve-path.cc (ResolvePath::resolve_path): check for super mid path
gcc/testsuite/ChangeLog:
* rust/compile/nr2/exclude: nr2 puts out a different error multiple times
* rust/compile/issue-3568.rs: New test.
Signed-off-by: Philip Herron <herron.philip@googlemail.com>
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/rust/resolve/rust-ast-resolve-path.cc | 6 | ||||
| -rw-r--r-- | gcc/testsuite/rust/compile/issue-3568.rs | 7 | ||||
| -rw-r--r-- | gcc/testsuite/rust/compile/nr2/exclude | 1 |
3 files changed, 14 insertions, 0 deletions
diff --git a/gcc/rust/resolve/rust-ast-resolve-path.cc b/gcc/rust/resolve/rust-ast-resolve-path.cc index b2b1071..530926d 100644 --- a/gcc/rust/resolve/rust-ast-resolve-path.cc +++ b/gcc/rust/resolve/rust-ast-resolve-path.cc @@ -370,6 +370,12 @@ ResolvePath::resolve_path (AST::SimplePath &expr) } else if (segment.is_super_path_seg ()) { + if (!is_first_segment) + { + rust_error_at (segment.get_locus (), + "%<super%> can only be used in start position"); + return UNKNOWN_NODEID; + } if (module_scope_id == crate_scope_id) { rust_error_at (segment.get_locus (), diff --git a/gcc/testsuite/rust/compile/issue-3568.rs b/gcc/testsuite/rust/compile/issue-3568.rs new file mode 100644 index 0000000..222a174 --- /dev/null +++ b/gcc/testsuite/rust/compile/issue-3568.rs @@ -0,0 +1,7 @@ +pub type T = (); +mod foo { + pub use super::T; +} + +pub use foo::super::foo::S as T; +// { dg-error ".super. can only be used in start position" "" { target *-*-* } .-1 } diff --git a/gcc/testsuite/rust/compile/nr2/exclude b/gcc/testsuite/rust/compile/nr2/exclude index 71c2b68..9273bd1 100644 --- a/gcc/testsuite/rust/compile/nr2/exclude +++ b/gcc/testsuite/rust/compile/nr2/exclude @@ -36,4 +36,5 @@ torture/alt_patterns1.rs torture/loop4.rs torture/loop8.rs torture/name_resolve1.rs +issue-3568.rs # please don't delete the trailing newline |