[cfe-commits] r105549 - in /cfe/trunk: lib/CodeGen/CGBlocks.cpp lib/CodeGen/CGBlocks.h test/CodeGenObjC/blocks-5.m

[Fariborz Jahanian]

Author: fjahanian
Date: Mon Jun  7 14:39:39 2010
New Revision: 105549

URL: http://llvm.org/viewvc/llvm-project?rev=105549&view=rev
Log:
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.

Added:
    cfe/trunk/test/CodeGenObjC/blocks-5.m
Modified:
    cfe/trunk/lib/CodeGen/CGBlocks.cpp
    cfe/trunk/lib/CodeGen/CGBlocks.h

Modified: cfe/trunk/lib/CodeGen/CGBlocks.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGBlocks.cpp?rev=105549&r1=105548&r2=105549&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGBlocks.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGBlocks.cpp Mon Jun  7 14:39:39 2010
@@ -612,9 +612,6 @@
 
 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 @@
     if (VD->getType()->isReferenceType())
       V = Builder.CreateLoad(V, "ref.tmp");
   }
-  VE = V;
   return V;
 }
 

Modified: cfe/trunk/lib/CodeGen/CGBlocks.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGBlocks.h?rev=105549&r1=105548&r2=105549&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGBlocks.h (original)
+++ cfe/trunk/lib/CodeGen/CGBlocks.h Mon Jun  7 14:39:39 2010
@@ -181,9 +181,6 @@
   /// 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;

Added: cfe/trunk/test/CodeGenObjC/blocks-5.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjC/blocks-5.m?rev=105549&view=auto
==============================================================================
--- cfe/trunk/test/CodeGenObjC/blocks-5.m (added)
+++ cfe/trunk/test/CodeGenObjC/blocks-5.m Mon Jun  7 14:39:39 2010
@@ -0,0 +1,37 @@
+// RUN: %clang_cc1 -triple x86_64-apple-darwin9 -emit-llvm -fblocks -o %t %s
+
+// rdar: // 8064140
+
+ at interface IDEWorkspaceDocument 
+{
+  id _defaultEditorStateTree;
+}
+- (void)enumerateKeysAndObjectsUsingBlock:(void (^)(id key, id obj, unsigned char *stop))block ;
+ at end
+
+
+
+int foo();
+extern void DVT (volatile const void * object, volatile const void * selector, const char * functionName); 
+ at 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 {}
+
+ at end