Revert "Another i1 vs. i8 type mismatch issue. This time", it breaks some projects.

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

2 files changed, 1 insertions, 11 deletions

diff --git a/lib/CodeGen/CGDecl.cpp b/lib/CodeGen/CGDecl.cpp
index d4c65e3e74..8ce196b64e 100644
--- a/lib/CodeGen/CGDecl.cpp
+++ b/lib/CodeGen/CGDecl.cpp
@@ -373,7 +373,7 @@ const llvm::Type *CodeGenFunction::BuildByRefType(const ValueDecl *D) {
   }
 
   // T x;
-  Types.push_back(ConvertTypeForMem(Ty));
+  Types.push_back(ConvertType(Ty));
   
   const llvm::Type *T = llvm::StructType::get(VMContext, Types, Packed);
   
diff --git a/test/CodeGenCXX/reference-in-blocks.cpp b/test/CodeGenCXX/reference-in-blocks.cpp
index f08ef56880..388ec7c4bb 100644
--- a/test/CodeGenCXX/reference-in-blocks.cpp
+++ b/test/CodeGenCXX/reference-in-blocks.cpp
@@ -41,13 +41,3 @@ int main() {
 	a->F();
         return 0;
 }
-
-// rdar://8382559
-namespace radar8382559 {
-  void func(bool& outHasProperty);
-
-  void test() {
-    __attribute__((__blocks__(byref))) bool hasProperty = false;
-    func(hasProperty);
-  }
-}