diff options
| author | Anton Korobeynikov <asl@math.spbu.ru> | 2014-11-12 23:15:38 +0000 |
|---|---|---|
| committer | Anton Korobeynikov <asl@math.spbu.ru> | 2014-11-12 23:15:38 +0000 |
| commit | 50a3cbd7c0258e4887ef6b33532c107095f667e3 (patch) | |
| tree | ada5590bb258e2487114adf83bd2b7e793f32da0 /clang/lib/Sema/SemaExprCXX.cpp | |
| parent | 5de3d9c031bb4b1405f32168524dbc34f21bb897 (diff) | |
| download | bcm5719-llvm-50a3cbd7c0258e4887ef6b33532c107095f667e3.tar.gz bcm5719-llvm-50a3cbd7c0258e4887ef6b33532c107095f667e3.zip | |
Temporary revert r221818 until all the problems
with objc stuff will be resolved.
llvm-svn: 221829
Diffstat (limited to 'clang/lib/Sema/SemaExprCXX.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaExprCXX.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/clang/lib/Sema/SemaExprCXX.cpp b/clang/lib/Sema/SemaExprCXX.cpp index 26ffbfb58e3..88eb41ac448 100644 --- a/clang/lib/Sema/SemaExprCXX.cpp +++ b/clang/lib/Sema/SemaExprCXX.cpp @@ -4561,14 +4561,10 @@ QualType Sema::CXXCheckConditionalOperands(ExprResult &Cond, ExprResult &LHS, // the usual arithmetic conversions are performed to bring them to a // common type, and the result is of that type. if (LTy->isArithmeticType() && RTy->isArithmeticType()) { - QualType ResTy = UsualArithmeticConversions(LHS, RHS); + UsualArithmeticConversions(LHS, RHS); if (LHS.isInvalid() || RHS.isInvalid()) return QualType(); - - LHS = ImpCastExprToType(LHS.get(), ResTy, PrepareScalarCast(LHS, ResTy)); - RHS = ImpCastExprToType(RHS.get(), ResTy, PrepareScalarCast(RHS, ResTy)); - - return ResTy; + return LHS.get()->getType(); } // -- The second and third operands have pointer type, or one has pointer |
