Can you check that this commit fixes your problem?  If so I'll clean it up and push it to the main clang branch.

https://github.com/girving/xdress/tree/for-james