OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

Fix isOverride() for the case of a dependent typed base class. 

The method decl is not marked as overriding any other method decls
until the template is instantiated.
Use the override attribute as another signal.

llvm-svn: 231487
This commit is contained in:
Samuel Benzaquen 2015-03-06 16:24:47 +00:00
parent 298a3a0567
commit bb5093fefd
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/include/clang/ASTMatchers/ASTMatchers.h
View File

@ -2993,7 +2993,7 @@ AST_MATCHER(CXXMethodDecl, isConst) {
/// \endcode /// \endcode
/// matches B::x /// matches B::x
AST_MATCHER(CXXMethodDecl, isOverride) { AST_MATCHER(CXXMethodDecl, isOverride) {
return Node.size_overridden_methods() > 0; return Node.size_overridden_methods() > 0 || Node.hasAttr<OverrideAttr>();
} }
/// \brief Matches member expressions that are called with '->' as opposed /// \brief Matches member expressions that are called with '->' as opposed

3
clang/unittests/ASTMatchers/ASTMatchersTest.cpp
View File

@ -1790,6 +1790,9 @@ TEST(Matcher, MatchesOverridingMethod) {
methodDecl(isOverride()))); methodDecl(isOverride())));
EXPECT_TRUE(notMatches("class X { int f(); int f(int); }; ", EXPECT_TRUE(notMatches("class X { int f(); int f(int); }; ",
methodDecl(isOverride()))); methodDecl(isOverride())));
EXPECT_TRUE(
matches("template <typename Base> struct Y : Base { void f() override;};",
methodDecl(isOverride(), hasName("::Y::f"))));
} }
TEST(Matcher, ConstructorCall) { TEST(Matcher, ConstructorCall) {