Fix super context calls

ldc-developers · Nov 28, 2024 · 7423d0a · 7423d0a
1 parent c9bed7a
commit 7423d0a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/gen/objcgen.cpp b/gen/objcgen.cpp
@@ -457,7 +457,7 @@ LLConstant *ObjCState::getClassRoTable(ClassDeclaration *decl) {
   LLGlobalVariable *protocolList = nullptr;
   LLGlobalVariable *methodList = nullptr;
 
-  if (auto baseMethods = createMethodList(decl, false)) {
+  if (auto baseMethods = createMethodList(decl)) {
     methodList = getOrCreate(objcGetClassMethodListSymbol(name, meta), baseMethods->getType(), OBJC_SECNAME_CONST);
     methodList->setInitializer(baseMethods);
   }
@@ -569,7 +569,7 @@ LLConstant *ObjCState::getClassRef(ClassDeclaration *decl) {
     return it->second;
   }
 
-  auto retval = getOrCreate("OBJC_CLASSLIST_REFERENCES_$_", getOpaquePtrType(), OBJC_SECNAME_CLASSREFS);
+  auto retval = makeGlobal("OBJC_CLASSLIST_REFERENCES_$_", getOpaquePtrType(), OBJC_SECNAME_CLASSREFS);
   classRefs[className] = retval;
   this->retain(retval);
   return retval;

diff --git a/gen/objcgen.h b/gen/objcgen.h
@@ -177,7 +177,7 @@ class ObjCState {
   // used in method lists.
   ObjcMap<FuncDeclaration *, ObjcMethodInfo> methods;
   LLConstant *createMethodInfo(FuncDeclaration *decl);
-  LLConstant *createMethodList(ClassDeclaration *decl, bool optional);
+  LLConstant *createMethodList(ClassDeclaration *decl, bool optional = false);
 
   // class_t and class_ro_t generation.
   ObjcMap<ClassDeclaration *, ObjcClassInfo> classes;
@@ -200,7 +200,7 @@ class ObjCState {
   LLConstant *createProtocolList(ClassDeclaration *decl);
 
   // Private helpers
-  ObjcList<FuncDeclaration *> getMethodsForType(ClassDeclaration *decl, bool optional);
+  ObjcList<FuncDeclaration *> getMethodsForType(ClassDeclaration *decl, bool optional = false);
 
   ObjcList<LLConstant *> retainedSymbols;
   void retain(LLConstant *symbol);

diff --git a/gen/tocall.cpp b/gen/tocall.cpp
@@ -738,16 +738,17 @@ class ImplicitArgumentsBuilder {
       if (objccall && directcall) {
 
         // ... or a Objective-c direct call argument
-        if (auto parentfd = dfnval->func->isFuncDeclaration()) {
-          if (auto cls = parentfd->parent->isClassDeclaration()) {
+        if (auto func = dfnval->func->isFuncDeclaration()) {
+          if (auto klass = func->isThis()->isClassDeclaration()) {
 
             // Create obj_super struct with (this, <class ref>)
             auto obj_super = DtoAggrPair(
               DtoBitCast(dfnval->vthis, argtype),
-              gIR->objc.deref(cls, getOpaquePtrType()),
+              gIR->objc.deref(klass, getOpaquePtrType()),
               "super"
             );
 
+
             // Allocate and store obj_super struct into a new variable.
             auto clsaddr = DtoRawAlloca(obj_super->getType(), 16, "super");
             DtoStore(obj_super, clsaddr);