[cfe-commits] r51203 - /cfe/trunk/lib/CodeGen/CGExprScalar.cpp

[Eli Friedman]

Author: efriedma
Date: Fri May 16 15:38:39 2008
New Revision: 51203

URL: http://llvm.org/viewvc/llvm-project?rev=51203&view=rev
Log:
Backout of codegen-based fix to PR2334; this has been fixed differently 
at the Sema layer.


Modified:
    cfe/trunk/lib/CodeGen/CGExprScalar.cpp

Modified: cfe/trunk/lib/CodeGen/CGExprScalar.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGExprScalar.cpp?rev=51203&r1=51202&r2=51203&view=diff

==============================================================================
--- cfe/trunk/lib/CodeGen/CGExprScalar.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGExprScalar.cpp Fri May 16 15:38:39 2008
@@ -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();