diff options
| author | Philip Herron <philip.herron@embecosm.com> | 2022-05-21 17:00:51 +0100 |
|---|---|---|
| committer | Philip Herron <philip.herron@embecosm.com> | 2022-05-21 17:00:51 +0100 |
| commit | 93e59035536616ca7b1e9be4a8ed3eeddd0d8fee (patch) | |
| tree | ae7bea4a2b13b1052e7a998104bb6aaff7e1c429 /gcc | |
| parent | 75c9f9f61cb2d69f39d490c47a3b42810c31c1ff (diff) | |
| download | gcc-93e59035536616ca7b1e9be4a8ed3eeddd0d8fee.zip gcc-93e59035536616ca7b1e9be4a8ed3eeddd0d8fee.tar.gz gcc-93e59035536616ca7b1e9be4a8ed3eeddd0d8fee.tar.bz2 | |
Revert "Marklive: support match expr"
This reverts commit 75c9f9f61cb2d69f39d490c47a3b42810c31c1ff. Which was
accidently pushed to master outside of the PR system. No harm done :).
Happy hacking.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/rust/hir/tree/rust-hir-expr.h | 6 | ||||
| -rw-r--r-- | gcc/rust/lint/rust-lint-marklive.h | 15 | ||||
| -rw-r--r-- | gcc/testsuite/rust/compile/match6.rs | 21 |
3 files changed, 0 insertions, 42 deletions
diff --git a/gcc/rust/hir/tree/rust-hir-expr.h b/gcc/rust/hir/tree/rust-hir-expr.h index f6f035e..e585dd2 100644 --- a/gcc/rust/hir/tree/rust-hir-expr.h +++ b/gcc/rust/hir/tree/rust-hir-expr.h @@ -3842,12 +3842,6 @@ public: return match_arm_patterns; } - std::unique_ptr<Expr> &get_guard_expr () - { - rust_assert (has_match_arm_guard ()); - return guard_expr; - } - Location get_locus () const { return locus; } }; diff --git a/gcc/rust/lint/rust-lint-marklive.h b/gcc/rust/lint/rust-lint-marklive.h index 89a6d7e..aeecda5 100644 --- a/gcc/rust/lint/rust-lint-marklive.h +++ b/gcc/rust/lint/rust-lint-marklive.h @@ -204,21 +204,6 @@ public: expr.get_else_block ()->accept_vis (*this); } - void visit (HIR::MatchExpr &expr) override - { - expr.get_scrutinee_expr ()->accept_vis (*this); - std::vector<HIR::MatchCase> &cases = expr.get_match_cases (); - for (auto &&caz : cases) - { - auto case_arm = caz.get_arm (); - if (case_arm.has_match_arm_guard ()) - { - case_arm.get_guard_expr ()->accept_vis (*this); - } - caz.get_expr ()->accept_vis (*this); - } - } - void visit (HIR::IfExprConseqIf &expr) override { expr.get_if_condition ()->accept_vis (*this); diff --git a/gcc/testsuite/rust/compile/match6.rs b/gcc/testsuite/rust/compile/match6.rs deleted file mode 100644 index eec775b..0000000 --- a/gcc/testsuite/rust/compile/match6.rs +++ /dev/null @@ -1,21 +0,0 @@ -fn foo() -> bool { - true -} - -fn int32() -> i32 { - 1 -} - -fn bar() -> i32 { - match foo() { - true => int32(), - false => 0 - } -} - -fn main() -> () { - bar(); -} - - - |