intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-28 19:43:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix a nasty bug where temporaries weren't marked as being conditional in some cases.

Browse Source 
llvm-svn: 94341
This commit is contained in:
Anders Carlsson
2010-01-24 00:20:05 +00:00
parent 0bd52403d4
commit 60ddba67a8
3 changed files with 42 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -431,7 +431,11 @@ void CodeGenFunction::EmitBranchOnBoolExpr(const Expr *Cond,
EmitBranchOnBoolExpr(CondBOp->getLHS(), LHSTrue, FalseBlock);
EmitBlock(LHSTrue);
// Any temporaries created here are conditional.
StartConditionalBranch();
EmitBranchOnBoolExpr(CondBOp->getRHS(), TrueBlock, FalseBlock);
FinishConditionalBranch();
return;
} else if (CondBOp->getOpcode() == BinaryOperator::LOr) {
// If we have "0 || X", simplify the code. "1 || X" would have constant
@@ -454,7 +458,11 @@ void CodeGenFunction::EmitBranchOnBoolExpr(const Expr *Cond,
EmitBranchOnBoolExpr(CondBOp->getLHS(), TrueBlock, LHSFalse);
EmitBlock(LHSFalse);
// Any temporaries created here are conditional.
StartConditionalBranch();
EmitBranchOnBoolExpr(CondBOp->getRHS(), TrueBlock, FalseBlock);
FinishConditionalBranch();
return;
}
}

3
clang/lib/CodeGen/CodeGenFunction.h
View File

@@ -283,6 +283,9 @@ public:
/// FinishConditionalBranch - Should be called after a conditional part of an
/// expression has been emitted.
void FinishConditionalBranch() {
assert(ConditionalBranchLevel != 0 &&
"Conditional branch mismatch!");
--ConditionalBranchLevel;
}

32
clang/test/CodeGenCXX/temp-order.cpp
View File

@@ -129,10 +129,30 @@ static unsigned f6() {
return tt.Product;
}
// 5, 2
static unsigned f7() {
TempTracker tt;
{
(void)((A(tt, 2, false) && A(tt, 3, false)) || A(tt, 5, false));
}
return tt.Product;
}
// 5, 2
static unsigned f8() {
TempTracker tt;
{
(void)((A(tt, 2) || A(tt, 3)) && A(tt, 5));
}
return tt.Product;
}
extern "C" void error();
extern "C" void print(const char *Name, unsigned N);
#define ORDER3(a, b, c) (pow(a, 1) * pow(b, 2) * pow(c, 3))
#define ORDER2(a, b) (pow(a, 1) * pow(b, 2))
#define ORDER3(a, b, c) (ORDER2(a, b) * pow(c, 3))
#define ORDER4(a, b, c, d) (ORDER3(a, b, c) * pow(d, 4))
#define ORDER5(a, b, c, d, e) (ORDER4(a, b, c, d) * pow(e, 5))
#define ORDER6(a, b, c, d, e, f) (ORDER5(a, b, c, d, e) * pow(f, 6))
@@ -171,6 +191,16 @@ void test() {
print("f6", f6());
if (f6() != ORDER6(3, 7, 11, 5, 13, 2))
error();
// CHECK: call void @print(i8* {{.*}}, i32 20)
print("f7", f7());
if (f7() != ORDER2(5, 2))
error();
// CHECK: call void @print(i8* {{.*}}, i32 20)
print("f8", f8());
if (f8() != ORDER2(5, 2))
error();
}