D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-01-20 23:03:14 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix DMD Issue 10425 - Link error with templates.

Browse Source 
Merged dmdfe changes in typeinf.c
This commit is contained in:
Alexey Prokhin
2013-12-07 18:05:02 +04:00
parent 2fa997e6ad
commit d235e4cc28
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
gen/typinf.cpp
View File

@@ -109,6 +109,11 @@ Expression *Type::getInternalTypeInfo(Scope *sc)
return t->getTypeInfo(sc);
}
bool inNonRoot(Dsymbol *s);
FuncDeclaration *search_toHash(StructDeclaration *sd);
FuncDeclaration *search_toString(StructDeclaration *sd);
/****************************************************
* Get the exact TypeInfo.
*/
@@ -146,9 +151,23 @@ Expression *Type::getTypeInfo(Scope *sc)
if (!t->builtinTypeInfo())
{ // Generate COMDAT
if (sc) // if in semantic() pass
{ // Find module that will go all the way to an object file
{
// Find module that will go all the way to an object file
Module *m = sc->module->importedFrom;
m->members->push(t->vtinfo);
if (ty == Tstruct)
{
StructDeclaration *sd = ((TypeStruct *)this)->sym;
if ((sd->xeq && sd->xeq != sd->xerreq ||
sd->xcmp && sd->xcmp != sd->xerrcmp ||
search_toHash(sd) ||
search_toString(sd)
) && inNonRoot(sd))
{
Module::addDeferredSemantic3(sd);
}
}
}
else // if in obj generation pass
{