--- a/ir/irclass.cpp	Thu Jul 23 20:34:35 2009 +0200
+++ b/ir/irclass.cpp	Thu Jul 30 15:25:10 2009 +0200
@@ -82,8 +82,8 @@
         // Construct the fields
         MDNodeField* mdVals[CD_NumFields];
         mdVals[CD_BodyType] = llvm::UndefValue::get(bodyType);
-        mdVals[CD_Finalize] = gIR->context().getConstantInt(LLType::Int1Ty, hasDestructor);
-        mdVals[CD_CustomDelete] = gIR->context().getConstantInt(LLType::Int1Ty, hasCustomDelete);
+        mdVals[CD_Finalize] = LLConstantInt::get(LLType::Int1Ty, hasDestructor);
+        mdVals[CD_CustomDelete] = LLConstantInt::get(LLType::Int1Ty, hasCustomDelete);
         // Construct the metadata
         llvm::MDNode* metadata = gIR->context().getMDNode(mdVals, CD_NumFields);
         // Insert it into the module
@@ -170,7 +170,7 @@
     }
 
     // build the constant struct
-    constVtbl = gIR->context().getConstantStruct(constants, false);
+    constVtbl = LLConstantStruct::get(constants, false);
 
 #if 0
    IF_LOG Logger::cout() << "constVtbl type: " << *constVtbl->getType() << std::endl;
@@ -314,7 +314,7 @@
     addBaseClassInits(constants, cd, offset, field_index);
 
     // build the constant
-    llvm::Constant* definit = gIR->context().getConstantStruct(constants, false);
+    llvm::Constant* definit = LLConstantStruct::get(constants, false);
 
     return definit;
 }
@@ -382,7 +382,7 @@
     }
 
     // build the vtbl constant
-    llvm::Constant* vtbl_constant = gIR->context().getConstantStruct(constants, false);
+    llvm::Constant* vtbl_constant = LLConstantStruct::get(constants, false);
 
     // create the global variable to hold it
     llvm::GlobalValue::LinkageTypes _linkage = DtoExternalLinkage(aggrdecl);
@@ -481,7 +481,7 @@
 
         // create Interface struct
         LLConstant* inits[3] = { ci, vtb, off };
-        LLConstant* entry = gIR->context().getConstantStruct(inits, 3);
+        LLConstant* entry = LLConstantStruct::get(inits, 3);
         constants.push_back(entry);
     }
 
@@ -490,7 +490,7 @@
         constants[0]->getType(),
         n);
 
-    LLConstant* arr = gIR->context().getConstantArray(
+    LLConstant* arr = LLConstantArray::get(
         array_type,
         &constants[0],
         n);