diff options
| -rw-r--r-- | lib/CodeGen/CGObjCMac.cpp | 37 | ||||
| -rw-r--r-- | lib/Sema/SemaDeclObjC.cpp | 2 | ||||
| -rw-r--r-- | test/CodeGenObjC/hidden-synthesized-ivar.m | 13 |
3 files changed, 31 insertions, 21 deletions
diff --git a/lib/CodeGen/CGObjCMac.cpp b/lib/CodeGen/CGObjCMac.cpp index a354ef7fa0..426ad8c0f5 100644 --- a/lib/CodeGen/CGObjCMac.cpp +++ b/lib/CodeGen/CGObjCMac.cpp @@ -4493,37 +4493,34 @@ llvm::Constant * CGObjCNonFragileABIMac::EmitIvarOffsetVar( std::string ExternalName("\01_OBJC_IVAR_$_" + ID->getNameAsString() + '.' + Ivar->getNameAsString()); llvm::Constant *Init = llvm::ConstantInt::get(ObjCTypes.LongTy, Offset); - llvm::GlobalVariable *IvarOffsetGV = CGM.getModule().getGlobalVariable(ExternalName); - if (IvarOffsetGV) { + if (IvarOffsetGV) // ivar offset symbol already built due to user code referencing it. - IvarOffsetGV->setAlignment( - CGM.getTargetData().getPrefTypeAlignment(ObjCTypes.LongTy)); IvarOffsetGV->setInitializer(Init); - IvarOffsetGV->setSection("__DATA, __objc_const"); - UsedGlobals.push_back(IvarOffsetGV); - return IvarOffsetGV; - } - - IvarOffsetGV = - new llvm::GlobalVariable(Init->getType(), - false, - llvm::GlobalValue::ExternalLinkage, - Init, - ExternalName, - &CGM.getModule()); + else + IvarOffsetGV = + new llvm::GlobalVariable(Init->getType(), + false, + llvm::GlobalValue::ExternalLinkage, + Init, + ExternalName, + &CGM.getModule()); IvarOffsetGV->setAlignment( CGM.getTargetData().getPrefTypeAlignment(ObjCTypes.LongTy)); // @private and @package have hidden visibility. bool globalVisibility = (Ivar->getAccessControl() == ObjCIvarDecl::Public || - Ivar->getAccessControl() == ObjCIvarDecl::Protected); + Ivar->getAccessControl() == ObjCIvarDecl::Protected); if (!globalVisibility) IvarOffsetGV->setVisibility(llvm::GlobalValue::HiddenVisibility); - else - if (IsClassHidden(ID)) + else if (IsClassHidden(ID)) IvarOffsetGV->setVisibility(llvm::GlobalValue::HiddenVisibility); - + else if (CGM.getLangOptions().getVisibilityMode() == + LangOptions::HiddenVisibility) + IvarOffsetGV->setVisibility(llvm::GlobalValue::HiddenVisibility); + else if (CGM.getLangOptions().getVisibilityMode() == + LangOptions::DefaultVisibility) + IvarOffsetGV->setVisibility(llvm::GlobalValue::DefaultVisibility); IvarOffsetGV->setSection("__DATA, __objc_const"); UsedGlobals.push_back(IvarOffsetGV); return IvarOffsetGV; diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp index 80d46bcabb..0103393ddc 100644 --- a/lib/Sema/SemaDeclObjC.cpp +++ b/lib/Sema/SemaDeclObjC.cpp @@ -1795,7 +1795,7 @@ Sema::DeclPtrTy Sema::ActOnPropertyImplDecl(SourceLocation AtLoc, if (getLangOptions().ObjCNonFragileABI) { Ivar = ObjCIvarDecl::Create(Context, CurContext, PropertyLoc, PropertyIvar, PropType, - ObjCIvarDecl::Private, + ObjCIvarDecl::Public, (Expr *)0); property->setPropertyIvarDecl(Ivar); } diff --git a/test/CodeGenObjC/hidden-synthesized-ivar.m b/test/CodeGenObjC/hidden-synthesized-ivar.m new file mode 100644 index 0000000000..50a87cb2f4 --- /dev/null +++ b/test/CodeGenObjC/hidden-synthesized-ivar.m @@ -0,0 +1,13 @@ +// RUN: clang-cc -fvisibility=hidden -triple x86_64-apple-darwin10 -S -o - %s | grep -e "private_extern _OBJC_IVAR_" +@interface I +{ + int P; +} + +@property int P; +@end + +@implementation I +@synthesize P; +@end + |