Looks like this is in out fork of GCC cpp. Did upstream GCC fix this issue the same way? If yes, should we just rebase our fork to a newwer upstream GCC? @felixs?