Fix issue ldc-developers#3501: Don't re-define struct TypeInfos

kinke · kinke · commit d9043511df83 · 2020-07-10T20:53:51.000+02:00
Surfacing now as ldc-developers#3486 added a corresponding assertion. I've tested this with an older vibe-d v0.8.6 lying around on my box. The assertion was hit for the TypeInfo of a nested struct: https://github.com/vibe-d/vibe.d/blob/3c7ae13989003b7ebc59de23c5b6a0fb0466f119/http/vibe/http/router.d#L570-L574 I wasn't able to quickly reduce it to a stand-alone testcase and am reluctant to put any more effort into this.
diff --git a/gen/typinf.cpp b/gen/typinf.cpp
@@ -507,8 +507,12 @@ class DeclareOrDefineVisitor : public Visitor {
       return;
     }
 
-    defineGlobal(gvar, irstruct->getTypeInfoInit(), irstruct->aggrdecl);
-    gvar->setLinkage(TYPEINFO_LINKAGE_TYPE); // override
+    LLConstant *init = irstruct->getTypeInfoInit(); // might define gvar!
+
+    if (!gvar->hasInitializer()) {
+      defineGlobal(gvar, init, irstruct->aggrdecl);
+      gvar->setLinkage(TYPEINFO_LINKAGE_TYPE); // override
+    }
   }
 
   // Only declare class TypeInfos. They are defined once in their owning module

Original file line number	Diff line number	Diff line change
`@@ -507,8 +507,12 @@ class DeclareOrDefineVisitor : public Visitor {`
`507`	`507`	`return;`
`508`	`508`	`}`
`509`	`509`
`510`		`- defineGlobal(gvar, irstruct->getTypeInfoInit(), irstruct->aggrdecl);`
`511`		`- gvar->setLinkage(TYPEINFO_LINKAGE_TYPE); // override`
	`510`	`+ LLConstant *init = irstruct->getTypeInfoInit(); // might define gvar!`
	`511`	`+`
	`512`	`+ if (!gvar->hasInitializer()) {`
	`513`	`+ defineGlobal(gvar, init, irstruct->aggrdecl);`
	`514`	`+ gvar->setLinkage(TYPEINFO_LINKAGE_TYPE); // override`
	`515`	`+ }`
`512`	`516`	`}`
`513`	`517`
`514`	`518`	`// Only declare class TypeInfos. They are defined once in their owning module`