diff --git a/dmd2/declaration.c b/dmd2/declaration.c index edd02409b9..1f9db8a677 100644 --- a/dmd2/declaration.c +++ b/dmd2/declaration.c @@ -446,7 +446,6 @@ AliasDeclaration::AliasDeclaration(Loc loc, Identifier *id, Type *type) this->haliassym = NULL; this->overnext = NULL; this->inSemantic = 0; - this->importprot = PROTundefined; assert(type); } @@ -612,9 +611,6 @@ void AliasDeclaration::semantic(Scope *sc) if (overnext) { FuncAliasDeclaration *fa = new FuncAliasDeclaration(f); -#if IN_LLVM - fa->importprot = importprot; -#endif if (!fa->overloadInsert(overnext)) ScopeDsymbol::multiplyDefined(Loc(), overnext, f); overnext = NULL; diff --git a/dmd2/declaration.h b/dmd2/declaration.h index a812372a06..cb326a57ba 100644 --- a/dmd2/declaration.h +++ b/dmd2/declaration.h @@ -268,7 +268,6 @@ struct AliasDeclaration : Declaration Dsymbol *overnext; // next in overload list Dsymbol *import; // !=NULL if unresolved internal alias for selective import int inSemantic; - PROT importprot; // if generated by import, store its protection AliasDeclaration(Loc loc, Identifier *ident, Type *type); AliasDeclaration(Loc loc, Identifier *ident, Dsymbol *s); @@ -963,7 +962,6 @@ struct FuncAliasDeclaration : FuncDeclaration { FuncDeclaration *funcalias; int hasOverloads; - PROT importprot; // if generated by import, store its protection FuncAliasDeclaration(FuncDeclaration *funcalias, int hasOverloads = 1); diff --git a/dmd2/func.c b/dmd2/func.c index 8dc44e934b..61595c0281 100644 --- a/dmd2/func.c +++ b/dmd2/func.c @@ -4007,9 +4007,6 @@ FuncAliasDeclaration::FuncAliasDeclaration(FuncDeclaration *funcalias, int hasOv { assert(funcalias != this); this->funcalias = funcalias; -#if IN_LLVM - importprot = PROTundefined; -#endif this->hasOverloads = hasOverloads; if (hasOverloads) diff --git a/gen/llvmhelpers.cpp b/gen/llvmhelpers.cpp index 3b150ac059..6cbf109127 100644 --- a/gen/llvmhelpers.cpp +++ b/gen/llvmhelpers.cpp @@ -1951,7 +1951,7 @@ DValue* DtoSymbolAddress(const Loc& loc, Type* type, Declaration* decl) return new DFuncValue(fdecl, func); } - if (StaticStructInitDeclaration* sdecl = decl->isStaticStructInitDeclaration()) + if (SymbolDeclaration* sdecl = decl->isSymbolDeclaration()) { // this seems to be the static initialiser for structs Type* sdecltype = sdecl->type->toBasetype();