Fix objc type conversion issues with the GNU runtime, patch by

David Chisnall

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

diff --git a/lib/CodeGen/CGObjCGNU.cpp b/lib/CodeGen/CGObjCGNU.cpp
index 2621a8491406e4c39178add515f9326a522f2f90..9c83b75b2af89208995e3ccaf6187832f9e7dad5 100644 (file)
--- a/lib/CodeGen/CGObjCGNU.cpp
+++ b/lib/CodeGen/CGObjCGNU.cpp
@@ -40,8 +40,8 @@ class CGObjCGNU : public CodeGen::CGObjCRuntime {
 private:
   CodeGen::CodeGenModule &CGM;
   llvm::Module &TheModule;
-  const llvm::StructType *SelStructTy;
-  const llvm::Type *SelectorTy;
+  const llvm::PointerType *SelectorTy;
+  const llvm::Type *ExpectedSelTy;
   const llvm::Type *PtrToInt8Ty;
   const llvm::Type *IMPTy;
   const llvm::Type *IdTy;
@@ -168,11 +168,12 @@ CGObjCGNU::CGObjCGNU(CodeGen::CodeGenModule &cgm)
   PtrToInt8Ty = 
     llvm::PointerType::getUnqual(llvm::Type::Int8Ty);
   // Get the selector Type.
-  SelStructTy = llvm::StructType::get(
-      PtrToInt8Ty,
-      PtrToInt8Ty,
-      NULL);
-  SelectorTy = llvm::PointerType::getUnqual(SelStructTy);
+  SelectorTy = cast<llvm::PointerType>(
+         CGM.getTypes().ConvertType(CGM.getContext().getObjCSelType()));
+
+  ExpectedSelTy = 
+    CGM.getTypes().ConvertType(CGM.getContext().getObjCSelType());
+
   PtrToIntTy = llvm::PointerType::getUnqual(IntTy);
   PtrTy = PtrToInt8Ty;
  
@@ -797,6 +798,9 @@ llvm::Function *CGObjCGNU::ModuleInitFunction() {
       UntypedSelectors.empty())
     return NULL;
 
+  const llvm::StructType *SelStructTy = 
+    cast<llvm::StructType>(SelectorTy->getTypeAtIndex(0U));
+
   // Name the ObjC types to make the IR a bit easier to read
   TheModule.addTypeName(".objc_selector", SelectorTy);
   TheModule.addTypeName(".objc_id", IdTy);