3 files changed, 2 insertions, 20 deletions
diff --git a/clang/lib/CodeGen/CGDecl.cpp b/clang/lib/CodeGen/CGDecl.cpp
index 5017ce720cb..57e5236c67e 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 b4d0e139930..3750ab80c3f 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 4e16f66ba42..2318cc4e9ae 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());
 }
 
 //===----------------------------------------------------------------------===//