This is now passing. Uncomment and close out PR6281.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@192869 91177308-0d34-0410-b5e6-96231b3b80d8