Add empty block for trailing case(s) with no code. (#4889)

Signed-off-by: Chris Dodd <cdodd@nvidia.com>
p4lang · Sep 3, 2024 · acef8db · acef8db
1 parent c069b4c
commit acef8db
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 3 deletions.
diff --git a/frontends/p4/simplify.cpp b/frontends/p4/simplify.cpp
@@ -109,7 +109,9 @@ const IR::Node *DoSimplifyControlFlow::postorder(IR::SwitchStatement *statement)
             else
                 warn(ErrorType::WARN_MISSING, "%1%: fallthrough with no statement", last);
         }
-        statement->cases.erase(it.base(), statement->cases.end());
+        auto mod = last->clone();
+        mod->statement = new IR::BlockStatement;
+        statement->cases.back() = mod;
     }
     return statement;
 }

diff --git a/testdata/p4_16_samples_outputs/cases-first.p4 b/testdata/p4_16_samples_outputs/cases-first.p4
@@ -19,7 +19,7 @@ control ctrl() {
             b: {
                 return;
             }
-            default: {
+            c: {
             }
         }
     }

diff --git a/testdata/p4_16_samples_outputs/issue2617-first.p4 b/testdata/p4_16_samples_outputs/issue2617-first.p4
@@ -56,6 +56,8 @@ control c(out bit<32> v) {
             32w1: {
                 v = 32w1;
             }
+            32w2: {
+            }
         }
         switch (E.C) {
             E.A: {

diff --git a/testdata/p4_16_samples_outputs/issue3619-first.p4 b/testdata/p4_16_samples_outputs/issue3619-first.p4
@@ -1,5 +1,9 @@
 control c(in bit<4> v) {
     apply {
+        switch (v) {
+            default: {
+            }
+        }
     }
 }
 
diff --git a/testdata/p4_16_samples_outputs/psa-switch-expression-without-default-first.p4 b/testdata/p4_16_samples_outputs/psa-switch-expression-without-default-first.p4
@@ -121,6 +121,8 @@ control MyIC(inout headers_t hdr, inout user_meta_t b, in psa_ingress_input_meta
             16w64: {
                 tmp = 16w2;
             }
+            16w92: {
+            }
         }
         switch (tbl.apply().action_run) {
             a1: {

diff --git a/testdata/p4_16_samples_outputs/psa-switch-expression-without-default-frontend.p4 b/testdata/p4_16_samples_outputs/psa-switch-expression-without-default-frontend.p4
@@ -128,6 +128,8 @@ control MyIC(inout headers_t hdr, inout user_meta_t b, in psa_ingress_input_meta
             16w64: {
                 tmp_0 = 16w2;
             }
+            16w92: {
+            }
         }
         switch (tbl_0.apply().action_run) {
             a1: {

diff --git a/testdata/p4_16_samples_outputs/psa-switch-expression-without-default-midend.p4 b/testdata/p4_16_samples_outputs/psa-switch-expression-without-default-midend.p4
@@ -124,6 +124,8 @@ control MyIC(inout headers_t hdr, inout user_meta_t b, in psa_ingress_input_meta
     }
     @hidden action switch_0_case_1() {
     }
+    @hidden action switch_0_case_2() {
+    }
     @hidden table switch_0_table {
         key = {
             switch_0_key: exact;
@@ -132,12 +134,14 @@ control MyIC(inout headers_t hdr, inout user_meta_t b, in psa_ingress_input_meta
             switch_0_case();
             switch_0_case_0();
             switch_0_case_1();
+            switch_0_case_2();
         }
-        const default_action = switch_0_case_1();
+        const default_action = switch_0_case_2();
         const entries = {
                         const 16w16 : switch_0_case();
                         const 16w32 : switch_0_case();
                         const 16w64 : switch_0_case_0();
+                        const 16w92 : switch_0_case_1();
         }
     }
     @hidden action psaswitchexpressionwithoutdefault124() {
@@ -188,6 +192,8 @@ control MyIC(inout headers_t hdr, inout user_meta_t b, in psa_ingress_input_meta
             }
             switch_0_case_1: {
             }
+            switch_0_case_2: {
+            }
         }
         switch (tbl_0.apply().action_run) {
             a1: {