summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--clang-tools-extra/clang-tidy/misc/VirtualNearMissCheck.cpp3
-rw-r--r--clang-tools-extra/test/clang-tidy/misc-virtual-near-miss.cpp6
2 files changed, 9 insertions, 0 deletions
diff --git a/clang-tools-extra/clang-tidy/misc/VirtualNearMissCheck.cpp b/clang-tools-extra/clang-tidy/misc/VirtualNearMissCheck.cpp
index 24aea8c2cca..ddec9d91b97 100644
--- a/clang-tools-extra/clang-tidy/misc/VirtualNearMissCheck.cpp
+++ b/clang-tools-extra/clang-tidy/misc/VirtualNearMissCheck.cpp
@@ -72,6 +72,9 @@ static bool checkOverridingFunctionReturnType(const ASTContext *Context,
if (DRD == nullptr || BRD == nullptr)
return false;
+ if (!DRD->hasDefinition() || !BRD->hasDefinition())
+ return false;
+
if (DRD == BRD)
return true;
diff --git a/clang-tools-extra/test/clang-tidy/misc-virtual-near-miss.cpp b/clang-tools-extra/test/clang-tidy/misc-virtual-near-miss.cpp
index 4e211a6a80e..c3f2e6261d4 100644
--- a/clang-tools-extra/test/clang-tidy/misc-virtual-near-miss.cpp
+++ b/clang-tools-extra/test/clang-tidy/misc-virtual-near-miss.cpp
@@ -1,10 +1,14 @@
// RUN: %check_clang_tidy %s misc-virtual-near-miss %t
+class NoDefinedClass1;
+class NoDefinedClass2;
+
struct Base {
virtual void func();
virtual void gunk();
virtual ~Base();
virtual Base &operator=(const Base &);
+ virtual NoDefinedClass1 *f();
};
struct Derived : Base {
@@ -24,6 +28,8 @@ struct Derived : Base {
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: method 'Derived::fun' has {{.*}} 'Base::func'
Derived &operator==(const Base &); // Should not warn: operators are ignored.
+
+ virtual NoDefinedClass2 *f1(); // Should not crash: non-defined class return type is ignored.
};
typedef Derived derived_type;
OpenPOWER on IntegriCloud