collects decls from parser and control block (#3392)

p4lang · Jun 27, 2022 · 45014a7 · 45014a7
1 parent da63f29
commit 45014a7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/backends/dpdk/dpdkArch.cpp b/backends/dpdk/dpdkArch.cpp
@@ -909,9 +909,10 @@ const IR::Node *IfStatementUnroll::postorder(IR::SwitchStatement *sw) {
         code_block->push_back(i);
 
     auto control = findOrigCtxt<IR::P4Control>();
+    auto parser = findOrigCtxt<IR::P4Parser>();
 
     for (auto d : unroller->decl)
-        injector.collect(control, nullptr, d);
+        injector.collect(control, parser, d);
     if (unroller->root) {
         sw->expression = unroller->root;
     }
@@ -929,9 +930,9 @@ const IR::Node *IfStatementUnroll::postorder(IR::IfStatement *i) {
         code_block->push_back(i);
 
     auto control = findOrigCtxt<IR::P4Control>();
-
+    auto parser = findOrigCtxt<IR::P4Parser>();
     for (auto d : unroller->decl)
-        injector.collect(control, nullptr, d);
+        injector.collect(control, parser, d);
     if (unroller->root) {
         i->condition = unroller->root;
     }
@@ -944,6 +945,11 @@ const IR::Node *IfStatementUnroll::postorder(IR::P4Control *a) {
     return injector.inject_control(control, a);
 }
 
+const IR::Node *IfStatementUnroll::postorder(IR::P4Parser *a) {
+    auto parser = getOriginal();
+    return injector.inject_parser(parser, a);
+}
+
 // TODO(GordonWuCn): simplify with a postorder visitor if it is a statement,
 // return the expression, else introduce a temporary for the current expression
 // and return the temporary in a pathexpression.

diff --git a/backends/dpdk/dpdkArch.h b/backends/dpdk/dpdkArch.h
@@ -410,6 +410,7 @@ class IfStatementUnroll : public Transform {
     const IR::Node *postorder(IR::SwitchStatement *a) override;
     const IR::Node *postorder(IR::IfStatement *a) override;
     const IR::Node *postorder(IR::P4Control *a) override;
+    const IR::Node *postorder(IR::P4Parser *a) override;
 };
 
 /* Assume one logical expression looks like this: a && (b + c > d), this pass