Fixed a block regression caused by trying to use

an existing ir for load of a bock variable. This cannot be
done across basic blocks.
Fixes radar 8064140.

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

diff --git a/lib/CodeGen/CGBlocks.cpp b/lib/CodeGen/CGBlocks.cpp
index f789787b6166c650b79841cb54cfd0747059c66d..b2d7f2e81d4cbf1b51c3184ff12bc6a42a02567c 100644 (file)
--- a/lib/CodeGen/CGBlocks.cpp
+++ b/lib/CodeGen/CGBlocks.cpp
@@ -612,9 +612,6 @@ void CodeGenFunction::AllocateBlockDecl(const BlockDeclRefExpr *E) {
 
 llvm::Value *CodeGenFunction::GetAddrOfBlockDecl(const ValueDecl *VD,
                                                  bool IsByRef) {
-  llvm::Value *&VE = BlockDeclsValue[VD];
-  if (VE)
-    return VE;
   
   CharUnits offset = BlockDecls[VD];
   assert(!offset.isZero() && "getting address of unallocated decl");
@@ -648,7 +645,6 @@ llvm::Value *CodeGenFunction::GetAddrOfBlockDecl(const ValueDecl *VD,
     if (VD->getType()->isReferenceType())
       V = Builder.CreateLoad(V, "ref.tmp");
   }
-  VE = V;
   return V;
 }
 

diff --git a/lib/CodeGen/CGBlocks.h b/lib/CodeGen/CGBlocks.h
index 4d92201d0d91e1efbf104df84d16534008d4d809..d0466a86d86dcdd55f22fef02bc5e1b8f8e223cf 100644 (file)
--- a/lib/CodeGen/CGBlocks.h
+++ b/lib/CodeGen/CGBlocks.h
@@ -181,9 +181,6 @@ public:
   /// BlockDecls - Offsets for all Decls in BlockDeclRefExprs.
   llvm::DenseMap<const Decl*, CharUnits> BlockDecls;
   
-  /// BlockDeclsValue - llvm::Value for all Decls in BlockDeclRefExprs.
-  llvm::DenseMap<const Decl*, llvm::Value *> BlockDeclsValue;
-
   /// BlockCXXThisOffset - The offset of the C++ 'this' value within
   /// the block structure.
   CharUnits BlockCXXThisOffset;

diff --git a/test/CodeGenObjC/blocks-5.m b/test/CodeGenObjC/blocks-5.m
new file mode 100644 (file)
index 0000000..2d48b46
--- /dev/null
+++ b/test/CodeGenObjC/blocks-5.m
@@ -0,0 +1,37 @@
+// RUN: %clang_cc1 -triple x86_64-apple-darwin9 -emit-llvm -fblocks -o %t %s
+
+// rdar: // 8064140
+
+@interface IDEWorkspaceDocument 
+{
+  id _defaultEditorStateTree;
+}
+- (void)enumerateKeysAndObjectsUsingBlock:(void (^)(id key, id obj, unsigned char *stop))block ;
+@end
+
+
+
+int foo();
+extern void DVT (volatile const void * object, volatile const void * selector, const char * functionName); 
+@implementation IDEWorkspaceDocument
+
+- (void)stateSavingDefaultEditorStatesForURLs {
+ [_defaultEditorStateTree enumerateKeysAndObjectsUsingBlock:^(id identifier, id urlsToEditorStates, unsigned char *stop) {
+  do{ 
+if (foo() ) 
+  DVT(&self,&_cmd,__PRETTY_FUNCTION__);
+
+}while(0); 
+
+  do{ 
+       DVT(&self,&_cmd,__PRETTY_FUNCTION__);
+    }while(0); 
+
+
+ }];
+
+}
+
+- (void)enumerateKeysAndObjectsUsingBlock:(void (^)(id key, id obj, unsigned char *stop))block {}
+
+@end