From 5f247bb394a6a7f01836e0d67a9972bbec76c105 Mon Sep 17 00:00:00 2001 From: Tomas Lindquist Olsen Date: Sat, 21 Jun 2008 16:22:29 +0200 Subject: [PATCH] [svn r310] Fixed a problem with incomplete types and templates in typeinfo code. --- gen/llvmhelpers.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gen/llvmhelpers.cpp b/gen/llvmhelpers.cpp index 0f3a39a6..09256696 100644 --- a/gen/llvmhelpers.cpp +++ b/gen/llvmhelpers.cpp @@ -1085,6 +1085,7 @@ void DtoAnnotation(const char* str) LLConstant* DtoTypeInfoOf(Type* type, bool base) { + type = type->merge(); // seems like this is needed in some cases with templates. const LLType* typeinfotype = DtoType(Type::typeinfo->type); if (!type->vtinfo) type->getTypeInfo(NULL); @@ -1098,6 +1099,8 @@ LLConstant* DtoTypeInfoOf(Type* type, bool base) return c; } +////////////////////////////////////////////////////////////////////////////////////////// + void findDefaultTarget() { std::string err_str;