Predication: Another problem

[fruffy]

The issues are become rare but there is another case where the predication pass has a problem.
I tried to make the expression look reasonable:

action assign_addrs(inout Headers h, bool check_1, bool check_2) {
    if (check_1) {
        h.eth_hdr.dst_addr = 2;
        if (check_2) {
            // note that this is not dst_addr
            h.eth_hdr.src_addr = 3;
        } else {
            h.eth_hdr.dst_addr = 1;
        }
    }
}

control ingress(inout Headers h, inout Meta m, inout standard_metadata_t sm) {
    apply {
        assign_addrs(h, true, true);
    }
}

Is transformed into

control ingress(inout Headers h, inout Meta m, inout standard_metadata_t sm) {
    ethernet_t h_1_eth_hdr;
    bool check_1;
    bool check_2;
    @name(".assign_addrs") action assign_addrs() {
        {
            h_1_eth_hdr = h.eth_hdr;
        }
        check_1 = true;
        check_2 = true;
        {
            {
                {
                    h_1_eth_hdr.src_addr = (check_1 ? (check_2 ? 48w3 : h_1_eth_hdr.src_addr) : h_1_eth_hdr.src_addr);
                    h_1_eth_hdr.dst_addr = (check_1 ? (check_2 ? h_1_eth_hdr.dst_addr : 48w1) : h_1_eth_hdr.dst_addr);
                }
            }
        }
        {
            h.eth_hdr = h_1_eth_hdr;
        }
    }
    apply {
        assign_addrs();
    }
}

The assignment h.eth_hdr.dst_addr = 2; is lost here.

predication_issue.p4.txt
predication_issue.stf.txt

[mihaibudiu]

@anasyrmia : can you please take a look?