Reinstate r114925 and r114929, both steps toward

<rdar://problem/8459981>.


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

1 files changed, 0 insertions, 7 deletions

diff --git a/lib/Sema/SemaTemplateInstantiate.cpp b/lib/Sema/SemaTemplateInstantiate.cpp
index 5520f64044..a2c3df653b 100644
--- a/lib/Sema/SemaTemplateInstantiate.cpp
+++ b/lib/Sema/SemaTemplateInstantiate.cpp
@@ -1091,13 +1091,6 @@ Sema::SubstBaseSpecifiers(CXXRecordDecl *Instantiation,
          Base = Pattern->bases_begin(), BaseEnd = Pattern->bases_end();
        Base != BaseEnd; ++Base) {
     if (!Base->getType()->isDependentType()) {
-      const CXXRecordDecl *BaseDecl =
-        cast<CXXRecordDecl>(Base->getType()->getAs<RecordType>()->getDecl());
-      
-      // Make sure to set the attributes from the base.
-      SetClassDeclAttributesFromBase(Instantiation, BaseDecl, 
-                                     Base->isVirtual());
-      
       InstantiatedBases.push_back(new (Context) CXXBaseSpecifier(*Base));
       continue;
     }