Mercurial > projects > ldc

diff ir/irclass.cpp @ 1529:ad7f2f1862d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Adjust LDC to work with the LLVMContext LLVM changes. This means we now require a fairly new LLVM revision. I use 75234.
author Christian Kamm <kamm incasoftware de>
date Fri, 10 Jul 2009 21:30:02 +0200
parents a5526b7a5ae6
children d1652c8fb4f6
line wrap: on
line diff
--- a/ir/irclass.cpp	Thu Jul 09 21:13:19 2009 +0100
+++ b/ir/irclass.cpp	Fri Jul 10 21:30:02 2009 +0200
@@ -40,7 +40,7 @@
     const LLType* vtblTy = type->irtype->isClass()->getVtbl();
 
     vtbl = new llvm::GlobalVariable(
-        vtblTy, true, _linkage, NULL, initname, gIR->module);
+        *gIR->module, vtblTy, true, _linkage, NULL, initname);
 
     return vtbl;
 }
@@ -69,7 +69,7 @@
 
     // classinfos cannot be constants since they're used a locks for synchronized
     classInfo = new llvm::GlobalVariable(
-        tc->getPA().get(), false, _linkage, NULL, initname, gIR->module);
+        *gIR->module, tc->getPA().get(), false, _linkage, NULL, initname);
 
 #ifdef USE_METADATA
     // Generate some metadata on this ClassInfo if it's for a class.
@@ -89,8 +89,8 @@
         // Construct the metadata
         llvm::MDNode* metadata = llvm::MDNode::get(mdVals, CD_NumFields);
         // Insert it into the module
-        new llvm::GlobalVariable(metadata->getType(), true,
-            METADATA_LINKAGE_TYPE, metadata, CD_PREFIX + initname, gIR->module);
+        new llvm::GlobalVariable(*gIR->module, metadata->getType(), true,
+            METADATA_LINKAGE_TYPE, metadata, CD_PREFIX + initname);
     }
 #endif
 
@@ -122,7 +122,8 @@
     name.append("16__interfaceInfosZ");
 
     llvm::GlobalValue::LinkageTypes _linkage = DtoExternalLinkage(aggrdecl);
-    classInterfacesArray = new llvm::GlobalVariable(array_type, true, _linkage, NULL, name, classInfo);
+    classInterfacesArray = new llvm::GlobalVariable(*gIR->module, 
+        array_type, true, _linkage, NULL, name);
 
     return classInterfacesArray;
 }
@@ -396,12 +397,12 @@
     mangle.append("6__vtblZ");
 
     llvm::GlobalVariable* GV = new llvm::GlobalVariable(
+        *gIR->module, 
         vtbl_constant->getType(),
         true,
         _linkage,
         vtbl_constant,
-        mangle,
-        gIR->module
+        mangle
     );
 
     // insert into the vtbl map