> As you say, the logic is convoluted.  Let's simplify it rather than make
> it more convoluted.  One possibility would be to change || to | to avoid
> the shortcut, and then
> 
> bool note = lastalign > curalign;
> if (note)
>     curalign = lastalign;

I went with your suggestion in the attached v2.  Regtested and 
bootstrapped on s390x, x86 and ppc64le.

Regards
  Robin