From b2da152704fe5f8fc597bc92720e8ec7cfd9b364 Mon Sep 17 00:00:00 2001 From: David Nadlinger Date: Sun, 12 May 2013 00:38:58 +0200 Subject: [PATCH] Remove D1 ModuleInfo remnants. --- gen/module.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/gen/module.cpp b/gen/module.cpp index fbbc4204..b99bc6a4 100644 --- a/gen/module.cpp +++ b/gen/module.cpp @@ -38,9 +38,6 @@ #include "ir/irdsymbol.h" #include "ir/irmodule.h" #include "ir/irtype.h" -#if !MODULEINFO_IS_STRUCT -#include "ir/irtypeclass.h" -#endif #include "ir/irvar.h" #include "llvm/Analysis/Verifier.h" #include "llvm/LinkAllPasses.h" @@ -356,7 +353,7 @@ void Module::genmoduleinfo() // resolve ModuleInfo if (!moduleinfo) { - error("object.d is missing the ModuleInfo class"); + error("object.d is missing the ModuleInfo struct"); fatal(); } // check for patch @@ -374,11 +371,7 @@ void Module::genmoduleinfo() RTTIBuilder b(moduleinfo); // some types -#if MODULEINFO_IS_STRUCT LLType* moduleinfoTy = moduleinfo->type->irtype->getLLType(); -#else - LLType* moduleinfoTy = moduleinfo->type->irtype->isClass()->getMemoryLLType(); -#endif LLType* classinfoTy = ClassDeclaration::classinfo->type->irtype->getLLType(); // importedModules[]