Finally getting back to this. Thanks for reporting the problem (we reverted it as a result, obviously).

Would you mind sharing a preprocessed version of the failing file please?

(Passing -save-temps to CC can do this, the relevant files should be xx.i)

Thanks.