Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Explicitly checking for or-pattern before test #78856

Merged
merged 3 commits into from
Nov 15, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions compiler/rustc_mir_build/src/build/matches/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -671,6 +671,17 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
(&TestKind::Range { .. }, _) => None,

(&TestKind::Eq { .. } | &TestKind::Len { .. }, _) => {
// The call to `self.test(&match_pair)` below is not actually used to generate any
// MIR. Instead, we just want to compare with `test` (the parameter of the method)
// to see if it is the same.
//
// However, at this point we can still encounter or-patterns that were extracted
// from previous calls to `sort_candidate`, so we need to manually address that
// case to avoid panicking in `self.test()`.
if let PatKind::Or { .. } = &*match_pair.pattern.kind {
return None;
}

// These are all binary tests.
//
// FIXME(#29623) we can be more clever here
Expand Down
65 changes: 65 additions & 0 deletions src/test/ui/match/issue-72680.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
// run-pass

#![feature(or_patterns)]

fn main() {
assert!(f("", 0));
assert!(f("a", 1));
assert!(f("b", 1));

assert!(!f("", 1));
assert!(!f("a", 0));
assert!(!f("b", 0));

assert!(!f("asdf", 32));

////

assert!(!g(true, true, true));
assert!(!g(false, true, true));
assert!(!g(true, false, true));
assert!(!g(false, false, true));
assert!(!g(true, true, false));

assert!(g(false, true, false));
assert!(g(true, false, false));
assert!(g(false, false, false));

////

assert!(!h(true, true, true));
assert!(!h(false, true, true));
assert!(!h(true, false, true));
assert!(!h(false, false, true));
assert!(!h(true, true, false));

assert!(h(false, true, false));
assert!(h(true, false, false));
assert!(h(false, false, false));
}

fn f(s: &str, num: usize) -> bool {
match (s, num) {
("", 0) | ("a" | "b", 1) => true,

_ => false,
}
}

fn g(x: bool, y: bool, z: bool) -> bool {
match (x, y, x, z) {
(true | false, false, true, false) => true,
(false, true | false, true | false, false) => true,
(true | false, true | false, true | false, true) => false,
(true, true | false, true | false, false) => false,
}
}

fn h(x: bool, y: bool, z: bool) -> bool {
match (x, (y, (x, (z,)))) {
(true | false, (false, (true, (false,)))) => true,
(false, (true | false, (true | false, (false,)))) => true,
(true | false, (true | false, (true | false, (true,)))) => false,
(true, (true | false, (true | false, (false,)))) => false,
}
}