--- a/gen/toobj.cpp	Fri Jan 18 20:13:19 2008 +0100
+++ b/gen/toobj.cpp	Tue Jan 22 00:01:16 2008 +0100
@@ -42,6 +42,7 @@
 #include "gen/runtime.h"
 
 #include "ir/irvar.h"
+#include "ir/irmodule.h"
 
 //////////////////////////////////////////////////////////////////////////////////////////
 
@@ -59,10 +60,15 @@
     deleteObjFile();
 
     // create a new ir state
+    // TODO look at making the instance static and moving most functionality into IrModule where it belongs
     IRState ir;
     gIR = &ir;
     ir.dmodule = this;
 
+    // module ir state
+    // might already exist via import, just overwrite...
+    irModule = new IrModule(this);
+
     // name the module
     std::string mname(toChars());
     if (md != 0)
@@ -88,7 +94,7 @@
     // debug info
     if (global.params.symdebug) {
         RegisterDwarfSymbols(ir.module);
-        ir.dmodule->llvmCompileUnit = DtoDwarfCompileUnit(this,true);
+        DtoDwarfCompileUnit(this);
     }
 
     // start out by providing opaque for the built-in class types