aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2010-02-11 01:30:34 +0000
committerDouglas Gregor <dgregor@apple.com>2010-02-11 01:30:34 +0000
commit2d5b70386d6f5553b667b6e407ca781b4ca2009e (patch)
tree0786a2837d8329c61fa0dbd0640c7f41339f529c
parent838db383b69b9fb55f55c8e9546477df198a4faa (diff)
Remove another redundant ASTContext parameter
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@95843 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--include/clang/AST/DeclCXX.h3
-rw-r--r--lib/AST/ASTImporter.cpp2
-rw-r--r--lib/AST/DeclCXX.cpp5
-rw-r--r--lib/Sema/SemaDeclCXX.cpp2
4 files changed, 6 insertions, 6 deletions
diff --git a/include/clang/AST/DeclCXX.h b/include/clang/AST/DeclCXX.h
index a3a66885c2..06f8afc0d9 100644
--- a/include/clang/AST/DeclCXX.h
+++ b/include/clang/AST/DeclCXX.h
@@ -382,8 +382,7 @@ public:
}
/// setBases - Sets the base classes of this struct or class.
- void setBases(ASTContext &C,
- CXXBaseSpecifier const * const *Bases, unsigned NumBases);
+ void setBases(CXXBaseSpecifier const * const *Bases, unsigned NumBases);
/// getNumBases - Retrieves the number of base classes of this
/// class.
diff --git a/lib/AST/ASTImporter.cpp b/lib/AST/ASTImporter.cpp
index 3a6a3a13da..62cc339254 100644
--- a/lib/AST/ASTImporter.cpp
+++ b/lib/AST/ASTImporter.cpp
@@ -739,7 +739,7 @@ Decl *ASTNodeImporter::VisitRecordDecl(RecordDecl *D) {
T));
}
if (!Bases.empty())
- ToCXX->setBases(Importer.getToContext(), Bases.data(), Bases.size());
+ ToCXX->setBases(Bases.data(), Bases.size());
}
} else {
ToRecord = RecordDecl::Create(Importer.getToContext(), D->getTagKind(),
diff --git a/lib/AST/DeclCXX.cpp b/lib/AST/DeclCXX.cpp
index a519f78fc4..b0569d6801 100644
--- a/lib/AST/DeclCXX.cpp
+++ b/lib/AST/DeclCXX.cpp
@@ -71,9 +71,10 @@ void CXXRecordDecl::Destroy(ASTContext &C) {
}
void
-CXXRecordDecl::setBases(ASTContext &C,
- CXXBaseSpecifier const * const *Bases,
+CXXRecordDecl::setBases(CXXBaseSpecifier const * const *Bases,
unsigned NumBases) {
+ ASTContext &C = getASTContext();
+
// C++ [dcl.init.aggr]p1:
// An aggregate is an array or a class (clause 9) with [...]
// no base classes [...].
diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp
index 0c0846071a..3b0512f63e 100644
--- a/lib/Sema/SemaDeclCXX.cpp
+++ b/lib/Sema/SemaDeclCXX.cpp
@@ -641,7 +641,7 @@ bool Sema::AttachBaseSpecifiers(CXXRecordDecl *Class, CXXBaseSpecifier **Bases,
}
// Attach the remaining base class specifiers to the derived class.
- Class->setBases(Context, Bases, NumGoodBases);
+ Class->setBases(Bases, NumGoodBases);
// Delete the remaining (good) base class specifiers, since their
// data has been copied into the CXXRecordDecl.