Backout of codegen-based fix to PR2334; this has been fixed differently
at the Sema layer.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@51203 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp
index 8442b81..bdd7975 100644
--- a/lib/CodeGen/CGExprScalar.cpp
+++ b/lib/CodeGen/CGExprScalar.cpp
@@ -1050,8 +1050,7 @@
// Handle the GNU extension for missing LHS.
Value *LHS;
if (E->getLHS())
- LHS = EmitScalarConversion(Visit(E->getLHS()), E->getLHS()->getType(),
- E->getType());
+ LHS = Visit(E->getLHS());
else // Perform promotions, to handle cases like "short ?: int"
LHS = EmitScalarConversion(CondVal, E->getCond()->getType(), E->getType());
@@ -1060,8 +1059,7 @@
CGF.EmitBlock(RHSBlock);
- Value *RHS = EmitScalarConversion(Visit(E->getRHS()), E->getRHS()->getType(),
- E->getType());
+ Value *RHS = Visit(E->getRHS());
Builder.CreateBr(ContBlock);
RHSBlock = Builder.GetInsertBlock();