commit a07398ed98ea2b55ad7a505a3aab18aed93b149f
author John McCall <rjmccall@apple.com> Thu Jun 16 04:16:24 2011 +0000
committer John McCall <rjmccall@apple.com> Thu Jun 16 04:16:24 2011 +0000
tree 131d1435c6d1cdebdeab4c2a48e1f4371cd23c9e
parent c7b993b4dfc14ca2389087f21467259de8af7e91

Restore correct use of GC barriers.



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

lib/CodeGen/CGBlocks.cpp

diff --git a/lib/CodeGen/CGBlocks.cpp b/lib/CodeGen/CGBlocks.cpp
index ac47034..8ad82a6 100644
--- a/lib/CodeGen/CGBlocks.cpp
+++ b/lib/CodeGen/CGBlocks.cpp
@@ -618,8 +618,11 @@
 
       ImplicitCastExpr l2r(ImplicitCastExpr::OnStack, type, CK_LValueToRValue,
                            declRef, VK_RValue);
-      EmitExprAsInit(&l2r, &blockFieldPseudoVar, blockField,
-                     getContext().getDeclAlign(variable),
+      EmitExprAsInit(&l2r, &blockFieldPseudoVar,
+                     LValue::MakeAddr(blockField, type,
+                                      getContext().getDeclAlign(variable)
+                                                  .getQuantity(),
+                                      getContext()),
                      /*captured by init*/ false);
     }