diff --git a/gen/dibuilder.cpp b/gen/dibuilder.cpp index 46c331de..48f327ae 100644 --- a/gen/dibuilder.cpp +++ b/gen/dibuilder.cpp @@ -290,7 +290,7 @@ llvm::DIType ldc::DIBuilder::CreateCompositeType(Type *type) // if we don't know the aggregate's size, we don't know enough about it // to provide debug info. probably a forward-declared struct? - if (sd->sizeok == 0) + if (sd->sizeok == SIZEOKnone) #if LDC_LLVM_VER >= 304 return DBuilder.createUnspecifiedType(sd->toChars()); #else diff --git a/gen/module.cpp b/gen/module.cpp index 16278dd1..ecf34baf 100644 --- a/gen/module.cpp +++ b/gen/module.cpp @@ -702,7 +702,7 @@ void Module::genmoduleinfo() Logger::println("skipping interface '%s' in moduleinfo", cd->toPrettyChars()); continue; } - else if (cd->sizeok != 1) + else if (cd->sizeok != SIZEOKdone) { Logger::println("skipping opaque class declaration '%s' in moduleinfo", cd->toPrettyChars()); continue; diff --git a/gen/structs.cpp b/gen/structs.cpp index 173f9747..0f82c84a 100644 --- a/gen/structs.cpp +++ b/gen/structs.cpp @@ -41,7 +41,7 @@ void DtoResolveStruct(StructDeclaration* sd) DtoType(sd->type); // if it's a forward declaration, all bets are off. The type should be enough - if (sd->sizeok != 1) + if (sd->sizeok != SIZEOKdone) return; // create the IrAggr diff --git a/gen/typinf.cpp b/gen/typinf.cpp index 60c6e895..cbe7e00d 100644 --- a/gen/typinf.cpp +++ b/gen/typinf.cpp @@ -598,7 +598,7 @@ void TypeInfoStructDeclaration::llvmDefine() StructDeclaration *sd = tc->sym; // can't emit typeinfo for forward declarations - if (sd->sizeok != 1) + if (sd->sizeok != SIZEOKdone) { sd->error("cannot emit TypeInfo for forward declaration"); fatal(); diff --git a/ir/irtypestruct.cpp b/ir/irtypestruct.cpp index d9fa3937..44b805fa 100644 --- a/ir/irtypestruct.cpp +++ b/ir/irtypestruct.cpp @@ -88,7 +88,7 @@ IrTypeStruct* IrTypeStruct::get(StructDeclaration* sd) LOG_SCOPE; // if it's a forward declaration, all bets are off, stick with the opaque - if (sd->sizeok != 1) + if (sd->sizeok != SIZEOKdone) return t; // TODO:: Somehow merge this with IrAggr::createInitializerConstant, or diff --git a/runtime/druntime b/runtime/druntime index d484e5bd..70ad6560 160000 --- a/runtime/druntime +++ b/runtime/druntime @@ -1 +1 @@ -Subproject commit d484e5bdf8acaa619d284c2348c4bcc6a472db4f +Subproject commit 70ad65608ef0211beb64121f8e844735a92b18fb