Approved by Chris:

$ svn merge -c 113124 https://llvm.org/svn/llvm-project/cfe/trunk
--- Merging r113124 into '.':
A    test/SemaCXX/unary-real-imag.cpp
U    lib/Sema/SemaExpr.cpp

Log:
PR8023: Don't crash on invalid uses of __real__ on class types in C++.

$ svn merge -c 113125 https://llvm.org/svn/llvm-project/cfe/trunk
--- Merging r113125 into '.':
U    lib/Lex/Pragma.cpp

Log:
fix 7320: we can't delete a trailing space if it doesn't exist.

$ svn merge -c 113127 https://llvm.org/svn/llvm-project/cfe/trunk
--- Merging r113127 into '.':
U    test/Sema/warn-write-strings.c
U    lib/Headers/stddef.h

Log:
fix PR7192 by defining wchar_t in a more conventional way.  The
type of L"x" can change based on command line arguments.

$ svn merge -c 113128 https://llvm.org/svn/llvm-project/cfe/trunk
--- Merging r113128 into '.':
A    test/CodeGen/fold-const-declref.c
U    lib/AST/ExprConstant.cpp

Log:
PR7242: Make sure to use a different context for evaluating constant
initializers, so the result of the evaluation doesn't leak through
inconsistently.  Also, don't evaluate references to variables with
initializers with side-effects.

$ svn merge -c 113130 https://llvm.org/svn/llvm-project/cfe/trunk
--- Merging r113130 into '.':
U    test/CodeGen/designated-initializers.c
U    lib/CodeGen/CGExprAgg.cpp

Log:
move the hackaround for PR6537 to catch unions as well,
fixing the ICE in PR7151

$ svn merge -c 113131 https://llvm.org/svn/llvm-project/cfe/trunk
--- Merging r113131 into '.':
U    test/SemaCXX/i-c-e-cxx.cpp

Log:
Update test for r113128.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_28@113151 91177308-0d34-0410-b5e6-96231b3b80d8
10 files changed