[cfe-commits] r68453 - in /cfe/trunk: lib/CodeGen/CGObjCMac.cpp lib/Sema/SemaDeclObjC.cpp test/CodeGenObjC/hidden-synthesized-ivar.m

[Fariborz Jahanian]

Author: fjahanian
Date: Mon Apr  6 13:30:00 2009
New Revision: 68453

URL: http://llvm.org/viewvc/llvm-project?rev=68453&view=rev
Log:
Fixed visibility issues related to objc2's synthesized
ivars.

Added:
    cfe/trunk/test/CodeGenObjC/hidden-synthesized-ivar.m
Modified:
    cfe/trunk/lib/CodeGen/CGObjCMac.cpp
    cfe/trunk/lib/Sema/SemaDeclObjC.cpp

Modified: cfe/trunk/lib/CodeGen/CGObjCMac.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGObjCMac.cpp?rev=68453&r1=68452&r2=68453&view=diff

==============================================================================
--- cfe/trunk/lib/CodeGen/CGObjCMac.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGObjCMac.cpp Mon Apr  6 13:30:00 2009
@@ -4493,37 +4493,34 @@
   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;

Modified: cfe/trunk/lib/Sema/SemaDeclObjC.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclObjC.cpp?rev=68453&r1=68452&r2=68453&view=diff

==============================================================================
--- cfe/trunk/lib/Sema/SemaDeclObjC.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDeclObjC.cpp Mon Apr  6 13:30:00 2009
@@ -1795,7 +1795,7 @@
       if (getLangOptions().ObjCNonFragileABI) {
         Ivar = ObjCIvarDecl::Create(Context, CurContext, PropertyLoc, 
                                     PropertyIvar, PropType, 
-                                    ObjCIvarDecl::Private,
+                                    ObjCIvarDecl::Public,
                                     (Expr *)0);
         property->setPropertyIvarDecl(Ivar);
       }

Added: cfe/trunk/test/CodeGenObjC/hidden-synthesized-ivar.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjC/hidden-synthesized-ivar.m?rev=68453&view=auto

==============================================================================
--- cfe/trunk/test/CodeGenObjC/hidden-synthesized-ivar.m (added)
+++ cfe/trunk/test/CodeGenObjC/hidden-synthesized-ivar.m Mon Apr  6 13:30:00 2009
@@ -0,0 +1,13 @@
+// RUN: clang-cc -fvisibility=hidden -triple x86_64-apple-darwin10  -S -o - %s | grep -e "private_extern _OBJC_IVAR_"
+ at interface I
+{
+	int P;
+}
+
+ at property int P;
+ at end
+
+ at implementation I
+ at synthesize P;
+ at end
+