From: Mike Stump <mrs@apple.com>
Date: Tue, 20 Oct 2009 20:30:01 +0000 (+0000)
Subject: For now, we need to have the llvm type of the block pointer remain as
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bf1914ba8b3ed6c8492ac5857d790384b019cd0a;p=clang

For now, we need to have the llvm type of the block pointer remain as
it was.  Fixes codegen bug introduced yesterday.


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

diff --git a/lib/CodeGen/CGBlocks.cpp b/lib/CodeGen/CGBlocks.cpp
index 5998493986..8e020c80ea 100644
--- a/lib/CodeGen/CGBlocks.cpp
+++ b/lib/CodeGen/CGBlocks.cpp
@@ -576,7 +576,10 @@ BlockModule::GetAddrOfGlobalBlock(const BlockExpr *BE, const char * n) {
 }
 
 llvm::Value *CodeGenFunction::LoadBlockStruct() {
-  return Builder.CreateLoad(LocalDeclMap[getBlockStructDecl()], "self");
+  llvm::Value *V = Builder.CreateLoad(LocalDeclMap[getBlockStructDecl()],
+                                      "self");
+  // For now, we codegen based upon byte offsets.
+  return Builder.CreateBitCast(V, PtrToInt8Ty);
 }
 
 llvm::Function *