diff options
| -rw-r--r-- | include/clang/Parse/Action.h | 25 | ||||
| -rw-r--r-- | lib/Parse/MinimalAction.cpp | 15 | ||||
| -rw-r--r-- | lib/Parse/ParseStmt.cpp | 4 | ||||
| -rw-r--r-- | lib/Sema/Sema.h | 5 | ||||
| -rw-r--r-- | lib/Sema/SemaDecl.cpp | 9 |
5 files changed, 56 insertions, 2 deletions
diff --git a/include/clang/Parse/Action.h b/include/clang/Parse/Action.h index 1fe58da68c..21ae8c021d 100644 --- a/include/clang/Parse/Action.h +++ b/include/clang/Parse/Action.h @@ -20,6 +20,7 @@ #include "clang/Basic/TypeTraits.h" #include "clang/Parse/AccessSpecifier.h" #include "clang/Parse/Ownership.h" +#include "llvm/Support/PrettyStackTrace.h" namespace clang { // Semantic. @@ -118,6 +119,11 @@ public: /// Statistics. virtual void PrintStats() const {} + + /// getDeclName - Return a pretty name for the specified decl if possible, or + /// an empty string if not. This is used for pretty crash reporting. + virtual std::string getDeclName(DeclTy *D) { return ""; } + //===--------------------------------------------------------------------===// // Declaration Tracking Callbacks. //===--------------------------------------------------------------------===// @@ -266,8 +272,8 @@ public: return; } - /// ActOnFinishFunctionBody - This is called when a function body has completed - /// parsing. Decl is the DeclTy returned by ParseStartOfFunctionDef. + /// ActOnFinishFunctionBody - This is called when a function body has + /// completed parsing. Decl is the DeclTy returned by ParseStartOfFunctionDef. virtual DeclTy *ActOnFinishFunctionBody(DeclTy *Decl, StmtArg Body) { return Decl; } @@ -1510,6 +1516,21 @@ public: AttributeList *AttrList); }; + +class PrettyStackTraceDecl : public llvm::PrettyStackTraceEntry { + Action::DeclTy *TheDecl; + SourceLocation Loc; + Action &Actions; + SourceManager &SM; + const char *Message; +public: + PrettyStackTraceDecl(Action::DeclTy *Decl, SourceLocation L, + Action &actions, SourceManager &sm, const char *Msg) + : TheDecl(Decl), Loc(L), Actions(actions), SM(sm), Message(Msg) {} + + virtual void print(llvm::raw_ostream &OS) const; +}; + } // end namespace clang #endif diff --git a/lib/Parse/MinimalAction.cpp b/lib/Parse/MinimalAction.cpp index 9cd5b979ca..5238a89957 100644 --- a/lib/Parse/MinimalAction.cpp +++ b/lib/Parse/MinimalAction.cpp @@ -16,8 +16,23 @@ #include "clang/Parse/Scope.h" #include "llvm/Support/Allocator.h" #include "llvm/Support/RecyclingAllocator.h" +#include "llvm/Support/raw_ostream.h" using namespace clang; +void PrettyStackTraceDecl::print(llvm::raw_ostream &OS) const { + if (Loc.isValid()) { + Loc.print(OS, SM); + OS << ": "; + } + OS << Message; + + std::string Name = Actions.getDeclName(TheDecl); + if (!Name.empty()) + OS << " '" << Name << '\''; + + OS << '\n'; +} + /// TypeNameInfo - A link exists here for each scope that an identifier is /// defined. namespace { diff --git a/lib/Parse/ParseStmt.cpp b/lib/Parse/ParseStmt.cpp index 1ecbe8bd84..cb9bdc7cfb 100644 --- a/lib/Parse/ParseStmt.cpp +++ b/lib/Parse/ParseStmt.cpp @@ -1288,6 +1288,10 @@ Parser::DeclTy *Parser::ParseFunctionStatementBody(DeclTy *Decl) { assert(Tok.is(tok::l_brace)); SourceLocation LBraceLoc = Tok.getLocation(); + PrettyStackTraceDecl CrashInfo(Decl, LBraceLoc, Actions, + PP.getSourceManager(), + "parsing function body"); + // Do not enter a scope for the brace, as the arguments are in the same scope // (the function body) as the body itself. Instead, just read the statement // list and put it into a CompoundStmt for safe keeping. diff --git a/lib/Sema/Sema.h b/lib/Sema/Sema.h index 31a8c3889d..de9b4cd013 100644 --- a/lib/Sema/Sema.h +++ b/lib/Sema/Sema.h @@ -290,6 +290,11 @@ public: //===--------------------------------------------------------------------===// // Symbol table / Decl tracking callbacks: SemaDecl.cpp. // + + /// getDeclName - Return a pretty name for the specified decl if possible, or + /// an empty string if not. This is used for pretty crash reporting. + virtual std::string getDeclName(DeclTy *D); + virtual TypeTy *getTypeName(IdentifierInfo &II, SourceLocation NameLoc, Scope *S, const CXXScopeSpec *SS); virtual DeclTy *ActOnDeclarator(Scope *S, Declarator &D, DeclTy *LastInGroup){ diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index e1b27c64a4..97002ef02f 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -30,6 +30,15 @@ #include <functional> using namespace clang; +/// getDeclName - Return a pretty name for the specified decl if possible, or +/// an empty string if not. This is used for pretty crash reporting. +std::string Sema::getDeclName(DeclTy *d) { + Decl *D = static_cast<Decl *>(d); + if (NamedDecl *DN = dyn_cast_or_null<NamedDecl>(D)) + return DN->getQualifiedNameAsString(); + return ""; +} + /// \brief If the identifier refers to a type name within this scope, /// return the declaration of that type. /// |