Always insert instantiation statement at the end of the local stateme…

…nt list (#3962)

frontends/p4/directCalls.cpp

@@ -3,15 +3,13 @@
 namespace P4 {
 
 const IR::Node *DoInstantiateCalls::postorder(IR::P4Parser *parser) {
-    insert.append(parser->parserLocals);
-    parser->parserLocals = insert;
+    parser->parserLocals.append(insert);
     insert.clear();
     return parser;
 }
 
 const IR::Node *DoInstantiateCalls::postorder(IR::P4Control *control) {
-    insert.append(control->controlLocals);
-    control->controlLocals = insert;
+    control->controlLocals.append(insert);
     insert.clear();
     return control;
 }

testdata/p4_16_errors_outputs/list-error.p4

@@ -15,4 +15,3 @@ control c() {
 control C();
 package top(C _c);
 top(c()) main;
-

testdata/p4_16_errors_outputs/psa-meter2.p4

@@ -67,8 +67,5 @@ control MyED(packet_out buffer, out EMPTY a, out EMPTY b, inout EMPTY c, in EMPT
 }
 
 IngressPipeline(MyIP(), MyIC(), MyID()) ip;
-
 EgressPipeline(MyEP(), MyEC(), MyED()) ep;
-
 PSA_Switch(ip, PacketReplicationEngine(), ep, BufferingQueueingEngine()) main;
-

testdata/p4_16_samples/extern-inst-as-param.p4

@@ -0,0 +1,37 @@
+#include <core.p4>
+
+extern MyCounter<I> {
+    MyCounter(bit<32> size);
+    void count(in I index);
+}
+
+typedef bit<10> my_counter_index_t;
+typedef MyCounter<my_counter_index_t> my_counter_t;
+
+control Inner(my_counter_t counter_set) {
+    action count(my_counter_index_t index) {
+        counter_set.count(index);
+    }
+
+    table counter_table {
+        actions = {
+            count;
+        }
+    }
+
+    apply {
+        counter_table.apply();
+    }
+}
+
+control Test() {
+    my_counter_t(1024) counter_set;
+
+    apply {
+        Inner.apply(counter_set);
+    }
+}
+
+control C();
+package P(C _c);
+P(Test()) main;

testdata/p4_16_samples_outputs/dash/dash-pipeline-first.p4

@@ -424,7 +424,6 @@ control acl(inout headers_t hdr, inout metadata_t meta, inout standard_metadata_
 }
 
 control outbound(inout headers_t hdr, inout metadata_t meta, inout standard_metadata_t standard_metadata) {
-    @name("acl") acl() acl_inst;
     action route_vnet(bit<16> dst_vnet_id) {
         meta.dst_vnet_id = dst_vnet_id;
     }
@@ -488,6 +487,7 @@ control outbound(inout headers_t hdr, inout metadata_t meta, inout standard_meta
         }
         default_action = NoAction();
     }
+    @name("acl") acl() acl_inst;
     apply {
         if (meta.conntrack_data.allow_out) {
             ;
@@ -560,8 +560,6 @@ control dash_compute_checksum(inout headers_t hdr, inout metadata_t meta) {
 }
 
 control dash_ingress(inout headers_t hdr, inout metadata_t meta, inout standard_metadata_t standard_metadata) {
-    @name("outbound") outbound() outbound_inst;
-    @name("inbound") inbound() inbound_inst;
     action drop_action() {
         mark_to_drop(standard_metadata);
     }
@@ -730,6 +728,8 @@ control dash_ingress(inout headers_t hdr, inout metadata_t meta, inout standard_
         }
         default_action = NoAction();
     }
+    @name("outbound") outbound() outbound_inst;
+    @name("inbound") inbound() inbound_inst;
     apply {
         standard_metadata.egress_spec = standard_metadata.ingress_port;
         if (vip.apply().hit) {