From 43057c64ec0309932af6fa3ccf3b9734ef33df3f Mon Sep 17 00:00:00 2001 From: Alexey Prokhin Date: Tue, 10 Jan 2012 22:08:46 +0400 Subject: [PATCH] Temporary fixes for #60 and #59 until ldc1 frontend is not updated to the latest version --- dmd/module.c | 2 +- dmd/mtype.h | 4 ++-- ir/irtype.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dmd/module.c b/dmd/module.c index 83fe9d1c..deb89b6f 100644 --- a/dmd/module.c +++ b/dmd/module.c @@ -157,7 +157,7 @@ Module::Module(char *filename, Identifier *ident, int doDocComment, int doHdrGen this->doDocComment = doDocComment; this->doHdrGen = doHdrGen; this->isRoot = false; - this->arrayfuncs = 0; + //this->arrayfuncs = 0; #endif } diff --git a/dmd/mtype.h b/dmd/mtype.h index e7e98b16..88844bdc 100644 --- a/dmd/mtype.h +++ b/dmd/mtype.h @@ -106,8 +106,8 @@ enum TY Ttuple, Tslice, Treturn, - Tnull, - TMAX + TMAX, + Tnull }; #define Tascii Tchar diff --git a/ir/irtype.cpp b/ir/irtype.cpp index ef9aa02a..37d31ecd 100644 --- a/ir/irtype.cpp +++ b/ir/irtype.cpp @@ -22,7 +22,7 @@ IrType::IrType(Type* dt, LLType* lt) { assert(dt && "null D Type"); assert(lt && "null LLVM Type"); -#if !DMDV2 +#if 0 // FIXME: For some reason the assert fails assert(dt->irtype == NULL && "already has IrType"); #endif