commit 38e24c782c17b6058bf61d635747bbde19fb1bc7
author Fariborz Jahanian <fjahanian@apple.com> Wed Mar 18 22:33:24 2009 +0000
committer Fariborz Jahanian <fjahanian@apple.com> Wed Mar 18 22:33:24 2009 +0000
tree beb09e8aa66b92cfbc7ecb904fb34f8fb578dd61
parent e530ad407af4a8904377592bfdb236acd320c6c2

objc: Implemented variables declared in class interface 
whose sema decl is at the translation unit.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@67249 91177308-0d34-0410-b5e6-96231b3b80d8

lib/CodeGen/CodeGenModule.cpp

diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp
index 0cb9228..aed0676 100644
--- a/lib/CodeGen/CodeGenModule.cpp
+++ b/lib/CodeGen/CodeGenModule.cpp
@@ -1234,16 +1234,24 @@
 
     // Objective-C Decls
     
-    // Forward declarations, no (immediate) code generation.
+  // Forward declarations, no (immediate) code generation.
   case Decl::ObjCClass:
-  case Decl::ObjCCategory:
   case Decl::ObjCForwardProtocol:
-  case Decl::ObjCInterface:
     break;
-
+      
   case Decl::ObjCProtocol:
-    Runtime->GenerateProtocol(cast<ObjCProtocolDecl>(D));
+  case Decl::ObjCCategory:
+  case Decl::ObjCInterface: {
+    ObjCContainerDecl *OCD = cast<ObjCContainerDecl>(D);
+    for (ObjCContainerDecl::tuvar_iterator i = OCD->tuvar_begin(),
+         e = OCD->tuvar_end(); i != e; ++i) {
+        VarDecl *VD = *i;
+        EmitGlobal(VD);
+    }
+    if (D->getKind() == Decl::ObjCProtocol) 
+      Runtime->GenerateProtocol(cast<ObjCProtocolDecl>(D));
     break;
+  }
 
   case Decl::ObjCCategoryImpl:
     // Categories have properties but don't support synthesize so we

lib/Parse/ParseObjc.cpp

diff --git a/lib/Parse/ParseObjc.cpp b/lib/Parse/ParseObjc.cpp
index bb85536..ca722fa 100644
--- a/lib/Parse/ParseObjc.cpp
+++ b/lib/Parse/ParseObjc.cpp
@@ -215,6 +215,7 @@
                                         tok::ObjCKeywordKind contextKey) {
   llvm::SmallVector<DeclTy*, 32> allMethods;
   llvm::SmallVector<DeclTy*, 16> allProperties;
+  llvm::SmallVector<DeclTy*, 8> allTUVariables;
   tok::ObjCKeywordKind MethodImplKind = tok::objc_not_keyword;
   
   SourceLocation AtEndLoc;
@@ -252,7 +253,8 @@
       
       // FIXME: as the name implies, this rule allows function definitions.
       // We could pass a flag or check for functions during semantic analysis.
-      ParseDeclarationOrFunctionDefinition();
+      DeclTy *VFDecl = ParseDeclarationOrFunctionDefinition();
+      allTUVariables.push_back(VFDecl);
       continue;
     }
     
@@ -360,7 +362,10 @@
                      allMethods.empty() ? 0 : &allMethods[0],
                      allMethods.size(), 
                      allProperties.empty() ? 0 : &allProperties[0],
-                     allProperties.size());
+                     allProperties.size(),
+                     allTUVariables.empty() ? 0 :
+                     &allTUVariables[0],
+                     allTUVariables.size());
 }
 
 ///   Parse property attribute declarations.

lib/Sema/Sema.h

diff --git a/lib/Sema/Sema.h b/lib/Sema/Sema.h
index 38541ef..d84829a 100644
--- a/lib/Sema/Sema.h
+++ b/lib/Sema/Sema.h
@@ -1986,7 +1986,8 @@
   
   virtual void ActOnAtEnd(SourceLocation AtEndLoc, DeclTy *classDecl,
                       DeclTy **allMethods = 0, unsigned allNum = 0,
-                      DeclTy **allProperties = 0, unsigned pNum = 0);
+                      DeclTy **allProperties = 0, unsigned pNum = 0,
+                      DeclTy **allTUVars = 0, unsigned tuvNum = 0);
   
   virtual DeclTy *ActOnProperty(Scope *S, SourceLocation AtLoc,
                                 FieldDeclarator &FD, ObjCDeclSpec &ODS,

lib/Sema/SemaDeclObjC.cpp

diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp
index fb74519..9314134 100644
--- a/lib/Sema/SemaDeclObjC.cpp
+++ b/lib/Sema/SemaDeclObjC.cpp
@@ -1233,7 +1233,9 @@
 // always null.
 void Sema::ActOnAtEnd(SourceLocation AtEndLoc, DeclTy *classDecl,
                       DeclTy **allMethods, unsigned allNum,
-                      DeclTy **allProperties, unsigned pNum) {
+                      DeclTy **allProperties, unsigned pNum,
+                      DeclTy **allTUVars,
+                      unsigned tuvNum) {
   Decl *ClassDecl = static_cast<Decl *>(classDecl);
 
   // FIXME: If we don't have a ClassDecl, we have an error. We should consider
@@ -1337,6 +1339,15 @@
       }
     }
   }
+  llvm::SmallVector<VarDecl*, 8> allTUVariables;
+  for (unsigned i = 0; i < tuvNum; i++) {
+    if (VarDecl *VD = dyn_cast<VarDecl>((Decl*)allTUVars[i]))
+      allTUVariables.push_back(VD);
+  }
+  if (!allTUVariables.empty() && isInterfaceDeclKind) {
+    ObjCContainerDecl *OCD = dyn_cast<ObjCContainerDecl>(ClassDecl);
+    OCD->setTUVarList(&allTUVariables[0], allTUVariables.size(), Context);
+  }
 }