# HG changeset patch
# User Frits van Bommel <fvbommel wxs.nl>
# Date 1243782711 -7200
# Node ID 1dc1232aa91afd973308f76fd2165b7621afe5fd
# Parent  b6aa031644366a2b51fe741c357ef1be3b3bb78e# Parent  2a8d4f98b543adb1e137c6f8d81c74538275cbe6
Automated merge with http://hg.dsource.org/projects/ldc

diff -r 2a8d4f98b543 -r 1dc1232aa91a gen/rttibuilder.cpp
--- a/gen/rttibuilder.cpp	Sun May 31 15:47:59 2009 +0200
+++ b/gen/rttibuilder.cpp	Sun May 31 17:11:51 2009 +0200
@@ -76,7 +76,7 @@
 void RTTIBuilder::push_void_array(llvm::Constant* CI, Type* valtype, Dsymbol* mangle_sym)
 {
     std::string initname(mangle_sym->mangle());
-    initname.append(".rtti.void[].data");
+    initname.append(".rtti.voidarr.data");
 
     LLGlobalVariable* G = new llvm::GlobalVariable(
         CI->getType(), true, TYPEINFO_LINKAGE_TYPE, CI, initname, gIR->module);
@@ -87,9 +87,14 @@
 
 void RTTIBuilder::push_array(llvm::Constant * CI, uint64_t dim, Type* valtype, Dsymbol * mangle_sym)
 {
-    std::string initname(mangle_sym?mangle_sym->mangle():".ldc");
+	std::string tmpStr(valtype->arrayOf()->toChars());
+	tmpStr.erase( remove( tmpStr.begin(), tmpStr.end(), '[' ), tmpStr.end() );
+	tmpStr.erase( remove( tmpStr.begin(), tmpStr.end(), ']' ), tmpStr.end() );
+	tmpStr.append("arr");
+
+	std::string initname(mangle_sym?mangle_sym->mangle():".ldc");
     initname.append(".rtti.");
-    initname.append(valtype->arrayOf()->toChars());
+    initname.append(tmpStr);
     initname.append(".data");
 
     LLGlobalVariable* G = new llvm::GlobalVariable(