Add codegen support for aggregate BlockDeclRefExprs.

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

2 files changed, 13 insertions, 4 deletions

diff --git a/lib/CodeGen/CGExprAgg.cpp b/lib/CodeGen/CGExprAgg.cpp
index b3d9cb6843..ff107f9da4 100644
--- a/lib/CodeGen/CGExprAgg.cpp
+++ b/lib/CodeGen/CGExprAgg.cpp
@@ -72,6 +72,9 @@ public:
     EmitAggLoadOfLValue(E);
   }
   
+  void VisitBlockDeclRefExpr(const BlockDeclRefExpr *E)
+      { EmitAggLoadOfLValue(E); }
+
   // Operators.
   //  case Expr::UnaryOperatorClass:
   //  case Expr::CastExprClass: 
diff --git a/test/CodeGen/blocks-1.c b/test/CodeGen/blocks-1.c
index 8572f8d6cf..ae63e73a18 100644
--- a/test/CodeGen/blocks-1.c
+++ b/test/CodeGen/blocks-1.c
@@ -1,11 +1,11 @@
 // RUN: clang %s -emit-llvm -o %t -fblocks -f__block &&
-// RUN: grep "_Block_object_dispose" %t | count 10 &&
-// RUN: grep "__copy_helper_block_" %t | count 6 &&
-// RUN: grep "__destroy_helper_block_" %t | count 6 &&
+// RUN: grep "_Block_object_dispose" %t | count 12 &&
+// RUN: grep "__copy_helper_block_" %t | count 8 &&
+// RUN: grep "__destroy_helper_block_" %t | count 8 &&
 // RUN: grep "__Block_byref_id_object_copy_" %t | count 2 &&
 // RUN: grep "__Block_byref_id_object_dispose_" %t | count 2 &&
 // RUN: grep "i32 135)" %t | count 2 &&
-// RUN: grep "_Block_object_assign" %t | count 6
+// RUN: grep "_Block_object_assign" %t | count 7
 
 #include <stdio.h>
 
@@ -50,11 +50,17 @@ int test4() {
 
 int g;
 
+void test5() {
+  __block struct { int i; } i;
+  ^{ (void)i; }();
+}
+
 int main() {
   int rv = 0;
   test1();
   test2();
   test3();
   rv += test4();
+  test5();
   return rv;
 }