commit 145c08360a8ef90392bb0482c94f47e632e78f8c
author Eli Friedman <eli.friedman@gmail.com> Fri May 16 17:37:11 2008 +0000
committer Eli Friedman <eli.friedman@gmail.com> Fri May 16 17:37:11 2008 +0000
tree 22287dc136aa75e042304dc8d19ef70986fdc483
parent 9c2535a35db35b3a821a0d0c36a01a16f52f1ad0

Patch for PR2334, and a similar ObjC bug.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@51193 91177308-0d34-0410-b5e6-96231b3b80d8

lib/CodeGen/CGExprScalar.cpp

diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp
index bdd7975..8442b81 100644
--- a/lib/CodeGen/CGExprScalar.cpp
+++ b/lib/CodeGen/CGExprScalar.cpp
@@ -1050,7 +1050,8 @@
   // 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 +1060,8 @@
   
   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();
   

test/CodeGen/conditional.c

diff --git a/test/CodeGen/conditional.c b/test/CodeGen/conditional.c
index ae44207..d3e5c0b 100644
--- a/test/CodeGen/conditional.c
+++ b/test/CodeGen/conditional.c
@@ -25,3 +25,8 @@
   void* vp;
   cip = 0 ? vp : cip;
 }
+
+void test6();
+void test7(int);
+void* test8() {return 1 ? test6 : test7;}
+