diff options
| -rw-r--r-- | clang/include/clang/Tooling/Refactoring/RecursiveSymbolVisitor.h | 12 | ||||
| -rw-r--r-- | clang/test/clang-rename/Typedef.cpp | 8 |
2 files changed, 19 insertions, 1 deletions
diff --git a/clang/include/clang/Tooling/Refactoring/RecursiveSymbolVisitor.h b/clang/include/clang/Tooling/Refactoring/RecursiveSymbolVisitor.h index cd230ea18b5..c0f995d85c1 100644 --- a/clang/include/clang/Tooling/Refactoring/RecursiveSymbolVisitor.h +++ b/clang/include/clang/Tooling/Refactoring/RecursiveSymbolVisitor.h @@ -98,7 +98,17 @@ public: TypeBeginLoc, TypeEndLoc)) return false; } - return visit(Loc.getType()->getAsCXXRecordDecl(), TypeBeginLoc, TypeEndLoc); + if (const Type *TP = Loc.getTypePtr()) { + if (TP->getTypeClass() == clang::Type::Record) + return visit(TP->getAsCXXRecordDecl(), TypeBeginLoc, TypeEndLoc); + } + return true; + } + + bool VisitTypedefTypeLoc(TypedefTypeLoc TL) { + const SourceLocation TypeEndLoc = + Lexer::getLocForEndOfToken(TL.getBeginLoc(), 0, SM, LangOpts); + return visit(TL.getTypedefNameDecl(), TL.getBeginLoc(), TypeEndLoc); } bool TraverseNestedNameSpecifierLoc(NestedNameSpecifierLoc NNS) { diff --git a/clang/test/clang-rename/Typedef.cpp b/clang/test/clang-rename/Typedef.cpp new file mode 100644 index 00000000000..64d337fae22 --- /dev/null +++ b/clang/test/clang-rename/Typedef.cpp @@ -0,0 +1,8 @@ +namespace std { +class basic_string {}; +typedef basic_string string; +} // namespace std + +std::string foo(); // // CHECK: std::new_string foo(); + +// RUN: clang-rename -offset=93 -new-name=new_string %s -- | sed 's,//.*,,' | FileCheck %s |
