add the last two Create methods for decls, woo!

llvm-svn: 48432

2 files changed, 35 insertions, 20 deletions

diff --git a/clang/lib/AST/DeclObjC.cpp b/clang/lib/AST/DeclObjC.cpp
index 4f1671ef073..dcb53e8c426 100644
--- a/clang/lib/AST/DeclObjC.cpp
+++ b/clang/lib/AST/DeclObjC.cpp
@@ -89,6 +89,19 @@ ObjCImplementationDecl::Create(ASTContext &C, SourceLocation L,
   return new (Mem) ObjCImplementationDecl(L, Id, ClassInterface, SuperDecl);
 }
 
+ObjCCompatibleAliasDecl *
+ObjCCompatibleAliasDecl::Create(ASTContext &C, SourceLocation L,
+                                IdentifierInfo *Id, 
+                                ObjCInterfaceDecl* AliasedClass) {
+  void *Mem = C.getAllocator().Allocate<ObjCCompatibleAliasDecl>();
+  return new (Mem) ObjCCompatibleAliasDecl(L, Id, AliasedClass);
+}
+
+ObjCPropertyDecl *ObjCPropertyDecl::Create(ASTContext &C, SourceLocation L) {
+  void *Mem = C.getAllocator().Allocate<ObjCPropertyDecl>();
+  return new (Mem) ObjCPropertyDecl(L);
+}
+
 //===----------------------------------------------------------------------===//
 // Objective-C Decl Implementation
 //===----------------------------------------------------------------------===//
diff --git a/clang/lib/Sema/SemaDeclObjC.cpp b/clang/lib/Sema/SemaDeclObjC.cpp
index f9da77ff2c5..121004db990 100644
--- a/clang/lib/Sema/SemaDeclObjC.cpp
+++ b/clang/lib/Sema/SemaDeclObjC.cpp
@@ -172,20 +172,20 @@ Sema::DeclTy *Sema::ActOnCompatiblityAlias(
     return 0;
   }
   // Check for class declaration
-  ScopedDecl *CDecl = LookupScopedDecl(ClassName, Decl::IDNS_Ordinary,
-                                       ClassLocation, TUScope);
-  if (!CDecl || !isa<ObjCInterfaceDecl>(CDecl)) {
-    Diag(ClassLocation, diag::warn_undef_interface,
-         ClassName->getName());
-    if (CDecl)
-      Diag(CDecl->getLocation(), diag::warn_previous_declaration);
+  ScopedDecl *CDeclU = LookupScopedDecl(ClassName, Decl::IDNS_Ordinary,
+                                        ClassLocation, TUScope);
+  ObjCInterfaceDecl *CDecl = dyn_cast_or_null<ObjCInterfaceDecl>(CDeclU);
+  if (CDecl == 0) {
+    Diag(ClassLocation, diag::warn_undef_interface, ClassName->getName());
+    if (CDeclU)
+      Diag(CDeclU->getLocation(), diag::warn_previous_declaration);
     return 0;
   }
-  // Everything checked out, instantiate a new alias declaration ast
+  
+  // Everything checked out, instantiate a new alias declaration AST.
   ObjCCompatibleAliasDecl *AliasDecl = 
-    new ObjCCompatibleAliasDecl(AtCompatibilityAliasLoc, 
-                                AliasName,
-                                dyn_cast<ObjCInterfaceDecl>(CDecl));
+    ObjCCompatibleAliasDecl::Create(Context, AtCompatibilityAliasLoc, 
+                                    AliasName, CDecl);
     
   // Chain & install the interface decl into the identifier.
   AliasDecl->setNext(AliasName->getFETokenInfo<ScopedDecl>());
@@ -699,17 +699,19 @@ void Sema::ActOnAtEnd(SourceLocation AtEndLoc, DeclTy *classDecl,
   llvm::DenseMap<Selector, const ObjCMethodDecl*> ClsMap;
   
   bool isInterfaceDeclKind = 
-        (isa<ObjCInterfaceDecl>(ClassDecl) || isa<ObjCCategoryDecl>(ClassDecl)
-         || isa<ObjCProtocolDecl>(ClassDecl));
+        isa<ObjCInterfaceDecl>(ClassDecl) || isa<ObjCCategoryDecl>(ClassDecl)
+         || isa<ObjCProtocolDecl>(ClassDecl);
   bool checkIdenticalMethods = isa<ObjCImplementationDecl>(ClassDecl);
   
   // TODO: property declaration in category and protocols.
-  if (pNum != 0 && isa<ObjCInterfaceDecl>(ClassDecl)) {
-    ObjCPropertyDecl **properties = new ObjCPropertyDecl*[pNum];
-    memcpy(properties, allProperties, pNum*sizeof(ObjCPropertyDecl*));
-    dyn_cast<ObjCInterfaceDecl>(ClassDecl)->setPropertyDecls(properties);
-    dyn_cast<ObjCInterfaceDecl>(ClassDecl)->setNumPropertyDecl(pNum);
-  }
+  if (pNum != 0)
+    if (ObjCInterfaceDecl *IDecl = dyn_cast<ObjCInterfaceDecl>(ClassDecl)) {
+      // FIXME: Move the memory allocation into setPropertyDecls!
+      ObjCPropertyDecl **properties = new ObjCPropertyDecl*[pNum];
+      memcpy(properties, allProperties, pNum*sizeof(ObjCPropertyDecl*));
+      IDecl->setPropertyDecls(properties);
+      IDecl->setNumPropertyDecl(pNum);
+    }
   
   for (unsigned i = 0; i < allNum; i++ ) {
     ObjCMethodDecl *Method =
@@ -897,7 +899,7 @@ Sema::DeclTy *Sema::ActOnMethodDeclaration(
 
 Sema::DeclTy *Sema::ActOnAddObjCProperties(SourceLocation AtLoc, 
   DeclTy **allProperties, unsigned NumProperties, ObjCDeclSpec &DS) {
-  ObjCPropertyDecl *PDecl = new ObjCPropertyDecl(AtLoc);
+  ObjCPropertyDecl *PDecl = ObjCPropertyDecl::Create(Context, AtLoc);
   
   if(DS.getPropertyAttributes() & ObjCDeclSpec::DQ_PR_readonly)
     PDecl->setPropertyAttributes(ObjCPropertyDecl::OBJC_PR_readonly);