mirrors/ldc
1
0
Fork 0
mirror of https://github.com/ldc-developers/ldc.git synced 2025-05-05 17:43:35 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make sure special struct TypeInfo members are semantically analyzed before emitting the TypeInfo (#3783)

Browse source 
As there are apparently cases where the struct hasn't had semantic3
yet, at least with -linkonce-templates. This prevents erroneous xopCmp
etc. (failing to compile) from being referenced in the TypeInfo (=>
linker errors) / being analyzed for -linkonce-templates codegen.
`semanticTypeInfoMembers()` replaces them by `object._xopCmp()` etc.
if compilation fails.
This commit is contained in:
Martin Kinkelin 2021-07-14 15:41:06 +02:00 • committed by GitHub
parent 2578795801
commit 6e15e1ab04
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gen/functions.cpp
View file

@ -602,7 +602,6 @@ void DtoDeclareFunction(FuncDeclaration *fdecl, const bool willDefine) {
Logger::println("Function is inside a linkonce_odr template, will be " Logger::println("Function is inside a linkonce_odr template, will be "
"defined after declaration."); "defined after declaration.");
if (fdecl->semanticRun < PASSsemantic3done) { if (fdecl->semanticRun < PASSsemantic3done) {
// this can e.g. happen for special __xtoHash member functions
Logger::println("Function hasn't had sema3 run yet, running it now."); Logger::println("Function hasn't had sema3 run yet, running it now.");
const bool semaSuccess = fdecl->functionSemantic3(); const bool semaSuccess = fdecl->functionSemantic3();
(void)semaSuccess; (void)semaSuccess;

13
ir/irstruct.cpp
View file

@ -81,6 +81,16 @@ LLConstant *IrStruct::getTypeInfoInit() {
IF_LOG Logger::println("Defining TypeInfo for struct: %s", sd->toChars()); IF_LOG Logger::println("Defining TypeInfo for struct: %s", sd->toChars());
LOG_SCOPE; LOG_SCOPE;
// we need (dummy) TypeInfos for opaque structs too
const bool isOpaque = !sd->members;
// make sure xtoHash/xopEquals/xopCmp etc. are semantically analyzed
if (!isOpaque && sd->semanticRun < PASSsemantic3done) {
Logger::println(
"Struct hasn't had semantic3 yet, calling semanticTypeInfoMembers()");
sd->semanticTypeInfoMembers();
}
TypeStruct *ts = sd->type->isTypeStruct(); TypeStruct *ts = sd->type->isTypeStruct();
// check declaration in object.d // check declaration in object.d
@ -108,9 +118,6 @@ LLConstant *IrStruct::getTypeInfoInit() {
RTTIBuilder b(structTypeInfoType); RTTIBuilder b(structTypeInfoType);
// we need (dummy) TypeInfos for opaque structs too
const bool isOpaque = !sd->members;
// string name // string name
if (isOpaque) { if (isOpaque) {
b.push_null_void_array(); b.push_null_void_array();