Validate value_set element types (p4lang#3351)

Signed-off-by: Mihai Budiu <[email protected]>
github-sajan · May 26, 2022 · 2cc379c · 2cc379c
1 parent b757ea9
commit 2cc379c
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 0 deletions.
diff --git a/frontends/p4/typeChecking/typeChecker.cpp b/frontends/p4/typeChecking/typeChecker.cpp
@@ -1414,6 +1414,15 @@ const IR::Node* TypeInference::postorder(IR::P4ValueSet* decl) {
             if (errs)
                 return nullptr;
         }
+        if (!canon->is<IR::Type_Newtype>() &&
+            !canon->is<IR::Type_Bits>() &&
+            !canon->is<IR::Type_SerEnum>() &&
+            !canon->is<IR::Type_Boolean>() &&
+            !canon->is<IR::Type_Enum>() &&
+            !canon->is<IR::Type_Struct>() &&
+            !canon->is<IR::Type_Tuple>())
+            typeError("%1%: Illegal type for value_set element type", decl->elementType);
+
         auto tt = new IR::Type_Set(canon);
         setType(getOriginal(), tt);
         setType(decl, tt);

diff --git a/testdata/p4_16_errors/issue3346.p4 b/testdata/p4_16_errors/issue3346.p4
@@ -0,0 +1,9 @@
+parser MyParser1(in bit<6> v) {
+  value_set<int>(4) myvs;
+  state start {
+    transition select(v) {
+     myvs: accept;
+     _: reject;
+   }
+ }
+}
diff --git a/testdata/p4_16_errors_outputs/issue3346.p4 b/testdata/p4_16_errors_outputs/issue3346.p4
@@ -0,0 +1,10 @@
+parser MyParser1(in bit<6> v) {
+    value_set<int>(4) myvs;
+    state start {
+        transition select(v) {
+            myvs: accept;
+            default: reject;
+        }
+    }
+}
+
diff --git a/testdata/p4_16_errors_outputs/issue3346.p4-stderr b/testdata/p4_16_errors_outputs/issue3346.p4-stderr
@@ -0,0 +1,3 @@
+issue3346.p4(2): [--Werror=type-error] error: int: Illegal type for value_set element type
+  value_set<int>(4) myvs;
+            ^^^