Use Module::members -> Dsymbol::codegen to define symbols.

dmd2/aggregate.h

@@ -209,7 +209,7 @@ struct StructDeclaration : AggregateDeclaration
     StructDeclaration *isStructDeclaration() { return this; }
 
 #if IN_LLVM
-    void codegen(Ir*);
+    void codegen(IRState*);
 #endif
 };
 
@@ -337,7 +337,7 @@ struct ClassDeclaration : AggregateDeclaration
     ClassDeclaration *isClassDeclaration() { return (ClassDeclaration *)this; }
 
 #if IN_LLVM
-    virtual void codegen(Ir*);
+    virtual void codegen(IRState*);
 #endif
 };
 
@@ -367,7 +367,7 @@ struct InterfaceDeclaration : ClassDeclaration
     InterfaceDeclaration *isInterfaceDeclaration() { return this; }
 
 #if IN_LLVM
-    void codegen(Ir*);
+    void codegen(IRState*);
 #endif
 };
 

dmd2/attrib.h

@@ -63,7 +63,7 @@ struct AttribDeclaration : Dsymbol
 #endif
 
 #if IN_LLVM
-    virtual void codegen(Ir*);
+    void codegen(IRState*);
 #endif
 };
 
@@ -161,7 +161,7 @@ struct PragmaDeclaration : AttribDeclaration
 #endif
 
 #if IN_LLVM
-    void codegen(Ir*);
+    void codegen(IRState*);
 #endif
 };
 

dmd2/declaration.h

@@ -189,11 +189,6 @@ struct Declaration : Dsymbol
     enum PROT prot();
 
     Declaration *isDeclaration() { return this; }
-
-#if IN_LLVM
-    /// Codegen traversal
-    virtual void codegen(Ir* ir);
-#endif
 };
 
 /**************************************************************/
@@ -216,7 +211,7 @@ struct TupleDeclaration : Declaration
 #if IN_LLVM
     void semantic3(Scope *sc);
     /// Codegen traversal
-    void codegen(Ir* ir);
+    void codegen(IRState* ir);
 #endif
 };
 
@@ -256,7 +251,7 @@ struct TypedefDeclaration : Declaration
 
 #if IN_LLVM
     /// Codegen traversal
-    void codegen(Ir* ir);
+    void codegen(IRState* ir);
 #endif
 };
 
@@ -362,7 +357,7 @@ struct VarDeclaration : Declaration
 
 #if IN_LLVM
     /// Codegen traversal
-    virtual void codegen(Ir* ir);
+    void codegen(IRState* ir);
 
     /// Index into parent aggregate.
     /// Set during type generation.
@@ -455,7 +450,7 @@ struct TypeInfoDeclaration : VarDeclaration
 
 #if IN_LLVM
     /// Codegen traversal
-    void codegen(Ir* ir);
+    void codegen(IRState* ir);
     virtual void llvmDefine();
 #endif
 };
@@ -483,7 +478,11 @@ struct TypeInfoClassDeclaration : TypeInfoDeclaration
 #endif
 
 #if IN_LLVM
-    void codegen(Ir*);
+    // TypeInfoClassDeclaration instances are different; they describe
+    // __ClassZ/__InterfaceZ symbols instead of a TypeInfo_….init one. DMD also
+    // generates them for SomeInterface.classinfo access, so we can't just
+    // distinguish between them using tinfo and thus need to override codegen().
+    void codegen(IRState* ir);
     void llvmDefine();
 #endif
 };
@@ -819,7 +818,9 @@ struct FuncDeclaration : Declaration
                                         // functions
     FuncDeclarations siblingCallers;    // Sibling nested functions which
                                         // called this one
+#if IN_DMD
     FuncDeclarations deferred;          // toObjFile() these functions after this one
+#endif
 
     unsigned flags;
     #define FUNCFLAGpurityInprocess 1   // working on determining purity
@@ -918,7 +919,7 @@ struct FuncDeclaration : Declaration
     IrFuncTy irFty;
 
     /// Codegen traversal
-    void codegen(Ir* ir);
+    void codegen(IRState* ir);
 
     // vars declared in this function that nested funcs reference
     // is this is not empty, nestedFrameRef is set and these VarDecls

dmd2/dsymbol.h

@@ -95,7 +95,7 @@ struct TYPE;
 #endif
 
 #if IN_LLVM
-class Ir;
+class IRState;
 namespace llvm
 {
     class Value;
@@ -287,7 +287,7 @@ struct Dsymbol : Object
     virtual ClassInfoDeclaration* isClassInfoDeclaration() { return NULL; }
 
     /// Codegen traversal
-    virtual void codegen(Ir* ir);
+    virtual void codegen(IRState* p);
 
     // llvm stuff
     int llvmInternal;

dmd2/enum.h

@@ -76,7 +76,7 @@ struct EnumDeclaration : ScopeDsymbol
 #endif
 
 #if IN_LLVM
-    void codegen(Ir*);
+    void codegen(IRState*);
 #endif
 };
 

dmd2/func.c

@@ -4735,11 +4735,7 @@ void UnitTestDeclaration::semantic(Scope *sc)
     {   sc = scope;
         scope = NULL;
     }
-#if IN_LLVM
-    if (global.params.useUnitTests && sc->module->isRoot)
-#else
     if (global.params.useUnitTests)
-#endif
     {
         if (!type)
             type = new TypeFunction(NULL, Type::tvoid, FALSE, LINKd);