# HG changeset patch
# User lindquist
# Date 1214058149 -7200
# Node ID 17d3b32363340e38255610aa0c5509646a283ea1
# Parent  ba4e4298009a69a2b69ce83073d7753e15d24c2a
[svn r310] Fixed a problem with incomplete types and templates in typeinfo code.

diff -r ba4e4298009a -r 17d3b3236334 gen/llvmhelpers.cpp
--- a/gen/llvmhelpers.cpp	Sat Jun 21 14:06:00 2008 +0200
+++ b/gen/llvmhelpers.cpp	Sat Jun 21 16:22:29 2008 +0200
@@ -1085,6 +1085,7 @@
 
 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 @@
     return c;
 }
 
+//////////////////////////////////////////////////////////////////////////////////////////
+
 void findDefaultTarget()
 {
     std::string err_str;