From 6d0892636e9642e75a858c40c45acd1df79c63e1 Mon Sep 17 00:00:00 2001 From: Philip Herron Date: Thu, 6 Jan 2022 14:45:15 +0000 Subject: Add support for wildcard patterns within MatchExprs GCC CASE_LABEL_EXPR's contain operand 0 and 1, operand 0 is used for the low value of a case label and operand 1 for a high value. So with this CASE_LABEL_EXPR is is possible to support a range of values from low->high if set apropriately, but for the wildcard case this is effectively a default case which means we set both operand 0 and 1 to NULL_TREE. Fixes #853 --- gcc/rust/backend/rust-compile-expr.cc | 7 ------- gcc/rust/backend/rust-compile-pattern.cc | 9 +++++++++ gcc/rust/backend/rust-compile-pattern.h | 2 ++ 3 files changed, 11 insertions(+), 7 deletions(-) (limited to 'gcc/rust/backend') diff --git a/gcc/rust/backend/rust-compile-expr.cc b/gcc/rust/backend/rust-compile-expr.cc index b77a4d5..5e43f5a 100644 --- a/gcc/rust/backend/rust-compile-expr.cc +++ b/gcc/rust/backend/rust-compile-expr.cc @@ -275,19 +275,12 @@ CompileExpr::visit (HIR::MatchExpr &expr) tree case_label = ctx->get_backend ()->label ( fndecl, "" /* empty creates an artificial label */, arm_locus); - // not sure if we need to add this to the block or if the CASE_LABEL_EXPR - // does this implicitly - // - // tree case_label_decl_statement - // = ctx->get_backend ()->label_definition_statement (case_label); - // setup the bindings for the block for (auto &kase_pattern : kase_arm.get_patterns ()) { tree switch_kase_expr = CompilePatternCaseLabelExpr::Compile (kase_pattern.get (), case_label, ctx); - // ctx->add_statement (case_label_decl_statement); ctx->add_statement (switch_kase_expr); CompilePatternBindings::Compile (kase_pattern.get (), diff --git a/gcc/rust/backend/rust-compile-pattern.cc b/gcc/rust/backend/rust-compile-pattern.cc index e634dbd..27ee487 100644 --- a/gcc/rust/backend/rust-compile-pattern.cc +++ b/gcc/rust/backend/rust-compile-pattern.cc @@ -77,6 +77,15 @@ CompilePatternCaseLabelExpr::visit (HIR::TupleStructPattern &pattern) CompilePatternCaseLabelExpr::visit (pattern.get_path ()); } +void +CompilePatternCaseLabelExpr::visit (HIR::WildcardPattern &pattern) +{ + // operand 0 being NULL_TREE signifies this is the default case label see: + // tree.def for documentation for CASE_LABEL_EXPR + case_label_expr + = build_case_label (NULL_TREE, NULL_TREE, associated_case_label); +} + // setup the bindings void diff --git a/gcc/rust/backend/rust-compile-pattern.h b/gcc/rust/backend/rust-compile-pattern.h index e49f75c..b12ea93 100644 --- a/gcc/rust/backend/rust-compile-pattern.h +++ b/gcc/rust/backend/rust-compile-pattern.h @@ -40,6 +40,8 @@ public: void visit (HIR::TupleStructPattern &pattern) override; + void visit (HIR::WildcardPattern &pattern) override; + private: CompilePatternCaseLabelExpr (Context *ctx, tree associated_case_label) : HIRCompileBase (ctx), case_label_expr (error_mark_node), -- cgit v1.1