summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema/SemaDeclCXX.cpp
diff options
context:
space:
mode:
authorJan Korous <jkorous@apple.com>2018-01-13 15:24:16 +0000
committerJan Korous <jkorous@apple.com>2018-01-13 15:24:16 +0000
commitfda9daeb032b12d97cd96ca9863ebbd036c0d159 (patch)
tree7f35b7d4b49525b3e1a822fb01e0a435536c8e09 /clang/lib/Sema/SemaDeclCXX.cpp
parent0a80f8924b137513c42338760c8e9289bebe6747 (diff)
downloadbcm5719-llvm-fda9daeb032b12d97cd96ca9863ebbd036c0d159.tar.gz
bcm5719-llvm-fda9daeb032b12d97cd96ca9863ebbd036c0d159.zip
[Sema] Fix crash for type-dependent base classes
llvm-svn: 322438
Diffstat (limited to 'clang/lib/Sema/SemaDeclCXX.cpp')
-rw-r--r--clang/lib/Sema/SemaDeclCXX.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
index f0a176b14cf..6873feb7802 100644
--- a/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/clang/lib/Sema/SemaDeclCXX.cpp
@@ -2417,9 +2417,16 @@ bool Sema::AttachBaseSpecifiers(CXXRecordDecl *Class,
// Attach the remaining base class specifiers to the derived class.
Class->setBases(Bases.data(), NumGoodBases);
+ // Check that the only base classes that are duplicate are virtual.
for (unsigned idx = 0; idx < NumGoodBases; ++idx) {
// Check whether this direct base is inaccessible due to ambiguity.
QualType BaseType = Bases[idx]->getType();
+
+ // Skip all dependent types in templates being used as base specifiers.
+ // Checks below assume that the base specifier is a CXXRecord.
+ if (BaseType->isDependentType())
+ continue;
+
CanQualType CanonicalBase = Context.getCanonicalType(BaseType)
.getUnqualifiedType();
OpenPOWER on IntegriCloud