Improve Objective-C support

gen/abi/aarch64.cpp

@@ -176,9 +176,9 @@ struct AArch64TargetABI : TargetABI {
     return TypeIdentifier::create(Loc(), Identifier::idPool("__va_list"));
   }
 
-  const char *objcMsgSendFunc(Type *ret, IrFuncTy &fty) override {
+  const char *objcMsgSendFunc(Type *ret, IrFuncTy &fty, bool superCall) override {
     // see objc/message.h for objc_msgSend selection rules
-    return "objc_msgSend";
+    return superCall ? "objc_msgSendSuper" : "objc_msgSend";
   }
 };
 

gen/abi/abi.cpp

@@ -207,7 +207,7 @@ Type *TargetABI::vaListType() {
 
 //////////////////////////////////////////////////////////////////////////////
 
-const char *TargetABI::objcMsgSendFunc(Type *ret, IrFuncTy &fty) {
+const char *TargetABI::objcMsgSendFunc(Type *ret, IrFuncTy &fty, bool superCall) {
   llvm_unreachable("Unknown Objective-C ABI");
 }
 

gen/abi/abi.h

@@ -171,7 +171,7 @@ struct TargetABI {
   virtual Type *vaListType();
 
   /// Returns Objective-C message send function
-  virtual const char *objcMsgSendFunc(Type *ret, IrFuncTy &fty);
+  virtual const char *objcMsgSendFunc(Type *ret, IrFuncTy &fty, bool superCall);
 
   /***** Static Helpers *****/
 

gen/abi/arm.cpp

@@ -123,12 +123,12 @@ struct ArmTargetABI : TargetABI {
     return TypeIdentifier::create(Loc(), Identifier::idPool("__va_list"));
   }
 
-  const char *objcMsgSendFunc(Type *ret, IrFuncTy &fty) override {
+  const char *objcMsgSendFunc(Type *ret, IrFuncTy &fty, bool superCall) override {
     // see objc/message.h for objc_msgSend selection rules
     if (fty.arg_sret) {
       return "objc_msgSend_stret";
     }
-    return "objc_msgSend";
+    return superCall ? "objc_msgSendSuper" : "objc_msgSend";
   }
 };
 

gen/abi/x86-64.cpp

@@ -382,21 +382,15 @@ Type *X86_64TargetABI::vaListType() {
       TypeIdentifier::create(Loc(), Identifier::idPool("__va_list_tag")));
 }
 
-const char *X86_64TargetABI::objcMsgSendFunc(Type *ret,
-                                             IrFuncTy &fty) {
+const char *X86_64TargetABI::objcMsgSendFunc(Type *ret, IrFuncTy &fty, bool superCall) {
   // see objc/message.h for objc_msgSend selection rules
+  assert(isDarwin);
   if (fty.arg_sret) {
-    return "objc_msgSend_stret";
+    return superCall ? "objc_msgSendSuper_stret" : "objc_msgSend_stret";
   }
-  if (ret) {
-    // complex long double return
-    if (ret->ty == TY::Tcomplex80) {
-      return "objc_msgSend_fp2ret";
-    }
-    // long double return
-    if (ret->ty == TY::Tfloat80 || ret->ty == TY::Timaginary80) {
-      return "objc_msgSend_fpret";
-    }
+  // float, double, long double return
+  if (ret && ret->isfloating() && !ret->iscomplex()) {
+    return "objc_msgSend_fpret";
   }
-  return "objc_msgSend";
-}
+  return superCall ? "objc_msgSendSuper" : "objc_msgSend";
+}

gen/abi/x86.cpp

@@ -273,17 +273,17 @@ struct X86TargetABI : TargetABI {
     }
   }
 
-  const char *objcMsgSendFunc(Type *ret, IrFuncTy &fty) override {
+  const char *objcMsgSendFunc(Type *ret, IrFuncTy &fty, bool superCall) override {
     // see objc/message.h for objc_msgSend selection rules
     assert(isDarwin);
     if (fty.arg_sret) {
-      return "objc_msgSend_stret";
+      return superCall ? "objc_msgSendSuper_stret" : "objc_msgSend_stret";
     }
     // float, double, long double return
     if (ret && ret->isfloating() && !ret->iscomplex()) {
       return "objc_msgSend_fpret";
     }
-    return "objc_msgSend";
+    return superCall ? "objc_msgSendSuper" : "objc_msgSend";
   }
 };
 

gen/declarations.cpp

@@ -109,6 +109,10 @@ class CodegenVisitor : public Visitor {
       m->accept(this);
     }
 
+    // Objective-C protocols don't have TypeInfo.
+    if(decl->classKind == ClassKind::objc)
+      return;
+
     // Emit TypeInfo.
     IrClass *ir = getIrAggr(decl);
     if (!ir->suppressTypeInfo()) {
@@ -205,6 +209,10 @@ class CodegenVisitor : public Visitor {
       m->accept(this);
     }
 
+    // TODO: Support creating objective-c exposed classes?
+    if (decl->classKind == ClassKind::objc)
+      return;
+
     IrClass *ir = getIrAggr(decl);
 
     ir->getInitSymbol(/*define=*/true);

gen/functions.cpp

@@ -140,7 +140,7 @@ llvm::FunctionType *DtoFunctionType(Type *type, IrFuncTy &irFty, Type *thistype,
   }
 
   bool hasObjCSelector = false;
-  if (fd && fd->_linkage == LINK::objc && thistype) {
+  if (fd && fd->_linkage == LINK::objc) {
     if (fd->objc.selector) {
       hasObjCSelector = true;
     } else if (fd->parent->isClassDeclaration()) {

gen/llvmhelpers.cpp

@@ -1841,6 +1841,18 @@ DLValue *DtoIndexAggregate(LLValue *src, AggregateDeclaration *ad,
   // ourselves, DtoType below would be enough.
   DtoResolveDsymbol(ad);
 
+  if (ad->classKind == ClassKind::objc) {
+    auto tHandle = LLType::getInt64Ty(gIR->context());
+    auto tOffset = DtoLoad(tHandle, gIR->objc.getIVarOffset(*ad->isClassDeclaration(), *vd, flase));
+
+    // Offset is now stored in tOffset.
+    LLValue *ptr = src;
+    ptr = DtoBitCast(ptr, getVoidPtrType());
+    ptr = DtoGEP1(llvm::Type::getInt8Ty(gIR->context()), ptr, tOffset);
+
+    return new DLValue(vd->type, ptr);
+  }
+
   // Look up field to index or offset to apply.
   auto irTypeAggr = getIrType(ad->type)->isAggr();
   assert(irTypeAggr);

gen/objcgen.cpp

@@ -15,117 +15,159 @@
 #include "dmd/objc.h"
 #include "gen/irstate.h"
 
-namespace {
-enum ABI { none = 0, fragile = 1, nonFragile = 2 };
-ABI abi = nonFragile;
-}
+#define OBJC_CLASS_LIST = "__DATA,__objc_classlist";
+#define OBJC_PROTOCOL_LIST = "__DATA,__objc_protolist";
 
 bool objc_isSupported(const llvm::Triple &triple) {
   if (triple.isOSDarwin()) {
+
     // Objective-C only supported on Darwin at this time
+    // Additionally only Objective-C 2 is supported.
     switch (triple.getArch()) {
     case llvm::Triple::aarch64: // arm64 iOS, tvOS
     case llvm::Triple::arm:     // armv6 iOS
     case llvm::Triple::thumb:   // thumbv7 iOS, watchOS
     case llvm::Triple::x86_64:  // OSX, iOS, tvOS sim
-      abi = nonFragile;
       return true;
     case llvm::Triple::x86: // OSX, iOS, watchOS sim
-      abi = fragile;
-      return true;
+      return false;
     default:
       break;
     }
   }
   return false;
 }
 
+llvm::GlobalVariable *getGlobal(
+    llvm::Module& module, 
+    llvm::StringRef& name, 
+    llvm::Type* type = nullptr
+) {
+    if (type == nullptr)
+        type = llvm::PointerType::get(llvm::Type::getVoidTy(module.getContext()), 0);
+
+    auto var = new LLGlobalVariable(
+        module,
+        type,
+        false,
+        LLGlobalValue::ExternalLinkage,
+        nullptr,
+        name,
+        nullptr,
+        LLGlobalVariable::NotThreadLocal,
+        0,
+        true
+    );
+    return var;
+}
+
+llvm::GlobalVariable *getGlobalWithBytes(
+    llvm::Module& module,
+    llvm::StringRef name,
+    std::vector<llvm::Constant*> packedContents
+) {
+    auto init = llvm::ConstantStruct::getAnon(
+        packedContents,
+        true
+    );
+
+    auto var = new LLGlobalVariable(
+        module,
+        init->getType(),
+        false,
+        LLGlobalValue::ExternalLinkage,
+        init,
+        name,
+        nullptr,
+
+    );
+    var->setSection("__DATA,objc_data,regular");
+
+    return var;
+}
+
 LLGlobalVariable *ObjCState::getCStringVar(const char *symbol,
                                            const llvm::StringRef &str,
                                            const char *section) {
-  auto init = llvm::ConstantDataArray::getString(module.getContext(), str);
-  auto var = new LLGlobalVariable(module, init->getType(), false,
-                                  LLGlobalValue::PrivateLinkage, init, symbol);
-  var->setSection(section);
-  return var;
+    auto init = llvm::ConstantDataArray::getString(module.getContext(), str);
+    auto var = new LLGlobalVariable(module, init->getType(), false,
+                                    LLGlobalValue::PrivateLinkage, init, symbol);
+    var->setSection(section);
+    return var;
 }
 
-LLGlobalVariable *ObjCState::getMethVarName(const llvm::StringRef &name) {
-  auto it = methVarNameMap.find(name);
-  if (it != methVarNameMap.end()) {
+LLGlobalVariable *ObjCState::getMethodVarName(const llvm::StringRef &name) {
+    auto it = methVarNameMap.find(name);
+    if (it != methVarNameMap.end()) {
     return it->second;
-  }
+    }
 
-  auto var = getCStringVar("OBJC_METH_VAR_NAME_", name,
-                           abi == nonFragile
-                               ? "__TEXT,__objc_methname,cstring_literals"
-                               : "__TEXT,__cstring,cstring_literals");
-  methVarNameMap[name] = var;
-  retain(var);
-  return var;
+    auto var = getCStringVar("OBJC_METH_VAR_NAME_", name, 
+                            "__TEXT,__objc_methname,cstring_literals");
+    methVarNameMap[name] = var;
+    retain(var);
+    return var;
 }
 
-LLGlobalVariable *ObjCState::getMethVarRef(const ObjcSelector &sel) {
-  llvm::StringRef s(sel.stringvalue, sel.stringlen);
-  auto it = methVarRefMap.find(s);
-  if (it != methVarRefMap.end()) {
-    return it->second;
-  }
+LLGlobalVariable *ObjCState::getMethodVarRef(const ObjcSelector &sel) {
+    llvm::StringRef s(sel.stringvalue, sel.stringlen);
+    auto it = methodVarRefTable.find(s);
+    if (it != methodVarRefTable.end()) {
+        return it->second;
+    }
+
+    auto gvar = getMethVarName(s);
+    auto selref = new LLGlobalVariable(
+        module, gvar->getType(),
+        false, // prevent const elimination optimization
+        LLGlobalValue::PrivateLinkage, gvar, "OBJC_SELECTOR_REFERENCES_", nullptr,
+        LLGlobalVariable::NotThreadLocal, 0,
+        true
+    ); // externally initialized
+
+    selref->setSection("__DATA,__objc_selrefs,literal_pointers,no_dead_strip");
 
-  auto gvar = getMethVarName(s);
-  auto selref = new LLGlobalVariable(
-      module, gvar->getType(),
-      false, // prevent const elimination optimization
-      LLGlobalValue::PrivateLinkage, gvar, "OBJC_SELECTOR_REFERENCES_", nullptr,
-      LLGlobalVariable::NotThreadLocal, 0,
-      true); // externally initialized
-  selref->setSection(
-      abi == nonFragile
-          ? "__DATA,__objc_selrefs,literal_pointers,no_dead_strip"
-          : "__OBJC,__message_refs,literal_pointers,no_dead_strip");
-
-  // Save for later lookup and prevent optimizer elimination
-  methVarRefMap[s] = selref;
-  retain(selref);
-
-  return selref;
+    // Save for later lookup and prevent optimizer elimination
+    methVarRefMap[s] = selref;
+    retain(selref);
+
+    return selref;
 }
 
 void ObjCState::retain(LLConstant *sym) {
   retainedSymbols.push_back(sym);
 }
 
 void ObjCState::finalize() {
-  if (!retainedSymbols.empty()) {
-    genImageInfo();
-    // add in references so optimizer won't remove symbols.
-    retainSymbols();
-  }
+    if (!retainedSymbols.empty()) {
+        genImageInfo();
+
+        // add in references so optimizer won't remove symbols.
+        retainSymbols();
+    }
 }
 
 void ObjCState::genImageInfo() {
-  // Use LLVM to generate image info
-  const char *section =
-      (abi == nonFragile ? "__DATA,__objc_imageinfo,regular,no_dead_strip"
-                         : "__OBJC,__image_info");
-  module.addModuleFlag(llvm::Module::Error, "Objective-C Version",
-                       abi); //  unused?
-  module.addModuleFlag(llvm::Module::Error, "Objective-C Image Info Version",
-                       0u); // version
-  module.addModuleFlag(llvm::Module::Error, "Objective-C Image Info Section",
-                       llvm::MDString::get(module.getContext(), section));
-  module.addModuleFlag(llvm::Module::Override, "Objective-C Garbage Collection",
-                       0u); // flags
+    // Use LLVM to generate image info
+    const char *section = "__DATA,__objc_imageinfo,regular,no_dead_strip";
+    module.addModuleFlag(llvm::Module::Error, "Objective-C Version", 2); // Only support ABI 2. (Non-fragile)
+    module.addModuleFlag(llvm::Module::Error, "Objective-C Image Info Version",
+                        0u); // version
+    module.addModuleFlag(llvm::Module::Error, "Objective-C Image Info Section",
+                        llvm::MDString::get(module.getContext(), section));
+    module.addModuleFlag(llvm::Module::Override, "Objective-C Garbage Collection",
+                        0u); // flags
 }
 
 void ObjCState::retainSymbols() {
-  // put all objc symbols in the llvm.compiler.used array so optimizer won't
-  // remove.
-  auto arrayType = LLArrayType::get(retainedSymbols.front()->getType(),
+
+    // put all objc symbols in the llvm.compiler.used array so optimizer won't
+    // remove.
+    auto arrayType = LLArrayType::get(retainedSymbols.front()->getType(),
                                     retainedSymbols.size());
-  auto usedArray = LLConstantArray::get(arrayType, retainedSymbols);
-  auto var = new LLGlobalVariable(module, arrayType, false,
-                                  LLGlobalValue::AppendingLinkage, usedArray,
-                                  "llvm.compiler.used");
-  var->setSection("llvm.metadata");
+    auto usedArray = LLConstantArray::get(arrayType, retainedSymbols);
+    auto var = new LLGlobalVariable(module, arrayType, false,
+                                    LLGlobalValue::AppendingLinkage, usedArray,
+                                    "llvm.compiler.used");
+    var->setSection("llvm.metadata");
 }