Even more careful consideration of C++11 13.3.3.1p4. Fixes PR12241.

llvm-svn: 153523
2 files changed