about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-01-03 06:59:52 +0000
committerbors <bors@rust-lang.org>2022-01-03 06:59:52 +0000
commitd367c349ef2dd04ebc876a0cd0b0efa46c18ff12 (patch)
treec913d0f552ce1238351ab99815804418c4bae229 /src
parentb5da80871d5e22401e03ce5ed73200ece8bdc7a6 (diff)
parent137c374c414e26f50fdfe54cfd3d6a672ff25533 (diff)
downloadrust-d367c349ef2dd04ebc876a0cd0b0efa46c18ff12.tar.gz
rust-d367c349ef2dd04ebc876a0cd0b0efa46c18ff12.zip
Auto merge of #92080 - Aaron1011:pattern-ice, r=cjgillot
Move `PatKind::Lit` checking from ast_validation to ast lowering

Fixes #92074

This allows us to insert an `ExprKind::Err` when an invalid expression
is used in a literal pattern, preventing later stages of compilation
from seeing an unexpected literal pattern.
Diffstat (limited to 'src')
-rw-r--r--src/test/ui/match/expr_before_ident_pat.stderr8
-rw-r--r--src/test/ui/pattern/issue-92074-macro-ice.rs36
-rw-r--r--src/test/ui/pattern/issue-92074-macro-ice.stderr35
3 files changed, 75 insertions, 4 deletions
diff --git a/src/test/ui/match/expr_before_ident_pat.stderr b/src/test/ui/match/expr_before_ident_pat.stderr
index 1ac8274ffd5..2bd1b3b9454 100644
--- a/src/test/ui/match/expr_before_ident_pat.stderr
+++ b/src/test/ui/match/expr_before_ident_pat.stderr
@@ -1,14 +1,14 @@
-error: arbitrary expressions aren't allowed in patterns
+error[E0425]: cannot find value `a` in this scope
   --> $DIR/expr_before_ident_pat.rs:12:12
    |
 LL |     funny!(a, a);
-   |            ^
+   |            ^ not found in this scope
 
-error[E0425]: cannot find value `a` in this scope
+error: arbitrary expressions aren't allowed in patterns
   --> $DIR/expr_before_ident_pat.rs:12:12
    |
 LL |     funny!(a, a);
-   |            ^ not found in this scope
+   |            ^
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/pattern/issue-92074-macro-ice.rs b/src/test/ui/pattern/issue-92074-macro-ice.rs
new file mode 100644
index 00000000000..039d3b31444
--- /dev/null
+++ b/src/test/ui/pattern/issue-92074-macro-ice.rs
@@ -0,0 +1,36 @@
+pub enum En {
+    A(Vec<u8>)
+}
+
+fn get_usize() -> usize {
+    0
+}
+
+macro_rules! force_expr {
+    ($e:expr) => { $e }
+}
+
+macro_rules! force_pat {
+    ($a:expr, $b:expr) => { $a..=$b }
+}
+
+macro_rules! make_vec {
+    () => { force_expr!(Vec::new()) } //~ ERROR arbitrary expressions aren't allowed
+}
+
+macro_rules! make_pat {
+    () => { force_pat!(get_usize(), get_usize()) }
+    //~^ ERROR arbitrary expressions aren't allowed
+    //~| ERROR arbitrary expressions aren't allowed
+}
+
+#[allow(unreachable_code)]
+fn f() -> Result<(), impl core::fmt::Debug> {
+    let x: En = loop {};
+
+    assert!(matches!(x, En::A(make_vec!())));
+    assert!(matches!(5, make_pat!()));
+    Ok::<(), &'static str>(())
+}
+
+fn main() {}
diff --git a/src/test/ui/pattern/issue-92074-macro-ice.stderr b/src/test/ui/pattern/issue-92074-macro-ice.stderr
new file mode 100644
index 00000000000..b340afff010
--- /dev/null
+++ b/src/test/ui/pattern/issue-92074-macro-ice.stderr
@@ -0,0 +1,35 @@
+error: arbitrary expressions aren't allowed in patterns
+  --> $DIR/issue-92074-macro-ice.rs:18:25
+   |
+LL |     () => { force_expr!(Vec::new()) }
+   |                         ^^^^^^^^^^
+...
+LL |     assert!(matches!(x, En::A(make_vec!())));
+   |                               ----------- in this macro invocation
+   |
+   = note: this error originates in the macro `make_vec` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: arbitrary expressions aren't allowed in patterns
+  --> $DIR/issue-92074-macro-ice.rs:22:24
+   |
+LL |     () => { force_pat!(get_usize(), get_usize()) }
+   |                        ^^^^^^^^^^^
+...
+LL |     assert!(matches!(5, make_pat!()));
+   |                         ----------- in this macro invocation
+   |
+   = note: this error originates in the macro `make_pat` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: arbitrary expressions aren't allowed in patterns
+  --> $DIR/issue-92074-macro-ice.rs:22:37
+   |
+LL |     () => { force_pat!(get_usize(), get_usize()) }
+   |                                     ^^^^^^^^^^^
+...
+LL |     assert!(matches!(5, make_pat!()));
+   |                         ----------- in this macro invocation
+   |
+   = note: this error originates in the macro `make_pat` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: aborting due to 3 previous errors
+