From 062b6d93c49eedb5f39601fb867e6ed857fb231a Mon Sep 17 00:00:00 2001 From: Tomas Lindquist Olsen Date: Wed, 3 Jun 2009 04:12:28 +0200 Subject: [PATCH] Make sure typeinfo output are mutable types, this is a temporary workaround to get druntime genobj.d to compile until we figure out what typeinfos are actually needed here and there ... --- gen/llvmhelpers.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gen/llvmhelpers.cpp b/gen/llvmhelpers.cpp index 7564691b..3070aacd 100644 --- a/gen/llvmhelpers.cpp +++ b/gen/llvmhelpers.cpp @@ -1318,7 +1318,12 @@ void DtoAnnotation(const char* str) LLConstant* DtoTypeInfoOf(Type* type, bool base) { +#if DMDV2 + // FIXME: this is probably wrong, but it makes druntime's genobj.d compile! + type = type->mutableOf()->merge(); // needed.. getTypeInfo does the same +#else type = type->merge(); // needed.. getTypeInfo does the same +#endif type->getTypeInfo(NULL); TypeInfoDeclaration* tidecl = type->vtinfo; assert(tidecl);