Make use of ASTNode for return value of clang::ResolveLocationInAST() and in the index-test tool.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@74798 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/index-test/index-test.cpp b/tools/index-test/index-test.cpp
index 552b7b0..0fa0d5a 100644
--- a/tools/index-test/index-test.cpp
+++ b/tools/index-test/index-test.cpp
@@ -28,6 +28,7 @@
#include "clang/Frontend/CommandLineSourceLoc.h"
#include "clang/AST/Decl.h"
#include "clang/AST/Stmt.h"
+#include "clang/AST/ASTNode.h"
#include "clang/Basic/FileManager.h"
#include "clang/Basic/SourceManager.h"
#include "llvm/ADT/STLExtras.h"
@@ -77,13 +78,7 @@
return 1;
}
- struct ASTPoint {
- Decl *D;
- Stmt *Node;
- ASTPoint() : D(0), Node(0) {}
- };
-
- ASTPoint Point;
+ ASTNode Node;
if (!PointAtLocation.empty()) {
const std::string &Filename = PointAtLocation[0].FileName;
@@ -114,30 +109,31 @@
return 1;
}
- llvm::tie(Point.D, Point.Node) =
- ResolveLocationInAST(AST->getASTContext(), Loc);
- if (Point.D == 0) {
+ Node = ResolveLocationInAST(AST->getASTContext(), Loc);
+ if (Node.isInvalid()) {
llvm::errs() << "[" << InFile << "] Error: " <<
"Couldn't resolve source location (no declaration found)\n";
return 1;
}
}
- if (Point.D) {
+ if (Node.isValid()) {
llvm::raw_ostream &OS = llvm::outs();
- OS << "Declaration node at point: " << Point.D->getDeclKindName() << " ";
- if (NamedDecl *ND = dyn_cast<NamedDecl>(Point.D))
+ OS << "Declaration node at point: " << Node.getDecl()->getDeclKindName()
+ << " ";
+ if (NamedDecl *ND = dyn_cast<NamedDecl>(Node.getDecl()))
OS << ND->getNameAsString();
OS << "\n";
- if (const char *Comment = AST->getASTContext().getCommentForDecl(Point.D))
+ if (const char *Comment =
+ AST->getASTContext().getCommentForDecl(Node.getDecl()))
OS << "Comment associated with this declaration:\n" << Comment << "\n";
- if (Point.Node) {
- OS << "Statement node at point: " << Point.Node->getStmtClassName()
+ if (Node.getStmt()) {
+ OS << "Statement node at point: " << Node.getStmt()->getStmtClassName()
<< " ";
- Point.Node->printPretty(OS, AST->getASTContext(), 0,
- PrintingPolicy(AST->getASTContext().getLangOptions()));
+ Node.getStmt()->printPretty(OS, AST->getASTContext(), 0,
+ PrintingPolicy(AST->getASTContext().getLangOptions()));
OS << "\n";
}
}