Mercurial > projects > ldc
diff gen/llvmhelpers.cpp @ 1524:b265fb6ce15b
Merge.
author | Robert Clipsham <robert@octarineparrot.com> |
---|---|
date | Mon, 06 Jul 2009 23:56:11 +0100 |
parents | 0f08b145b878 |
children | 8ca25bd765a3 |
line wrap: on
line diff
--- a/gen/llvmhelpers.cpp Mon Jul 06 23:54:02 2009 +0100 +++ b/gen/llvmhelpers.cpp Mon Jul 06 23:56:11 2009 +0100 @@ -979,10 +979,12 @@ else if (AttribDeclaration* a = declaration->isAttribDeclaration()) { Logger::println("AttribDeclaration"); - if (a->decl) - for (int i=0; i < a->decl->dim; ++i) + // choose the right set in case this is a conditional declaration + Array *d = a->include(NULL, NULL); + if (d) + for (int i=0; i < d->dim; ++i) { - DtoDeclarationExp((Dsymbol*)a->decl->data[i]); + DtoDeclarationExp((Dsymbol*)d->data[i]); } } // mixin declaration