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

Fix a bug where we would not mark temporaries as conditional when emitting a conditional operator as an lvalue. 

llvm-svn: 95311
This commit is contained in:
Anders Carlsson 2010-02-04 17:26:01 +00:00
parent e5dfc26850
commit 9b942c65a5
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clang/lib/CodeGen/CGExpr.cpp
View File

@ -1538,9 +1538,12 @@ CodeGenFunction::EmitConditionalOperatorLValue(const ConditionalOperator* E) {
EmitBranchOnBoolExpr(E->getCond(), LHSBlock, RHSBlock);
// Any temporaries created here are conditional.
BeginConditionalBranch();
EmitBlock(LHSBlock);
LValue LHS = EmitLValue(E->getLHS());
EndConditionalBranch();
if (!LHS.isSimple())
return EmitUnsupportedLValue(E, "conditional operator");
@ -1548,8 +1551,11 @@ CodeGenFunction::EmitConditionalOperatorLValue(const ConditionalOperator* E) {
Builder.CreateStore(LHS.getAddress(), Temp);
EmitBranch(ContBlock);
// Any temporaries created here are conditional.
BeginConditionalBranch();
EmitBlock(RHSBlock);
LValue RHS = EmitLValue(E->getRHS());
EndConditionalBranch();
if (!RHS.isSimple())
return EmitUnsupportedLValue(E, "conditional operator");

6
clang/test/CodeGenCXX/conditional-temporaries.cpp
View File

@ -9,14 +9,20 @@ struct A {
A() : i(0) { ctorcalls++; }
~A() { dtorcalls++; }
int i;
friend const A& operator<<(const A& a, int n) {
return a;
}
};
void g(int) { }
void g(const A&) { }
void f1(bool b) {
g(b ? A().i : 0);
g(b || A().i);
g(b && A().i);
g(b ? A() << 1 : A() << 2);
}
struct Checker {