Missed merge that goes with the merge of r128210.
--- Merging r128208 into '.':
U    test/SemaCXX/goto.cpp
A    test/SemaCXX/goto2.cpp
U    lib/Sema/IdentifierResolver.cpp



git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_29@128364 91177308-0d34-0410-b5e6-96231b3b80d8
3 files changed