Unpick doesn't replace some extended usage of methods

[Lulu13022002]

Given the following definitions in v4 applied to the following source:

unpick v4

group int colors
    org.example.CommonColors.*

target_method org.example.Main consume (I)V
    param 0 colors

public class CommonColors {
    public static final int WHITE = -1;
    public static final int SOFT_RED = -2142128;
}
...
public static void testUnpick() {
    boolean accepted = true;
    int inviteColor;
    if (accepted) {
        inviteColor = CommonColors.SOFT_RED;
    } else {
        inviteColor = CommonColors.WHITE;
    }

    consume(inviteColor);
}

public static void consume(int color) {
}

Unpick manage to restore CommonColors.WHITE but not CommonColors.SOFT_RED. It seems the first branch is always ignored in this case, I'm not sure why it happens.

[Lulu13022002]

Another similar example with ternary operator

unpick v4

group int char_flags
    @flags
    org.example.Main.*

target_method org.example.Main consume (I)V
    param 0 char_flags

public static final int BUOYANT_FLAG = 1 << 1;
public static final int EXPLOSIVE_FLAG = 1 << 2;

public void testFlags(boolean ignoreFlags) {
    int defaultFlags = BUOYANT_FLAG | EXPLOSIVE_FLAG;
    int flags = !ignoreFlags ? defaultFlags : 0;
    consume(flags);
}

public static void consume(int flags) {
}

Once the transformed jar is decompiled defaultFlags doesn't use the constant. When the ternary is inverted (ignoreFlags ? 0 : defaultFlags) it works fine however.