Index: CGExprScalar.cpp
===================================================================
--- CGExprScalar.cpp	(revision 51135)
+++ CGExprScalar.cpp	(working copy)
@@ -1050,7 +1050,7 @@
   // Handle the GNU extension for missing LHS.
   Value *LHS;
   if (E->getLHS())
-    LHS = Visit(E->getLHS());
+    LHS = EmitScalarConversion(Visit(E->getLHS()), E->getLHS()->getType(), E->getType());
   else    // Perform promotions, to handle cases like "short ?: int"
     LHS = EmitScalarConversion(CondVal, E->getCond()->getType(), E->getType());
   
@@ -1059,7 +1059,7 @@
   
   CGF.EmitBlock(RHSBlock);
   
-  Value *RHS = Visit(E->getRHS());
+  Value *RHS = EmitScalarConversion(Visit(E->getRHS()), E->getRHS()->getType(), E->getType());
   Builder.CreateBr(ContBlock);
   RHSBlock = Builder.GetInsertBlock();