[llvm-branch-commits] [cfe-branch] r121543 - /cfe/branches/Apple/whitney/lib/CodeGen/CGBlocks.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Fri Dec 10 15:37:10 2010
New Revision: 121543

URL: http://llvm.org/viewvc/llvm-project?rev=121543&view=rev
Log:
Merge r119027:
--
Author: Fariborz Jahanian <fjahanian at apple.com>
Date:   Sun Nov 14 05:25:15 2010 +0000

    Removed unnecessary initialization of a flag which
    somehow got several block tests fail with a linux built
    compiler.

Modified:
    cfe/branches/Apple/whitney/lib/CodeGen/CGBlocks.cpp

Modified: cfe/branches/Apple/whitney/lib/CodeGen/CGBlocks.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney/lib/CodeGen/CGBlocks.cpp?rev=121543&r1=121542&r2=121543&view=diff
==============================================================================
--- cfe/branches/Apple/whitney/lib/CodeGen/CGBlocks.cpp (original)
+++ cfe/branches/Apple/whitney/lib/CodeGen/CGBlocks.cpp Fri Dec 10 15:37:10 2010
@@ -26,7 +26,7 @@
 
 CGBlockInfo::CGBlockInfo(const char *N)
   : Name(N), CXXThisRef(0), NeedsObjCSelf(false),
-    HasCXXObject(false), BlockHasCopyDispose(false) {
+    HasCXXObject(false) {
     
   // Skip asm prefix, if any.
   if (Name && Name[0] == '\01')