From 087206dbcd41a7c0b42ed4fa97c27cdc5781dcc0 Mon Sep 17 00:00:00 2001
From: Fariborz Jahanian <fjahanian@apple.com>
Date: Fri, 3 Sep 2010 23:07:53 +0000
Subject: [PATCH] Truncate block variable of bool type to i1 when its value is
 used. This matches with non-block variable use of bool type. (Fixes radar
 8390062).

llvm-svn: 113027
---
 clang/lib/CodeGen/CGDecl.cpp       |  2 +-
 clang/lib/CodeGen/CGExpr.cpp       | 18 ------------------
 clang/lib/CodeGen/CGExprScalar.cpp |  2 +-
 clang/test/SemaCXX/blocks.cpp      |  7 +++++++
 4 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/clang/lib/CodeGen/CGDecl.cpp b/clang/lib/CodeGen/CGDecl.cpp
index 5017ce720cbb..57e5236c67e5 100644
--- a/clang/lib/CodeGen/CGDecl.cpp
+++ b/clang/lib/CodeGen/CGDecl.cpp
@@ -373,7 +373,7 @@ const llvm::Type *CodeGenFunction::BuildByRefType(const ValueDecl *D) {
   }
 
   // T x;
-  Types.push_back(ConvertType(Ty));
+  Types.push_back(ConvertTypeForMem(Ty));
   
   const llvm::Type *T = llvm::StructType::get(VMContext, Types, Packed);
   
diff --git a/clang/lib/CodeGen/CGExpr.cpp b/clang/lib/CodeGen/CGExpr.cpp
index b4d0e1399304..3750ab80c3fc 100644
--- a/clang/lib/CodeGen/CGExpr.cpp
+++ b/clang/lib/CodeGen/CGExpr.cpp
@@ -335,24 +335,6 @@ CodeGenFunction::EmitReferenceBindingToExpr(const Expr* E,
   llvm::Value *Value = EmitExprForReferenceBinding(*this, E, ReferenceTemporary,
                                                    ReferenceTemporaryDtor,
                                                    InitializedDecl);
-  if (E->getType()->isBooleanType()) {
-    // special handling for __block variable of bool type bound to
-    // a reference type.
-    bool block_byref_var = false;
-    if (const BlockDeclRefExpr *BE = dyn_cast<BlockDeclRefExpr>(E))
-      block_byref_var = BE->isByRef();
-    else if (const DeclRefExpr *BD = dyn_cast<DeclRefExpr>(E)) {
-      const NamedDecl *ND = BD->getDecl();
-      if (const VarDecl *VD = dyn_cast<VarDecl>(ND))
-        block_byref_var = VD->hasAttr<BlocksAttr>();
-    }
-    if (block_byref_var) {
-      const llvm::Type *T = ConvertTypeForMem(E->getType());
-      T = llvm::PointerType::getUnqual(T);
-      Value = Builder.CreateBitCast(Value, T);
-    }
-  }
-
   if (!ReferenceTemporaryDtor)
     return RValue::get(Value);
   
diff --git a/clang/lib/CodeGen/CGExprScalar.cpp b/clang/lib/CodeGen/CGExprScalar.cpp
index 4e16f66ba422..2318cc4e9aeb 100644
--- a/clang/lib/CodeGen/CGExprScalar.cpp
+++ b/clang/lib/CodeGen/CGExprScalar.cpp
@@ -1118,7 +1118,7 @@ Value *ScalarExprEmitter::VisitBlockDeclRefExpr(const BlockDeclRefExpr *E) {
   llvm::Value *V = CGF.GetAddrOfBlockDecl(E);
   if (E->getType().isObjCGCWeak())
     return CGF.CGM.getObjCRuntime().EmitObjCWeakRead(CGF, V);
-  return Builder.CreateLoad(V, "tmp");
+  return CGF.EmitLoadOfScalar(V, false, 0, E->getType());
 }
 
 //===----------------------------------------------------------------------===//
diff --git a/clang/test/SemaCXX/blocks.cpp b/clang/test/SemaCXX/blocks.cpp
index 4fd9941a2e3e..adbff553e608 100644
--- a/clang/test/SemaCXX/blocks.cpp
+++ b/clang/test/SemaCXX/blocks.cpp
@@ -48,16 +48,23 @@ namespace radar8382559 {
 
   int test3() {
     __attribute__((__blocks__(byref))) bool hasProperty = false;
+    bool has = true;
+
     bool (^b)() = ^ {
      func(hasProperty);
      if (hasProperty)
        hasProperty = 0;
+     if (has)
+       hasProperty = 1;
      return hasProperty;
      };
     func(hasProperty);
+    func(has);
     b();
     if (hasProperty)
       hasProperty = 1;
+    if (has)
+      has = 2;
     return hasProperty = 1;
   }
 }