[PATCH] D42918: [clang-tidy] Update fuchsia-multiple-inheritance to check for templates

[Julie Hockett via Phabricator via cfe-commits]

juliehockett created this revision.
juliehockett added reviewers: aaron.ballman, alexfh, hokein.
Herald added a subscriber: xazax.hun.

Updating fuchsia-multiple-inheritance to not crash when a record inherits a 
template.

Fixes PR36052.


https://reviews.llvm.org/D42918

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
@@ -129,3 +129,5 @@
 struct V14 : virtual Static_Base_2 { static void g(); };
 struct D8 : V13, V14 {};
 
+template<typename T> struct A : T {};
+template<typename T> struct B : virtual T {};
Index: clang-tidy/fuchsia/MultipleInheritanceCheck.cpp
===================================================================
--- clang-tidy/fuchsia/MultipleInheritanceCheck.cpp
+++ clang-tidy/fuchsia/MultipleInheritanceCheck.cpp
@@ -64,7 +64,7 @@
 
   // To be an interface, all base classes must be interfaces as well.
   for (const auto &I : Node->bases()) {
-    if (I.isVirtual()) continue;  
+    if (I.isVirtual()) continue;
     const auto *Ty = I.getType()->getAs<RecordType>();
     assert(Ty && "RecordType of base class is unknown");
     const RecordDecl *D = Ty->getDecl()->getDefinition();
@@ -96,7 +96,7 @@
     // concrete classes
     unsigned NumConcrete = 0;
     for (const auto &I : D->bases()) {
-      if (I.isVirtual()) continue;
+      if (I.isVirtual() || I.getType()->getAs<TemplateTypeParmType>()) 
continue;
       const auto *Ty = I.getType()->getAs<RecordType>();
       assert(Ty && "RecordType of base class is unknown");
       const auto *Base = cast<CXXRecordDecl>(Ty->getDecl()->getDefinition());



Index: test/clang-tidy/fuchsia-multiple-inheritance.cpp
===================================================================
--- test/clang-tidy/fuchsia-multiple-inheritance.cpp
+++ test/clang-tidy/fuchsia-multiple-inheritance.cpp
@@ -129,3 +129,5 @@
 struct V14 : virtual Static_Base_2 { static void g(); };
 struct D8 : V13, V14 {};
 
+template<typename T> struct A : T {};
+template<typename T> struct B : virtual T {};
Index: clang-tidy/fuchsia/MultipleInheritanceCheck.cpp
===================================================================
--- clang-tidy/fuchsia/MultipleInheritanceCheck.cpp
+++ clang-tidy/fuchsia/MultipleInheritanceCheck.cpp
@@ -64,7 +64,7 @@
 
   // To be an interface, all base classes must be interfaces as well.
   for (const auto &I : Node->bases()) {
-    if (I.isVirtual()) continue;  
+    if (I.isVirtual()) continue;
     const auto *Ty = I.getType()->getAs<RecordType>();
     assert(Ty && "RecordType of base class is unknown");
     const RecordDecl *D = Ty->getDecl()->getDefinition();
@@ -96,7 +96,7 @@
     // concrete classes
     unsigned NumConcrete = 0;
     for (const auto &I : D->bases()) {
-      if (I.isVirtual()) continue;
+      if (I.isVirtual() || I.getType()->getAs<TemplateTypeParmType>()) continue;
       const auto *Ty = I.getType()->getAs<RecordType>();
       assert(Ty && "RecordType of base class is unknown");
       const auto *Base = cast<CXXRecordDecl>(Ty->getDecl()->getDefinition());

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits