diff options
author | Philip Herron <herron.philip@googlemail.com> | 2023-06-14 12:11:38 +0100 |
---|---|---|
committer | Philip Herron <philip.herron@embecosm.com> | 2023-06-14 15:30:31 +0000 |
commit | b028c7ece2ad67236e55a38b776c0bf70408a53e (patch) | |
tree | 75df66e6a72f5e4d0dc0c0c811ad88239eb1827e | |
parent | d1e10de0014401a1e31ba87003cdcf157439cae3 (diff) | |
download | gcc-b028c7ece2ad67236e55a38b776c0bf70408a53e.zip gcc-b028c7ece2ad67236e55a38b776c0bf70408a53e.tar.gz gcc-b028c7ece2ad67236e55a38b776c0bf70408a53e.tar.bz2 |
gccrs: we can't check the bounds involving empty placeholder types
We use placeholders for assoicated types on traits but if we are unifying
types against a placeholder its not possible to check the bounds as the
placeholder does not have enough information yet at this point to determine
if bounds will or won't be satisfied. That check will occur when associated
types and generics are setup.
Fixes #2036
gcc/rust/ChangeLog:
* typecheck/rust-unify.cc (UnifyRules::go): dont check bounds on placeholders
gcc/testsuite/ChangeLog:
* rust/compile/issue-2036.rs: New test.
Signed-off-by: Philip Herron <herron.philip@googlemail.com>
-rw-r--r-- | gcc/rust/typecheck/rust-unify.cc | 6 | ||||
-rw-r--r-- | gcc/testsuite/rust/compile/issue-2036.rs | 36 |
2 files changed, 41 insertions, 1 deletions
diff --git a/gcc/rust/typecheck/rust-unify.cc b/gcc/rust/typecheck/rust-unify.cc index d7c5c18..ea1b582 100644 --- a/gcc/rust/typecheck/rust-unify.cc +++ b/gcc/rust/typecheck/rust-unify.cc @@ -151,7 +151,11 @@ UnifyRules::go () rtype->debug_str ().c_str ()); // check bounds - bool should_check_bounds = !ltype->is_equal (*rtype); + bool ltype_is_placeholder = ltype->get_kind () == TyTy::TypeKind::PLACEHOLDER; + bool rtype_is_placeholder = rtype->get_kind () == TyTy::TypeKind::PLACEHOLDER; + bool types_equal = ltype->is_equal (*rtype); + bool should_check_bounds + = !types_equal && !(ltype_is_placeholder || rtype_is_placeholder); if (should_check_bounds) { if (ltype->num_specified_bounds () > 0) diff --git a/gcc/testsuite/rust/compile/issue-2036.rs b/gcc/testsuite/rust/compile/issue-2036.rs new file mode 100644 index 0000000..d145975 --- /dev/null +++ b/gcc/testsuite/rust/compile/issue-2036.rs @@ -0,0 +1,36 @@ +trait Hash<H> { + fn hash2(&self, hasher: &H) -> u64; +} + +trait Stream { + fn input(&mut self, bytes: &[u8]); + fn result(&self) -> u64; +} + +trait StreamHasher { + type S: Stream; + fn stream(&self) -> Self::S; +} + +////////////////////////////////////////////////////////////////////////////// + +trait StreamHash<H: StreamHasher>: Hash<H> { + fn input_stream(&self, stream: &mut H::S); +} + +impl<H: StreamHasher> Hash<H> for u8 { + fn hash2(&self, hasher: &H) -> u64 { + let mut stream = hasher.stream(); + self.input_stream(&mut stream); + // { dg-error "type annotations needed" "" { target *-*-* } .-1 } + Stream::result(&stream) + } +} + +impl<H: StreamHasher> StreamHash<H> for u8 { + fn input_stream(&self, stream: &mut H::S) { + Stream::input(stream, &[*self]); + } +} + +fn main() {} |