Remove the ASTContext parameter from Entity::getPrintableName().
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@76546 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/clang/Analysis/CallGraph.h b/include/clang/Analysis/CallGraph.h
index 73072c4..9a05dad 100644
--- a/include/clang/Analysis/CallGraph.h
+++ b/include/clang/Analysis/CallGraph.h
@@ -45,7 +45,7 @@
bool hasCallee() const { return begin() != end(); }
- std::string getName(ASTContext &Ctx) { return F.getPrintableName(Ctx); }
+ std::string getName() { return F.getPrintableName(); }
};
class CallGraph {
diff --git a/include/clang/Index/Entity.h b/include/clang/Index/Entity.h
index 8eb72e6..490a648 100644
--- a/include/clang/Index/Entity.h
+++ b/include/clang/Index/Entity.h
@@ -58,7 +58,7 @@
Decl *getDecl(ASTContext &AST);
/// \brief Get a printable name for debugging purpose.
- std::string getPrintableName(ASTContext &Ctx);
+ std::string getPrintableName();
/// \brief Get an Entity associated with the given Decl.
/// \returns Null if an Entity cannot refer to this Decl.
diff --git a/lib/Analysis/CallGraph.cpp b/lib/Analysis/CallGraph.cpp
index 2530fc0..5605439 100644
--- a/lib/Analysis/CallGraph.cpp
+++ b/lib/Analysis/CallGraph.cpp
@@ -97,12 +97,11 @@
void CallGraph::print(llvm::raw_ostream &os) {
for (iterator I = begin(), E = end(); I != E; ++I) {
if (I->second->hasCallee()) {
- ASTContext &Ctx = *CallerCtx[I->second];
- os << "function: " << I->first.getPrintableName(Ctx).c_str()
+ os << "function: " << I->first.getPrintableName()
<< " calls:\n";
for (CallGraphNode::iterator CI = I->second->begin(),
CE = I->second->end(); CI != CE; ++CI) {
- os << " " << CI->second->getName(Ctx).c_str();
+ os << " " << CI->second->getName().c_str();
}
os << '\n';
}
diff --git a/lib/Index/Entity.cpp b/lib/Index/Entity.cpp
index cc45e25..c7924f6 100644
--- a/lib/Index/Entity.cpp
+++ b/lib/Index/Entity.cpp
@@ -134,6 +134,10 @@
return EntityGetter(Prog).Visit(D);
}
+std::string EntityImpl::getPrintableName() {
+ return std::string(Id->getKeyData(), Id->getKeyData() + Id->getKeyLength());
+}
+
//===----------------------------------------------------------------------===//
// Entity Implementation
//===----------------------------------------------------------------------===//
@@ -152,11 +156,18 @@
return Val.get<EntityImpl *>()->getDecl(AST);
}
-std::string Entity::getPrintableName(ASTContext &Ctx) {
- if (const NamedDecl *ND = dyn_cast_or_null<NamedDecl>(getDecl(Ctx))) {
- return ND->getNameAsString();
+std::string Entity::getPrintableName() {
+ if (isInvalid())
+ return "<< Invalid >>";
+
+ if (Decl *D = Val.dyn_cast<Decl *>()) {
+ if (NamedDecl *ND = dyn_cast<NamedDecl>(D))
+ return ND->getNameAsString();
+ else
+ return std::string();
}
- return std::string();
+
+ return Val.get<EntityImpl *>()->getPrintableName();
}
/// \brief Get an Entity associated with the given Decl.
diff --git a/lib/Index/EntityImpl.h b/lib/Index/EntityImpl.h
index 334dcfb..3f09f80 100644
--- a/lib/Index/EntityImpl.h
+++ b/lib/Index/EntityImpl.h
@@ -44,6 +44,8 @@
/// \brief Get an Entity associated with the given Decl.
/// \returns Null if an Entity cannot refer to this Decl.
static Entity get(Decl *D, ProgramImpl &Prog);
+
+ std::string getPrintableName();
void Profile(llvm::FoldingSetNodeID &ID) const {
Profile(ID, Parent, Id, IdNS);