--- Merging r127980 into '.':

U    lib/Sema/SemaDeclCXX.cpp
U    lib/CodeGen/CGObjCGNU.cpp
U    lib/CodeGen/CGException.cpp
U    lib/CodeGen/CGRTTI.cpp
U    lib/CodeGen/CGException.h

llvm-svn: 128021