A few change per Doug's feedback.

- Fariborz



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

2 files changed, 8 insertions, 9 deletions

diff --git a/include/clang/AST/DeclCXX.h b/include/clang/AST/DeclCXX.h
index c523e96e03..741998def1 100644
--- a/include/clang/AST/DeclCXX.h
+++ b/include/clang/AST/DeclCXX.h
@@ -750,17 +750,17 @@ public:
   /// init_const_iterator - Iterates through the memberbase initializer list.
   typedef CXXBaseOrMemberInitializer * const * init_const_iterator;
   
+  /// init_begin() - Retrieve an iterator to the first initializer.
+  init_iterator       init_begin()       { return BaseOrMemberInitializers; }
   /// begin() - Retrieve an iterator to the first initializer.
-  init_iterator       begin()       { return BaseOrMemberInitializers; }
-  /// begin() - Retrieve an iterator to the first initializer.
-  init_const_iterator begin() const { return BaseOrMemberInitializers; }
+  init_const_iterator init_begin() const { return BaseOrMemberInitializers; }
   
-  /// end() - Retrieve an iterator past the last initializer.
-  init_iterator       end()       { 
+  /// init_end() - Retrieve an iterator past the last initializer.
+  init_iterator       init_end()       { 
     return BaseOrMemberInitializers + NumBaseOrMemberInitializers; 
   }
   /// end() - Retrieve an iterator past the last initializer.
-  init_const_iterator end() const { 
+  init_const_iterator init_end() const { 
     return BaseOrMemberInitializers + NumBaseOrMemberInitializers; 
   }
   
diff --git a/lib/AST/DeclCXX.cpp b/lib/AST/DeclCXX.cpp
index b8b2952806..6be675ad83 100644
--- a/lib/AST/DeclCXX.cpp
+++ b/lib/AST/DeclCXX.cpp
@@ -419,7 +419,7 @@ CXXConstructorDecl::setBaseOrMemberInitializers(
   if (NumInitializers > 0) {
     NumBaseOrMemberInitializers = NumInitializers;
     BaseOrMemberInitializers = 
-      new (C, 8) CXXBaseOrMemberInitializer*[NumInitializers]; 
+      new (C) CXXBaseOrMemberInitializer*[NumInitializers]; 
     for (unsigned Idx = 0; Idx < NumInitializers; ++Idx)
       BaseOrMemberInitializers[Idx] = Initializers[Idx];
   }
@@ -428,8 +428,7 @@ CXXConstructorDecl::setBaseOrMemberInitializers(
 void
 CXXConstructorDecl::Destroy(ASTContext& C) {
   C.Deallocate(BaseOrMemberInitializers);
-  this->~CXXMethodDecl();
-  C.Deallocate((void *)this);
+  CXXMethodDecl::Destroy(C);
 }
 
 CXXConversionDecl *