Phase 2 of making the Decl class more lightweight...

Move Identifier/Loc instance variables (and associated getters/setters) down from Decl to ScopedDecl/FieldDecl.

Objc AST's can now inherit from Decl without getting instance variables and types that are C specific. For now, I am keeping NextDeclarator, since I believe it may be useful to ObjC. If not, it can be moved later.

llvm-svn: 41934

1 files changed, 3 insertions, 3 deletions

diff --git a/clang/Sema/Sema.h b/clang/Sema/Sema.h
index 2cc11487121..30953083547 100644
--- a/clang/Sema/Sema.h
+++ b/clang/Sema/Sema.h
@@ -166,9 +166,9 @@ private:
 private:
   /// Subroutines of ParseDeclarator()...
   TypedefDecl *ParseTypedefDecl(Scope *S, Declarator &D, Decl *LastDeclarator);
-  TypedefDecl *MergeTypeDefDecl(TypedefDecl *New, Decl *Old);
-  FunctionDecl *MergeFunctionDecl(FunctionDecl *New, Decl *Old);
-  VarDecl *MergeVarDecl(VarDecl *New, Decl *Old);
+  TypedefDecl *MergeTypeDefDecl(TypedefDecl *New, ScopedDecl *Old);
+  FunctionDecl *MergeFunctionDecl(FunctionDecl *New, ScopedDecl *Old);
+  VarDecl *MergeVarDecl(VarDecl *New, ScopedDecl *Old);
   /// AddTopLevelDecl - called after the decl has been fully processed.
   /// Allows for bookkeeping and post-processing of each declaration.
   void AddTopLevelDecl(Decl *current, Decl *last);