Disallow Type_Control as a tuple argument

Signed-off-by: Mihai Budiu <mbudiu@vmware.com>
p4lang · Dec 2, 2022 · 0d94633 · 0d94633
1 parent d0056fc
commit 0d94633
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/frontends/p4/typeChecking/typeChecker.cpp b/frontends/p4/typeChecking/typeChecker.cpp
@@ -1388,7 +1388,8 @@ const IR::Node* TypeInference::postorder(IR::Type_List* type) {
 
 const IR::Node* TypeInference::postorder(IR::Type_Tuple* type) {
     for (auto field : type->components) {
-        if (field->is<IR::IContainer>()) {
+        auto fieldType = getTypeType(field);
+        if (fieldType->is<IR::IContainer>() || fieldType->is<IR::Type_ArchBlock>()) {
             typeError("%1%: not supported as a tuple field", field);
             return type;
         }

diff --git a/testdata/p4_16_errors/issue3750.p4 b/testdata/p4_16_errors/issue3750.p4
@@ -0,0 +1,5 @@
+control ct();
+void f(tuple<ct> t)
+{
+  t[0].apply();
+}
diff --git a/testdata/p4_16_errors_outputs/issue3378.p4-stderr b/testdata/p4_16_errors_outputs/issue3378.p4-stderr
@@ -1,6 +1,3 @@
-issue3378.p4(1): [--Werror=type-error] error: package f: not supported as a tuple field
-package f();
-        ^
-issue3378.p4(2): [--Werror=type-error] error: Error while analyzing tuple<package f, package f>
+issue3378.p4(2): [--Werror=type-error] error: f: not supported as a tuple field
 package g(tuple<f,f> b);
-          ^^^^^^^^^^
+                ^
diff --git a/testdata/p4_16_errors_outputs/issue3750.p4 b/testdata/p4_16_errors_outputs/issue3750.p4
@@ -0,0 +1,4 @@
+control ct();
+void f(tuple<ct> t) {
+    t[0].apply();
+}
diff --git a/testdata/p4_16_errors_outputs/issue3750.p4-stderr b/testdata/p4_16_errors_outputs/issue3750.p4-stderr
@@ -0,0 +1,3 @@
+issue3750.p4(2): [--Werror=type-error] error: ct: not supported as a tuple field
+void f(tuple<ct> t)
+             ^^