[PATCH] D43223: [clang-tidy] Update fuchsia-multiple-inheritance to not fail
Julie Hockett via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Mon Feb 12 22:38:11 PST 2018
juliehockett created this revision.
juliehockett added reviewers: aaron.ballman, hokein, alexfh.
juliehockett added a project: clang-tools-extra.
Herald added a subscriber: xazax.hun.
Updating the fuchsia-multiple-inheritance to gracefully handle unknown record types (e.g. templatized classes) by simply continuing, rather than asserting and failing.
Fixes PR36052.
https://reviews.llvm.org/D43223
Files:
clang-tidy/fuchsia/MultipleInheritanceCheck.cpp
test/clang-tidy/fuchsia-multiple-inheritance.cpp
Index: test/clang-tidy/fuchsia-multiple-inheritance.cpp
===================================================================
--- test/clang-tidy/fuchsia-multiple-inheritance.cpp
+++ test/clang-tidy/fuchsia-multiple-inheritance.cpp
@@ -131,3 +131,6 @@
template<typename T> struct A : T {};
template<typename T> struct B : virtual T {};
+
+template<typename> struct C {};
+template<typename T> struct D : C<T> {};
Index: clang-tidy/fuchsia/MultipleInheritanceCheck.cpp
===================================================================
--- clang-tidy/fuchsia/MultipleInheritanceCheck.cpp
+++ clang-tidy/fuchsia/MultipleInheritanceCheck.cpp
@@ -66,7 +66,7 @@
for (const auto &I : Node->bases()) {
if (I.isVirtual()) continue;
const auto *Ty = I.getType()->getAs<RecordType>();
- assert(Ty && "RecordType of base class is unknown");
+ if (!Ty) continue;
const RecordDecl *D = Ty->getDecl()->getDefinition();
if (!D) continue;
const auto *Base = cast<CXXRecordDecl>(D);
@@ -96,18 +96,18 @@
// concrete classes
unsigned NumConcrete = 0;
for (const auto &I : D->bases()) {
- if (I.isVirtual() || I.getType()->getAs<TemplateTypeParmType>()) continue;
+ if (I.isVirtual()) continue;
const auto *Ty = I.getType()->getAs<RecordType>();
- assert(Ty && "RecordType of base class is unknown");
+ if (!Ty) continue;
const auto *Base = cast<CXXRecordDecl>(Ty->getDecl()->getDefinition());
if (!isInterface(Base)) NumConcrete++;
}
// Check virtual bases to see if there is more than one concrete
// non-virtual base.
for (const auto &V : D->vbases()) {
const auto *Ty = V.getType()->getAs<RecordType>();
- assert(Ty && "RecordType of base class is unknown");
+ if (!Ty) continue;
const auto *Base = cast<CXXRecordDecl>(Ty->getDecl()->getDefinition());
if (!isInterface(Base)) NumConcrete++;
}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D43223.133995.patch
Type: text/x-patch
Size: 1933 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20180213/3038e0d2/attachment.bin>
More information about the cfe-commits
mailing list