diff options
| -rw-r--r-- | lib/CodeGen/CGExprScalar.cpp | 4 | ||||
| -rw-r--r-- | test/CodeGen/blocks-seq.c | 13 |
2 files changed, 16 insertions, 1 deletions
diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp index 05573d6aec..01dd94c274 100644 --- a/lib/CodeGen/CGExprScalar.cpp +++ b/lib/CodeGen/CGExprScalar.cpp @@ -1189,8 +1189,10 @@ Value *ScalarExprEmitter::EmitCompare(const BinaryOperator *E,unsigned UICmpOpc, } Value *ScalarExprEmitter::VisitBinAssign(const BinaryOperator *E) { - LValue LHS = EmitLValue(E->getLHS()); + // __block variables need to have the rhs evaluated first, plus + // this should improve codegen just a little. Value *RHS = Visit(E->getRHS()); + LValue LHS = EmitLValue(E->getLHS()); // Store the value into the LHS. Bit-fields are handled specially // because the result is altered by the store, i.e., [C99 6.5.16p1] diff --git a/test/CodeGen/blocks-seq.c b/test/CodeGen/blocks-seq.c new file mode 100644 index 0000000000..eb4990a3df --- /dev/null +++ b/test/CodeGen/blocks-seq.c @@ -0,0 +1,13 @@ +// RUN: clang-cc -fblocks -triple x86_64-apple-darwin10 -emit-llvm -o %t %s && +// RUN: grep '%call = call i32 (...)\* @rhs()' %t | count 1 && +// If this fails, see about sliding %4 and %5... +// RUN: grep '%forwarding1 = getelementptr %0\* %i, i32 0, i32 1' %t | count 1 && +// RUN: grep '%4 = bitcast i8\*\* %forwarding1 to %0\*\*' %t | count 1 && +// RUN: grep '%5 = load %0\*\* %4' %t | count 1 + +int rhs(); + +void foo() { + __block int i; + i = rhs(); +} |