This revision was automatically updated to reflect the committed changes. Closed by commit rL258801: Fix crashing on user-defined conversion. (authored by alexfh).
Changed prior to commit: http://reviews.llvm.org/D16536?vs=45873&id=45963#toc Repository: rL LLVM http://reviews.llvm.org/D16536 Files: clang-tools-extra/trunk/clang-tidy/misc/VirtualNearMissCheck.cpp clang-tools-extra/trunk/test/clang-tidy/misc-virtual-near-miss.cpp Index: clang-tools-extra/trunk/test/clang-tidy/misc-virtual-near-miss.cpp =================================================================== --- clang-tools-extra/trunk/test/clang-tidy/misc-virtual-near-miss.cpp +++ clang-tools-extra/trunk/test/clang-tidy/misc-virtual-near-miss.cpp @@ -69,6 +69,7 @@ int decaz(const char str[]); // CHECK-MESSAGES: :[[@LINE-1]]:3: warning: method 'Child::decaz' has {{.*}} 'Mother::decay' + operator bool(); private: void funk(); // CHECK-MESSAGES: :[[@LINE-1]]:3: warning: method 'Child::funk' has {{.*}} 'Father::func' Index: clang-tools-extra/trunk/clang-tidy/misc/VirtualNearMissCheck.cpp =================================================================== --- clang-tools-extra/trunk/clang-tidy/misc/VirtualNearMissCheck.cpp +++ clang-tools-extra/trunk/clang-tidy/misc/VirtualNearMissCheck.cpp @@ -178,7 +178,8 @@ bool IsPossible = !BaseMD->isImplicit() && !isa<CXXConstructorDecl>(BaseMD) && !isa<CXXDestructorDecl>(BaseMD) && BaseMD->isVirtual() && - !BaseMD->isOverloadedOperator(); + !BaseMD->isOverloadedOperator() && + !isa<CXXConversionDecl>(BaseMD); PossibleMap[Id] = IsPossible; return IsPossible; } @@ -210,8 +211,9 @@ return; Finder->addMatcher( - cxxMethodDecl(unless(anyOf(isOverride(), isImplicit(), - cxxConstructorDecl(), cxxDestructorDecl()))) + cxxMethodDecl( + unless(anyOf(isOverride(), isImplicit(), cxxConstructorDecl(), + cxxDestructorDecl(), cxxConversionDecl()))) .bind("method"), this); }
Index: clang-tools-extra/trunk/test/clang-tidy/misc-virtual-near-miss.cpp =================================================================== --- clang-tools-extra/trunk/test/clang-tidy/misc-virtual-near-miss.cpp +++ clang-tools-extra/trunk/test/clang-tidy/misc-virtual-near-miss.cpp @@ -69,6 +69,7 @@ int decaz(const char str[]); // CHECK-MESSAGES: :[[@LINE-1]]:3: warning: method 'Child::decaz' has {{.*}} 'Mother::decay' + operator bool(); private: void funk(); // CHECK-MESSAGES: :[[@LINE-1]]:3: warning: method 'Child::funk' has {{.*}} 'Father::func' Index: clang-tools-extra/trunk/clang-tidy/misc/VirtualNearMissCheck.cpp =================================================================== --- clang-tools-extra/trunk/clang-tidy/misc/VirtualNearMissCheck.cpp +++ clang-tools-extra/trunk/clang-tidy/misc/VirtualNearMissCheck.cpp @@ -178,7 +178,8 @@ bool IsPossible = !BaseMD->isImplicit() && !isa<CXXConstructorDecl>(BaseMD) && !isa<CXXDestructorDecl>(BaseMD) && BaseMD->isVirtual() && - !BaseMD->isOverloadedOperator(); + !BaseMD->isOverloadedOperator() && + !isa<CXXConversionDecl>(BaseMD); PossibleMap[Id] = IsPossible; return IsPossible; } @@ -210,8 +211,9 @@ return; Finder->addMatcher( - cxxMethodDecl(unless(anyOf(isOverride(), isImplicit(), - cxxConstructorDecl(), cxxDestructorDecl()))) + cxxMethodDecl( + unless(anyOf(isOverride(), isImplicit(), cxxConstructorDecl(), + cxxDestructorDecl(), cxxConversionDecl()))) .bind("method"), this); }
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits