maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Backout of codegen-based fix to PR2334; this has been fixed differently 

at the Sema layer.

llvm-svn: 51203
This commit is contained in:
Eli Friedman 2008-05-16 20:38:39 +00:00
parent 928ab4d546
commit d5a4838e3d
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clang/lib/CodeGen/CGExprScalar.cpp
View File

@ -1050,8 +1050,7 @@ VisitConditionalOperator(const ConditionalOperator *E) {
// 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 @@ VisitConditionalOperator(const ConditionalOperator *E) {
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();