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

llvm-svn: 128364