commit 469a20de757ff872c90ff6b1134f6346909ff652
author Fariborz Jahanian <fjahanian@apple.com> Fri Sep 03 23:07:53 2010 +0000
committer Fariborz Jahanian <fjahanian@apple.com> Fri Sep 03 23:07:53 2010 +0000
tree f62940cbeebc4b234743044db4827de3df4b963d
parent 030ef472f31709e175895853fcb43d61d09022c7

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).


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

lib/CodeGen/CGDecl.cpp

diff --git a/lib/CodeGen/CGDecl.cpp b/lib/CodeGen/CGDecl.cpp
index 5017ce7..57e5236 100644
--- a/lib/CodeGen/CGDecl.cpp
+++ b/lib/CodeGen/CGDecl.cpp
@@ -373,7 +373,7 @@
   }
 
   // T x;
-  Types.push_back(ConvertType(Ty));
+  Types.push_back(ConvertTypeForMem(Ty));
   
   const llvm::Type *T = llvm::StructType::get(VMContext, Types, Packed);
   

lib/CodeGen/CGExpr.cpp

diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp
index b4d0e13..3750ab80 100644
--- a/lib/CodeGen/CGExpr.cpp
+++ b/lib/CodeGen/CGExpr.cpp
@@ -335,24 +335,6 @@
   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);
   

lib/CodeGen/CGExprScalar.cpp

diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp
index 4e16f66..2318cc4 100644
--- a/lib/CodeGen/CGExprScalar.cpp
+++ b/lib/CodeGen/CGExprScalar.cpp
@@ -1118,7 +1118,7 @@
   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());
 }
 
 //===----------------------------------------------------------------------===//