Bug fix in typechecker: fixes #1937

frontends/p4/toP4/toP4.cpp

@@ -254,7 +254,7 @@ bool ToP4::preorder(const IR::Type_Specialized* t) {
 
 bool ToP4::preorder(const IR::Argument* arg) {
     if (!arg->name.name.isNullOrEmpty()) {
-        builder.append(arg->name.toString());
+        builder.append(arg->name.name);
         builder.append(" = ");
     }
     visit(arg->expression);

frontends/p4/typeChecking/typeChecker.cpp

@@ -959,6 +959,8 @@ const IR::Node* TypeInference::preorder(IR::Declaration_Instance* decl) {
             prune();
             return decl;
         }
+        auto *learn = clone();
+        (void)type->apply(*learn);
         if (args != decl->arguments)
             decl->arguments = args;
         setType(decl, type);
@@ -2779,7 +2781,8 @@ TypeInference::actionCall(bool inActionList,
     // Check remaining parameters: they must be all non-directional
     bool error = false;
     for (auto p : left) {
-        if (p.second->direction != IR::Direction::None) {
+        if (p.second->direction != IR::Direction::None &&
+            p.second->defaultValue == nullptr) {
             typeError("%1%: Parameter %2% must be bound", actionCall, p.second);
             error = true;
         }

frontends/p4/uniqueNames.cpp

@@ -203,6 +203,7 @@ const IR::Node* RenameSymbols::postorder(IR::Argument* arg) {
     if (!renameMap->toRename(origParam))
         return arg;
     auto newName = renameMap->getName(origParam);
+    LOG2("Renamed argument " << arg << " to " << newName);
     arg->name = IR::ID(arg->name.srcInfo, newName, arg->name.originalName);
     return arg;
 }

testdata/p4_16_samples/issue1937-1-bmv2.p4

@@ -0,0 +1,39 @@
+/*
+Copyright 2019 Cisco Systems, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+#include <core.p4>
+#include <v1model.p4>
+
+header h1_t { bit<8> f1; bit<8> f2; }
+struct headers_t { h1_t h1; }
+struct metadata_t { }
+
+action foo (out bit<8> x, in bit<8> y = 5) {
+    x = (y >> 2);
+}
+
+control ingressImpl(inout headers_t hdr, inout metadata_t meta, inout standard_metadata_t stdmeta) {
+    apply {
+        foo(hdr.h1.f1, hdr.h1.f1);
+        foo(hdr.h1.f2);
+    }
+}
+parser parserImpl(packet_in packet, out headers_t hdr, inout metadata_t meta, inout standard_metadata_t stdmeta) { state start { transition accept; } }
+control verifyChecksum(inout headers_t hdr, inout metadata_t meta) { apply { } }
+control egressImpl(inout headers_t hdr, inout metadata_t meta, inout standard_metadata_t stdmeta) { apply { } }
+control updateChecksum(inout headers_t hdr, inout metadata_t meta) { apply { } }
+control deparserImpl(packet_out packet, in headers_t hdr) { apply { } }
+V1Switch(parserImpl(), verifyChecksum(), ingressImpl(), egressImpl(), updateChecksum(), deparserImpl()) main;

testdata/p4_16_samples/issue1937-2-bmv2.p4

@@ -0,0 +1,44 @@
+/*
+Copyright 2019 Cisco Systems, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+#include <core.p4>
+#include <v1model.p4>
+
+header h1_t { bit<8> f1; bit<8> f2; }
+struct headers_t { h1_t h1; }
+struct metadata_t { }
+
+parser foo (out bit<8> x, in bit<8> y = 5) {
+    state start {
+        x = (y >> 2);
+        transition accept;
+    }
+}
+
+parser parserImpl(packet_in packet, out headers_t hdr, inout metadata_t meta, inout standard_metadata_t stdmeta) {
+    state start {
+        foo.apply(hdr.h1.f1, hdr.h1.f1);
+        foo.apply(hdr.h1.f2);
+        transition accept;
+    }
+}
+
+control ingressImpl(inout headers_t hdr, inout metadata_t meta, inout standard_metadata_t stdmeta) { apply { } }
+control verifyChecksum(inout headers_t hdr, inout metadata_t meta) { apply { } }
+control egressImpl(inout headers_t hdr, inout metadata_t meta, inout standard_metadata_t stdmeta) { apply { } }
+control updateChecksum(inout headers_t hdr, inout metadata_t meta) { apply { } }
+control deparserImpl(packet_out packet, in headers_t hdr) { apply { } }
+V1Switch(parserImpl(), verifyChecksum(), ingressImpl(), egressImpl(), updateChecksum(), deparserImpl()) main;

testdata/p4_16_samples/issue1937-3-bmv2.p4

@@ -0,0 +1,41 @@
+/*
+Copyright 2019 Cisco Systems, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+#include <core.p4>
+#include <v1model.p4>
+
+header h1_t { bit<8> f1; bit<8> f2; }
+struct headers_t { h1_t h1; }
+struct metadata_t { }
+
+control foo (out bit<8> x, in bit<8> y = 5) {
+    apply {
+        x = (y >> 2);
+    }
+}
+
+control ingressImpl(inout headers_t hdr, inout metadata_t meta, inout standard_metadata_t stdmeta) {
+    apply {
+        foo.apply(hdr.h1.f1, hdr.h1.f1);
+        foo.apply(hdr.h1.f2);
+    }
+}
+parser parserImpl(packet_in packet, out headers_t hdr, inout metadata_t meta, inout standard_metadata_t stdmeta) { state start { transition accept; } }
+control verifyChecksum(inout headers_t hdr, inout metadata_t meta) { apply { } }
+control egressImpl(inout headers_t hdr, inout metadata_t meta, inout standard_metadata_t stdmeta) { apply { } }
+control updateChecksum(inout headers_t hdr, inout metadata_t meta) { apply { } }
+control deparserImpl(packet_out packet, in headers_t hdr) { apply { } }
+V1Switch(parserImpl(), verifyChecksum(), ingressImpl(), egressImpl(), updateChecksum(), deparserImpl()) main;

testdata/p4_16_samples/issue1937.p4

@@ -0,0 +1,23 @@
+#include <core.p4>
+
+header h1_t { bit<8> f1; bit<8> f2; }
+
+parser foo (out bit<8> x, in bit<8> y = 5) {
+    state start {
+        x = (y >> 2);
+        transition accept;
+    }
+}
+
+parser parserImpl(out h1_t hdr) {
+    state start {
+        foo.apply(hdr.f1, hdr.f1);
+        foo.apply(hdr.f2);
+        transition accept;
+    }
+}
+
+parser p<T>(out T h);
+package top<T>(p<T> p);
+
+top(parserImpl()) main;

testdata/p4_16_samples_outputs/issue1937-1-bmv2-first.p4

@@ -0,0 +1,53 @@
+#include <core.p4>
+#include <v1model.p4>
+
+header h1_t {
+    bit<8> f1;
+    bit<8> f2;
+}
+
+struct headers_t {
+    h1_t h1;
+}
+
+struct metadata_t {
+}
+
+action foo(out bit<8> x, in bit<8> y=5) {
+    x = y >> 2;
+}
+control ingressImpl(inout headers_t hdr, inout metadata_t meta, inout standard_metadata_t stdmeta) {
+    apply {
+        foo(hdr.h1.f1, hdr.h1.f1);
+        foo(x = hdr.h1.f2, y = 8w5);
+    }
+}
+
+parser parserImpl(packet_in packet, out headers_t hdr, inout metadata_t meta, inout standard_metadata_t stdmeta) {
+    state start {
+        transition accept;
+    }
+}
+
+control verifyChecksum(inout headers_t hdr, inout metadata_t meta) {
+    apply {
+    }
+}
+
+control egressImpl(inout headers_t hdr, inout metadata_t meta, inout standard_metadata_t stdmeta) {
+    apply {
+    }
+}
+
+control updateChecksum(inout headers_t hdr, inout metadata_t meta) {
+    apply {
+    }
+}
+
+control deparserImpl(packet_out packet, in headers_t hdr) {
+    apply {
+    }
+}
+
+V1Switch<headers_t, metadata_t>(parserImpl(), verifyChecksum(), ingressImpl(), egressImpl(), updateChecksum(), deparserImpl()) main;
+

testdata/p4_16_samples_outputs/issue1937-1-bmv2-frontend.p4

@@ -0,0 +1,60 @@
+#include <core.p4>
+#include <v1model.p4>
+
+header h1_t {
+    bit<8> f1;
+    bit<8> f2;
+}
+
+struct headers_t {
+    h1_t h1;
+}
+
+struct metadata_t {
+}
+
+control ingressImpl(inout headers_t hdr, inout metadata_t meta, inout standard_metadata_t stdmeta) {
+    @name(".foo") action foo(out bit<8> x, in bit<8> y=5) {
+        x = y >> 2;
+    }
+    @name(".foo") action foo_0(out bit<8> x_1, in bit<8> y_1=5) {
+        x_1 = y_1 >> 2;
+    }
+    bit<8> tmp;
+    bit<8> tmp_0;
+    apply {
+        tmp_0 = hdr.h1.f1;
+        foo(tmp, tmp_0);
+        hdr.h1.f1 = tmp;
+        foo_0(x_1 = hdr.h1.f2, y_1 = 8w5);
+    }
+}
+
+parser parserImpl(packet_in packet, out headers_t hdr, inout metadata_t meta, inout standard_metadata_t stdmeta) {
+    state start {
+        transition accept;
+    }
+}
+
+control verifyChecksum(inout headers_t hdr, inout metadata_t meta) {
+    apply {
+    }
+}
+
+control egressImpl(inout headers_t hdr, inout metadata_t meta, inout standard_metadata_t stdmeta) {
+    apply {
+    }
+}
+
+control updateChecksum(inout headers_t hdr, inout metadata_t meta) {
+    apply {
+    }
+}
+
+control deparserImpl(packet_out packet, in headers_t hdr) {
+    apply {
+    }
+}
+
+V1Switch<headers_t, metadata_t>(parserImpl(), verifyChecksum(), ingressImpl(), egressImpl(), updateChecksum(), deparserImpl()) main;
+

testdata/p4_16_samples_outputs/issue1937-1-bmv2-midend.p4

@@ -0,0 +1,90 @@
+#include <core.p4>
+#include <v1model.p4>
+
+header h1_t {
+    bit<8> f1;
+    bit<8> f2;
+}
+
+struct headers_t {
+    h1_t h1;
+}
+
+struct metadata_t {
+}
+
+control ingressImpl(inout headers_t hdr, inout metadata_t meta, inout standard_metadata_t stdmeta) {
+    bit<8> tmp;
+    bit<8> tmp_0;
+    @name(".foo") action foo() {
+        tmp = tmp_0 >> 2;
+    }
+    @name(".foo") action foo_0() {
+        hdr.h1.f2 = 8w1;
+    }
+    @hidden action act() {
+        tmp_0 = hdr.h1.f1;
+    }
+    @hidden action act_0() {
+        hdr.h1.f1 = tmp;
+    }
+    @hidden table tbl_act {
+        actions = {
+            act();
+        }
+        const default_action = act();
+    }
+    @hidden table tbl_foo {
+        actions = {
+            foo();
+        }
+        const default_action = foo();
+    }
+    @hidden table tbl_act_0 {
+        actions = {
+            act_0();
+        }
+        const default_action = act_0();
+    }
+    @hidden table tbl_foo_0 {
+        actions = {
+            foo_0();
+        }
+        const default_action = foo_0();
+    }
+    apply {
+        tbl_act.apply();
+        tbl_foo.apply();
+        tbl_act_0.apply();
+        tbl_foo_0.apply();
+    }
+}
+
+parser parserImpl(packet_in packet, out headers_t hdr, inout metadata_t meta, inout standard_metadata_t stdmeta) {
+    state start {
+        transition accept;
+    }
+}
+
+control verifyChecksum(inout headers_t hdr, inout metadata_t meta) {
+    apply {
+    }
+}
+
+control egressImpl(inout headers_t hdr, inout metadata_t meta, inout standard_metadata_t stdmeta) {
+    apply {
+    }
+}
+
+control updateChecksum(inout headers_t hdr, inout metadata_t meta) {
+    apply {
+    }
+}
+
+control deparserImpl(packet_out packet, in headers_t hdr) {
+    apply {
+    }
+}
+
+V1Switch<headers_t, metadata_t>(parserImpl(), verifyChecksum(), ingressImpl(), egressImpl(), updateChecksum(), deparserImpl()) main;
+