Switch statement not correctly translated when default case is not pr…

…esent
p4lang · Dec 14, 2021 · fd53229 · fd53229
1 parent 37cd30e
commit fd53229
Show file tree

Hide file tree

Showing 88 changed files with 2,000 additions and 561 deletions.
diff --git a/midend/eliminateSwitch.cpp b/midend/eliminateSwitch.cpp
@@ -56,6 +56,19 @@ const IR::Node* DoEliminateSwitch::postorder(IR::SwitchStatement* statement) {
     properties.push_back(new IR::Property(src, "key", new IR::Key({tableKeyEl}), false));
     IR::ID defaultAction = P4CoreLibrary::instance.noAction.Id();
 
+    // Add Default switch Expression if not present
+    bool isDefaultPresent = false;
+    for (auto sc : statement->cases) {
+        if (sc->label->is<IR::DefaultExpression>()) {
+            isDefaultPresent = true;
+            break;
+        }
+    }
+    if (!isDefaultPresent) {
+        statement->cases.push_back(
+            new IR::SwitchCase(new IR::DefaultExpression(IR::Type_Dontcare::get()),
+                               new IR::BlockStatement));
+    }
     // Create actions
     IR::Vector<IR::Expression> pendingLabels;  // switch labels with no statement
     for (auto sc : statement->cases) {

diff --git a/testdata/p4_14_samples_outputs/copy_to_cpu-first.p4 b/testdata/p4_14_samples_outputs/copy_to_cpu-first.p4
@@ -26,9 +26,9 @@ struct metadata {
 }
 
 struct headers {
-    @name(".cpu_header")
+    @name(".cpu_header") 
     cpu_header_t cpu_header;
-    @name(".ethernet")
+    @name(".ethernet") 
     ethernet_t   ethernet;
 }
 
@@ -110,3 +110,4 @@ control computeChecksum(inout headers hdr, inout metadata meta) {
 }
 
 V1Switch<headers, metadata>(ParserImpl(), verifyChecksum(), ingress(), egress(), computeChecksum(), DeparserImpl()) main;
+
diff --git a/testdata/p4_14_samples_outputs/copy_to_cpu-frontend.p4 b/testdata/p4_14_samples_outputs/copy_to_cpu-frontend.p4
@@ -26,9 +26,9 @@ struct metadata {
 }
 
 struct headers {
-    @name(".cpu_header")
+    @name(".cpu_header") 
     cpu_header_t cpu_header;
-    @name(".ethernet")
+    @name(".ethernet") 
     ethernet_t   ethernet;
 }
 
@@ -118,3 +118,4 @@ control computeChecksum(inout headers hdr, inout metadata meta) {
 }
 
 V1Switch<headers, metadata>(ParserImpl(), verifyChecksum(), ingress(), egress(), computeChecksum(), DeparserImpl()) main;
+
diff --git a/testdata/p4_14_samples_outputs/copy_to_cpu-midend.p4 b/testdata/p4_14_samples_outputs/copy_to_cpu-midend.p4
@@ -22,9 +22,9 @@ struct metadata {
 }
 
 struct headers {
-    @name(".cpu_header")
+    @name(".cpu_header") 
     cpu_header_t cpu_header;
-    @name(".ethernet")
+    @name(".ethernet") 
     ethernet_t   ethernet;
 }
 
@@ -112,3 +112,4 @@ control computeChecksum(inout headers hdr, inout metadata meta) {
 }
 
 V1Switch<headers, metadata>(ParserImpl(), verifyChecksum(), ingress(), egress(), computeChecksum(), DeparserImpl()) main;
+
diff --git a/testdata/p4_14_samples_outputs/copy_to_cpu.p4 b/testdata/p4_14_samples_outputs/copy_to_cpu.p4
@@ -26,9 +26,9 @@ struct metadata {
 }
 
 struct headers {
-    @name(".cpu_header")
+    @name(".cpu_header") 
     cpu_header_t cpu_header;
-    @name(".ethernet")
+    @name(".ethernet") 
     ethernet_t   ethernet;
 }
 
@@ -106,3 +106,4 @@ control computeChecksum(inout headers hdr, inout metadata meta) {
 }
 
 V1Switch(ParserImpl(), verifyChecksum(), ingress(), egress(), computeChecksum(), DeparserImpl()) main;
+
diff --git a/testdata/p4_14_samples_outputs/p414-special-ops-2-bmv2-first.p4 b/testdata/p4_14_samples_outputs/p414-special-ops-2-bmv2-first.p4
@@ -16,15 +16,15 @@ struct intrinsic_metadata_t {
 }
 
 struct mymeta_t {
-    @field_list(FieldLists.clone_e2e_FL, FieldLists.recirculate_FL, FieldLists.resubmit_FL)
+    @field_list(FieldLists.clone_e2e_FL, FieldLists.recirculate_FL, FieldLists.resubmit_FL) 
     bit<8> resubmit_count;
-    @field_list(FieldLists.clone_e2e_FL, FieldLists.recirculate_FL, FieldLists.resubmit_FL)
+    @field_list(FieldLists.clone_e2e_FL, FieldLists.recirculate_FL, FieldLists.resubmit_FL) 
     bit<8> recirculate_count;
-    @field_list(FieldLists.clone_e2e_FL, FieldLists.recirculate_FL, FieldLists.resubmit_FL)
+    @field_list(FieldLists.clone_e2e_FL, FieldLists.recirculate_FL, FieldLists.resubmit_FL) 
     bit<8> clone_e2e_count;
-    @field_list(FieldLists.clone_e2e_FL, FieldLists.recirculate_FL, FieldLists.resubmit_FL)
+    @field_list(FieldLists.clone_e2e_FL, FieldLists.recirculate_FL, FieldLists.resubmit_FL) 
     bit<8> last_ing_instance_type;
-    @field_list(FieldLists.clone_e2e_FL, FieldLists.recirculate_FL, FieldLists.resubmit_FL)
+    @field_list(FieldLists.clone_e2e_FL, FieldLists.recirculate_FL, FieldLists.resubmit_FL) 
     bit<8> f1;
 }
 
@@ -39,14 +39,14 @@ header ethernet_t {
 }
 
 struct metadata {
-    @name(".mymeta")
+    @name(".mymeta") 
     mymeta_t      mymeta;
-    @name(".temporaries")
+    @name(".temporaries") 
     temporaries_t temporaries;
 }
 
 struct headers {
-    @name(".ethernet")
+    @name(".ethernet") 
     ethernet_t ethernet;
 }
 
@@ -357,3 +357,4 @@ control computeChecksum(inout headers hdr, inout metadata meta) {
 }
 
 V1Switch<headers, metadata>(ParserImpl(), verifyChecksum(), ingress(), egress(), computeChecksum(), DeparserImpl()) main;
+
diff --git a/testdata/p4_14_samples_outputs/p414-special-ops-2-bmv2-frontend.p4 b/testdata/p4_14_samples_outputs/p414-special-ops-2-bmv2-frontend.p4
@@ -16,15 +16,15 @@ struct intrinsic_metadata_t {
 }
 
 struct mymeta_t {
-    @field_list(FieldLists.clone_e2e_FL, FieldLists.recirculate_FL, FieldLists.resubmit_FL)
+    @field_list(FieldLists.clone_e2e_FL, FieldLists.recirculate_FL, FieldLists.resubmit_FL) 
     bit<8> resubmit_count;
-    @field_list(FieldLists.clone_e2e_FL, FieldLists.recirculate_FL, FieldLists.resubmit_FL)
+    @field_list(FieldLists.clone_e2e_FL, FieldLists.recirculate_FL, FieldLists.resubmit_FL) 
     bit<8> recirculate_count;
-    @field_list(FieldLists.clone_e2e_FL, FieldLists.recirculate_FL, FieldLists.resubmit_FL)
+    @field_list(FieldLists.clone_e2e_FL, FieldLists.recirculate_FL, FieldLists.resubmit_FL) 
     bit<8> clone_e2e_count;
-    @field_list(FieldLists.clone_e2e_FL, FieldLists.recirculate_FL, FieldLists.resubmit_FL)
+    @field_list(FieldLists.clone_e2e_FL, FieldLists.recirculate_FL, FieldLists.resubmit_FL) 
     bit<8> last_ing_instance_type;
-    @field_list(FieldLists.clone_e2e_FL, FieldLists.recirculate_FL, FieldLists.resubmit_FL)
+    @field_list(FieldLists.clone_e2e_FL, FieldLists.recirculate_FL, FieldLists.resubmit_FL) 
     bit<8> f1;
 }
 
@@ -39,14 +39,14 @@ header ethernet_t {
 }
 
 struct metadata {
-    @name(".mymeta")
+    @name(".mymeta") 
     mymeta_t      mymeta;
-    @name(".temporaries")
+    @name(".temporaries") 
     temporaries_t temporaries;
 }
 
 struct headers {
-    @name(".ethernet")
+    @name(".ethernet") 
     ethernet_t ethernet;
 }
 
@@ -388,3 +388,4 @@ control computeChecksum(inout headers hdr, inout metadata meta) {
 }
 
 V1Switch<headers, metadata>(ParserImpl(), verifyChecksum(), ingress(), egress(), computeChecksum(), DeparserImpl()) main;
+
diff --git a/testdata/p4_14_samples_outputs/p414-special-ops-2-bmv2-midend.p4 b/testdata/p4_14_samples_outputs/p414-special-ops-2-bmv2-midend.p4
@@ -10,15 +10,15 @@ struct intrinsic_metadata_t {
 }
 
 struct mymeta_t {
-    @field_list(8w0, 8w1, 8w2)
+    @field_list(8w0, 8w1, 8w2) 
     bit<8> resubmit_count;
-    @field_list(8w0, 8w1, 8w2)
+    @field_list(8w0, 8w1, 8w2) 
     bit<8> recirculate_count;
-    @field_list(8w0, 8w1, 8w2)
+    @field_list(8w0, 8w1, 8w2) 
     bit<8> clone_e2e_count;
-    @field_list(8w0, 8w1, 8w2)
+    @field_list(8w0, 8w1, 8w2) 
     bit<8> last_ing_instance_type;
-    @field_list(8w0, 8w1, 8w2)
+    @field_list(8w0, 8w1, 8w2) 
     bit<8> f1;
 }
 
@@ -33,21 +33,21 @@ header ethernet_t {
 }
 
 struct metadata {
-    @field_list(8w0, 8w1, 8w2)
+    @field_list(8w0, 8w1, 8w2) 
     bit<8>  _mymeta_resubmit_count0;
-    @field_list(8w0, 8w1, 8w2)
+    @field_list(8w0, 8w1, 8w2) 
     bit<8>  _mymeta_recirculate_count1;
-    @field_list(8w0, 8w1, 8w2)
+    @field_list(8w0, 8w1, 8w2) 
     bit<8>  _mymeta_clone_e2e_count2;
-    @field_list(8w0, 8w1, 8w2)
+    @field_list(8w0, 8w1, 8w2) 
     bit<8>  _mymeta_last_ing_instance_type3;
-    @field_list(8w0, 8w1, 8w2)
+    @field_list(8w0, 8w1, 8w2) 
     bit<8>  _mymeta_f14;
     bit<48> _temporaries_temp15;
 }
 
 struct headers {
-    @name(".ethernet")
+    @name(".ethernet") 
     ethernet_t ethernet;
 }
 
@@ -389,3 +389,4 @@ control computeChecksum(inout headers hdr, inout metadata meta) {
 }
 
 V1Switch<headers, metadata>(ParserImpl(), verifyChecksum(), ingress(), egress(), computeChecksum(), DeparserImpl()) main;
+
diff --git a/testdata/p4_14_samples_outputs/p414-special-ops-2-bmv2.p4 b/testdata/p4_14_samples_outputs/p414-special-ops-2-bmv2.p4
@@ -16,15 +16,15 @@ struct intrinsic_metadata_t {
 }
 
 struct mymeta_t {
-    @field_list(FieldLists.clone_e2e_FL, FieldLists.recirculate_FL, FieldLists.resubmit_FL)
+    @field_list(FieldLists.clone_e2e_FL, FieldLists.recirculate_FL, FieldLists.resubmit_FL) 
     bit<8> resubmit_count;
-    @field_list(FieldLists.clone_e2e_FL, FieldLists.recirculate_FL, FieldLists.resubmit_FL)
+    @field_list(FieldLists.clone_e2e_FL, FieldLists.recirculate_FL, FieldLists.resubmit_FL) 
     bit<8> recirculate_count;
-    @field_list(FieldLists.clone_e2e_FL, FieldLists.recirculate_FL, FieldLists.resubmit_FL)
+    @field_list(FieldLists.clone_e2e_FL, FieldLists.recirculate_FL, FieldLists.resubmit_FL) 
     bit<8> clone_e2e_count;
-    @field_list(FieldLists.clone_e2e_FL, FieldLists.recirculate_FL, FieldLists.resubmit_FL)
+    @field_list(FieldLists.clone_e2e_FL, FieldLists.recirculate_FL, FieldLists.resubmit_FL) 
     bit<8> last_ing_instance_type;
-    @field_list(FieldLists.clone_e2e_FL, FieldLists.recirculate_FL, FieldLists.resubmit_FL)
+    @field_list(FieldLists.clone_e2e_FL, FieldLists.recirculate_FL, FieldLists.resubmit_FL) 
     bit<8> f1;
 }
 
@@ -39,14 +39,14 @@ header ethernet_t {
 }
 
 struct metadata {
-    @name(".mymeta")
+    @name(".mymeta") 
     mymeta_t      mymeta;
-    @name(".temporaries")
+    @name(".temporaries") 
     temporaries_t temporaries;
 }
 
 struct headers {
-    @name(".ethernet")
+    @name(".ethernet") 
     ethernet_t ethernet;
 }
 
@@ -361,3 +361,4 @@ control computeChecksum(inout headers hdr, inout metadata meta) {
 }
 
 V1Switch(ParserImpl(), verifyChecksum(), ingress(), egress(), computeChecksum(), DeparserImpl()) main;
+
diff --git a/testdata/p4_14_samples_outputs/p414-special-ops-3-bmv2-first.p4 b/testdata/p4_14_samples_outputs/p414-special-ops-3-bmv2-first.p4
@@ -16,14 +16,14 @@ struct intrinsic_metadata_t {
 }
 
 struct mymeta_t {
-    @field_list(FieldLists.resubmit_FL)
+    @field_list(FieldLists.resubmit_FL) 
     bit<8> resubmit_count;
-    @field_list(FieldLists.recirculate_FL)
+    @field_list(FieldLists.recirculate_FL) 
     bit<8> recirculate_count;
-    @field_list(FieldLists.clone_e2e_FL)
+    @field_list(FieldLists.clone_e2e_FL) 
     bit<8> clone_e2e_count;
     bit<8> last_ing_instance_type;
-    @field_list(FieldLists.clone_e2e_FL, FieldLists.recirculate_FL, FieldLists.resubmit_FL)
+    @field_list(FieldLists.clone_e2e_FL, FieldLists.recirculate_FL, FieldLists.resubmit_FL) 
     bit<8> f1;
 }
 
@@ -38,14 +38,14 @@ header ethernet_t {
 }
 
 struct metadata {
-    @name(".mymeta")
+    @name(".mymeta") 
     mymeta_t      mymeta;
-    @name(".temporaries")
+    @name(".temporaries") 
     temporaries_t temporaries;
 }
 
 struct headers {
-    @name(".ethernet")
+    @name(".ethernet") 
     ethernet_t ethernet;
 }
 
@@ -381,3 +381,4 @@ control computeChecksum(inout headers hdr, inout metadata meta) {
 }
 
 V1Switch<headers, metadata>(ParserImpl(), verifyChecksum(), ingress(), egress(), computeChecksum(), DeparserImpl()) main;
+
diff --git a/testdata/p4_14_samples_outputs/p414-special-ops-3-bmv2-frontend.p4 b/testdata/p4_14_samples_outputs/p414-special-ops-3-bmv2-frontend.p4
@@ -16,14 +16,14 @@ struct intrinsic_metadata_t {
 }
 
 struct mymeta_t {
-    @field_list(FieldLists.resubmit_FL)
+    @field_list(FieldLists.resubmit_FL) 
     bit<8> resubmit_count;
-    @field_list(FieldLists.recirculate_FL)
+    @field_list(FieldLists.recirculate_FL) 
     bit<8> recirculate_count;
-    @field_list(FieldLists.clone_e2e_FL)
+    @field_list(FieldLists.clone_e2e_FL) 
     bit<8> clone_e2e_count;
     bit<8> last_ing_instance_type;
-    @field_list(FieldLists.clone_e2e_FL, FieldLists.recirculate_FL, FieldLists.resubmit_FL)
+    @field_list(FieldLists.clone_e2e_FL, FieldLists.recirculate_FL, FieldLists.resubmit_FL) 
     bit<8> f1;
 }
 
@@ -38,14 +38,14 @@ header ethernet_t {
 }
 
 struct metadata {
-    @name(".mymeta")
+    @name(".mymeta") 
     mymeta_t      mymeta;
-    @name(".temporaries")
+    @name(".temporaries") 
     temporaries_t temporaries;
 }
 
 struct headers {
-    @name(".ethernet")
+    @name(".ethernet") 
     ethernet_t ethernet;
 }
 
@@ -412,3 +412,4 @@ control computeChecksum(inout headers hdr, inout metadata meta) {
 }
 
 V1Switch<headers, metadata>(ParserImpl(), verifyChecksum(), ingress(), egress(), computeChecksum(), DeparserImpl()) main;
+