[cfe-commits] r112922 - in /cfe/trunk: lib/CodeGen/CGDecl.cpp test/CodeGenCXX/reference-in-blocks.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Thu Sep  2 19:35:23 2010
New Revision: 112922

URL: http://llvm.org/viewvc/llvm-project?rev=112922&view=rev
Log:
Revert "Another i1 vs. i8 type mismatch issue. This time", it breaks some projects.

Modified:
    cfe/trunk/lib/CodeGen/CGDecl.cpp
    cfe/trunk/test/CodeGenCXX/reference-in-blocks.cpp

Modified: cfe/trunk/lib/CodeGen/CGDecl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDecl.cpp?rev=112922&r1=112921&r2=112922&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGDecl.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGDecl.cpp Thu Sep  2 19:35:23 2010
@@ -373,7 +373,7 @@
   }
 
   // T x;
-  Types.push_back(ConvertTypeForMem(Ty));
+  Types.push_back(ConvertType(Ty));
   
   const llvm::Type *T = llvm::StructType::get(VMContext, Types, Packed);
   

Modified: cfe/trunk/test/CodeGenCXX/reference-in-blocks.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/reference-in-blocks.cpp?rev=112922&r1=112921&r2=112922&view=diff
==============================================================================
--- cfe/trunk/test/CodeGenCXX/reference-in-blocks.cpp (original)
+++ cfe/trunk/test/CodeGenCXX/reference-in-blocks.cpp Thu Sep  2 19:35:23 2010
@@ -41,13 +41,3 @@
 	a->F();
         return 0;
 }
-
-// rdar://8382559
-namespace radar8382559 {
-  void func(bool& outHasProperty);
-
-  void test() {
-    __attribute__((__blocks__(byref))) bool hasProperty = false;
-    func(hasProperty);
-  }
-}