Merge fix

ldc-developers · Apr 1, 2023 · ed5119f · ed5119f
1 parent 9c5bd23
commit ed5119f
Show file tree

Hide file tree

Showing 2 changed files with 72 additions and 54 deletions.
diff --git a/gen/objcgen.cpp b/gen/objcgen.cpp
@@ -42,88 +42,105 @@ bool objc_isSupported(const llvm::Triple &triple) {
 
 ObjCState::ObjCState(llvm::Module &module) : module(module)
 {
-  LLVMContext& c = module->getContext();
-  _class_t = llvm::StructType::Create(
-    llvm::PointerType::get(_class_t),
-    llvm::PointerType::get(_class_t),
-    llvm::PointerType::get(_objc_cache),
-    llvm::PointerType::get(_class_t),
+  llvm::LLVMContext& c = module.getContext();
+  _class_t = llvm::StructType::create(c, "_class_t");
+  _objc_cache = llvm::StructType::create(c, "_objc_cache");
+  _class_ro_t = llvm::StructType::create(c, "_class_ro_t");
+  __method_list_t = llvm::StructType::create(c, "__method_list_t");
+  _objc_method = llvm::StructType::create(c, "_objc_method");
+  _objc_protocol_list = llvm::StructType::create(c, "_objc_protocol_list");
+  _protocol_t = llvm::StructType::create(c, "_protocol_t");
+  _ivar_t = llvm::StructType::create(c, "_ivar_t");
+  _ivar_list_t = llvm::StructType::create(c, "_ivar_list_t");
+  _prop_t = llvm::StructType::create(c, "_prop_t");
+
+
+
+  _class_t->setBody({
+    _class_t->getPointerTo(),
+    _class_t->getPointerTo(),
+    _objc_cache->getPointerTo(),
+    _class_t->getPointerTo(),
     ///i8* (i8*, i8*)**
-    llvm::PointerType::get(_class_ro_t)
-  );
+    llvm::FunctionType::get(
+      llvm::Type::getInt8PtrTy(c), 
+      {llvm::Type::getInt8PtrTy(c), llvm::Type::getInt8PtrTy(c)},
+      false
+    )->getPointerTo()->getPointerTo(),
+    _class_ro_t->getPointerTo()
+  });
 
-  _objc_cache = llvm::StructType::Create(c);
-  _class_ro_t = llvm::StructType::Create(
+  _class_ro_t->setBody({
     llvm::Type::getInt32Ty(c),
     llvm::Type::getInt32Ty(c),
     llvm::Type::getInt32Ty(c),
     llvm::Type::getInt8PtrTy(c),
     llvm::Type::getInt8PtrTy(c),
-    llvm::PointerType::get(__method_list_t),
-    llvm::PointerType::get(_objc_protocol_list),
-    llvm::PointerType::get(_ivar_list_t),
+    __method_list_t->getPointerTo(),
+    _objc_protocol_list->getPointerTo(),
+    _ivar_list_t->getPointerTo(),
     llvm::Type::getInt8PtrTy(c),
-    llvm::PointerType::get(_prop_list_t)
-  );
+    _prop_list_t->getPointerTo()
+  });
 
-  __method_list_t = llvm::StructType::Create({
+  __method_list_t->setBody({
     llvm::Type::getInt32Ty(c),
     llvm::Type::getInt32Ty(c),
-    llvm::ArrayType::get(0, _objc_method)
+    llvm::ArrayType::get(_objc_method, 0)
   });
 
-  _objc_method = llvm::StructType::Create(
+  _objc_method->setBody({
     llvm::Type::getInt8PtrTy(c), 
     llvm::Type::getInt8PtrTy(c), 
     llvm::Type::getInt8PtrTy(c)
-  );
+  });
 
-  _objc_protocol_list = llvm::StructType::Create(
+  _objc_protocol_list->setBody({
     llvm::Type::getInt64Ty(c),
-    llvm::ArrayType::get(0, llvm::PointerType::get(_protocol_t))
-  );
+    llvm::ArrayType::get(_protocol_t->getPointerTo(), 0)
+  });
 
-  _protocol_t = llvm::StructType::Create(
+  _protocol_t->setBody({
     llvm::Type::getInt8PtrTy(c),
     llvm::Type::getInt8PtrTy(c),
-    llvm::PointerType::get(_objc_protocol_list),
-    llvm::PointerType::get(__method_list_t),
-    llvm::PointerType::get(__method_list_t),
-    llvm::PointerType::get(__method_list_t),
-    llvm::PointerType::get(__method_list_t),
-    llvm::PointerType::get(_prop_list_t),
+    _objc_protocol_list->getPointerTo(),
+    __method_list_t->getPointerTo(),
+    __method_list_t->getPointerTo(),
+    __method_list_t->getPointerTo(),
+    __method_list_t->getPointerTo(),
+    _prop_list_t->getPointerTo(),
     llvm::Type::getInt32Ty(c),
     llvm::Type::getInt32Ty(c),
-    llvm::PointerType::get(llvm::Type::getInt8PtrTy(c)),
+    llvm::Type::getInt8PtrTy(c)->getPointerTo(),
     llvm::Type::getInt8PtrTy(c),
-    llvm::PointerType::get(_prop_list_t),
-  );
+    _prop_list_t->getPointerTo(),
+  });
 
-  _ivar_list_t = llvm::StructType::Create(
+  _ivar_list_t->setBody({
     llvm::Type::getInt32Ty(c),
     llvm::Type::getInt32Ty(c),
-    llvm::ArrayType::get(0, _ivar_t)
-  );
+    llvm::ArrayType::get(_ivar_t, 0)
+  });
 
-  _ivar_t = llvm::StrucType::Create(
+  _ivar_t->setBody({
     llvm::Type::getInt64PtrTy(c),
     llvm::Type::getInt8PtrTy(c),
     llvm::Type::getInt8PtrTy(c),
     llvm::Type::getInt32Ty(c),
     llvm::Type::getInt32Ty(c)
-  );
+  });
 
 
-  _prop_list_t = llvm::StructType::Create(
+  _prop_list_t->setBody({
     llvm::Type::getInt32Ty(c), 
     llvm::Type::getInt32Ty(c),
-    llvm::ArrayType::get(0, _prop_t)
-  );
+    llvm::ArrayType::get(_prop_t, 0)
+  });
 
-  _prop_t = llvm::StructType::Create(
+  _prop_t->setBody({
     llvm::Type::getInt8PtrTy(c), 
-    llvm::type::getInt8PtrTy(c)
-  );
+    llvm::Type::getInt8PtrTy(c)
+  });
 }
 
 

diff --git a/gen/objcgen.h b/gen/objcgen.h
@@ -16,6 +16,7 @@
 #include <vector>
 #include "llvm/ADT/StringMap.h"
 #include "llvm/IR/Type.h"
+#include "llvm/IR/DerivedTypes.h"
 
 struct ObjcSelector;
 namespace llvm {
@@ -38,17 +39,17 @@ class ObjCState {
 private:
   llvm::Module &module;
 
-  llvm::Type* _class_t;
-  llvm::Type* _objc_cache;
-  llvm::Type* _class_ro_t;
-  llvm::Type* __method_list_t;
-  llvm::Type* _objc_method;
-  llvm::Type* _objc_protocol_list;
-  llvm::Type* _protocol_t;
-  llvm::Type* _ivar_list_t;
-  llvm::Type* _ivar_t;
-  llvm::Type* _prop_list_t;
-  llvm::Type* _prop_t;
+  llvm::StructType* _class_t;
+  llvm::StructType* _objc_cache;
+  llvm::StructType* _class_ro_t;
+  llvm::StructType* __method_list_t;
+  llvm::StructType* _objc_method;
+  llvm::StructType* _objc_protocol_list;
+  llvm::StructType* _protocol_t;
+  llvm::StructType* _ivar_list_t;
+  llvm::StructType* _ivar_t;
+  llvm::StructType* _prop_list_t;
+  llvm::StructType* _prop_t;
 
   // symbols that shouldn't be optimized away
   std::vector<llvm::Constant *> retainedSymbols;