1 files changed, 5 insertions, 9 deletions
diff --git a/clang/lib/CodeGen/CGRecordLayoutBuilder.cpp b/clang/lib/CodeGen/CGRecordLayoutBuilder.cpp
index 888b07fea7d..985ade22e4b 100644
--- a/clang/lib/CodeGen/CGRecordLayoutBuilder.cpp
+++ b/clang/lib/CodeGen/CGRecordLayoutBuilder.cpp
@@ -419,12 +419,10 @@ void CGRecordLowering::accumulateBases() {
       CharUnits::Zero(),
       getStorageType(Layout.getPrimaryBase())));
   // Accumulate the non-virtual bases.
-  for (CXXRecordDecl::base_class_const_iterator Base = RD->bases_begin(),
-                                                BaseEnd = RD->bases_end();
-        Base != BaseEnd; ++Base) {
-    if (Base->isVirtual())
+  for (const auto &Base : RD->bases()) {
+    if (Base.isVirtual())
       continue;
-    const CXXRecordDecl *BaseDecl = Base->getType()->getAsCXXRecordDecl();
+    const CXXRecordDecl *BaseDecl = Base.getType()->getAsCXXRecordDecl();
     if (!BaseDecl->isEmpty())
       Members.push_back(MemberInfo(Layout.getBaseClassOffset(BaseDecl),
           MemberInfo::Base, getStorageType(BaseDecl), BaseDecl));
@@ -472,10 +470,8 @@ bool CGRecordLowering::hasOwnStorage(const CXXRecordDecl *Decl,
   const ASTRecordLayout &DeclLayout = Context.getASTRecordLayout(Decl);
   if (DeclLayout.isPrimaryBaseVirtual() && DeclLayout.getPrimaryBase() == Query)
     return false;
-  for (CXXRecordDecl::base_class_const_iterator Base = Decl->bases_begin(),
-                                                BaseEnd = Decl->bases_end();
-       Base != BaseEnd; ++Base)
-    if (!hasOwnStorage(Base->getType()->getAsCXXRecordDecl(), Query))
+  for (const auto &Base : Decl->bases())
+    if (!hasOwnStorage(Base.getType()->getAsCXXRecordDecl(), Query))
       return false;
   return true;
 }