thieta updated this revision to Diff 441279. thieta added a comment. Clean-ups and error handling.
Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D128704/new/ https://reviews.llvm.org/D128704 Files: clang/test/Analysis/func-mapping-test.cpp clang/tools/clang-extdef-mapping/ClangExtDefMapGen.cpp
Index: clang/tools/clang-extdef-mapping/ClangExtDefMapGen.cpp =================================================================== --- clang/tools/clang-extdef-mapping/ClangExtDefMapGen.cpp +++ clang/tools/clang-extdef-mapping/ClangExtDefMapGen.cpp @@ -1,4 +1,4 @@ -//===- ClangExtDefMapGen.cpp -----------------------------------------------===// +//===- ClangExtDefMapGen.cpp ---------------------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -13,10 +13,12 @@ #include "clang/AST/ASTConsumer.h" #include "clang/AST/ASTContext.h" +#include "clang/Basic/DiagnosticOptions.h" #include "clang/Basic/SourceManager.h" #include "clang/CrossTU/CrossTranslationUnit.h" #include "clang/Frontend/CompilerInstance.h" #include "clang/Frontend/FrontendActions.h" +#include "clang/Frontend/TextDiagnosticPrinter.h" #include "clang/Tooling/CommonOptionsParser.h" #include "clang/Tooling/Tooling.h" #include "llvm/Support/CommandLine.h" @@ -29,12 +31,16 @@ using namespace clang::cross_tu; using namespace clang::tooling; -static cl::OptionCategory ClangExtDefMapGenCategory("clang-extdefmapgen options"); +static cl::OptionCategory + ClangExtDefMapGenCategory("clang-extdefmapgen options"); class MapExtDefNamesConsumer : public ASTConsumer { public: - MapExtDefNamesConsumer(ASTContext &Context) - : Ctx(Context), SM(Context.getSourceManager()) {} + MapExtDefNamesConsumer(ASTContext &Context, + StringRef astFilePath = StringRef()) + : Ctx(Context), SM(Context.getSourceManager()) { + CurrentFileName = astFilePath.str(); + } ~MapExtDefNamesConsumer() { // Flush results to standard output. @@ -111,6 +117,56 @@ static cl::extrahelp CommonHelp(CommonOptionsParser::HelpMessage); +static bool HandleAST(StringRef astPath) { + + CompilerInstance CI; + + IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts = new DiagnosticOptions(); + TextDiagnosticPrinter *DiagClient = + new TextDiagnosticPrinter(llvm::errs(), &*DiagOpts); + IntrusiveRefCntPtr<DiagnosticIDs> DiagID(new DiagnosticIDs()); + IntrusiveRefCntPtr<DiagnosticsEngine> Diags( + new DiagnosticsEngine(DiagID, &*DiagOpts, DiagClient)); + + std::unique_ptr<ASTUnit> unit = ASTUnit::LoadFromASTFile( + astPath.str(), CI.getPCHContainerOperations()->getRawReader(), + ASTUnit::LoadASTOnly, Diags, CI.getFileSystemOpts()); + + if (!unit) + return false; + + FileManager fm(CI.getFileSystemOpts()); + SmallString<128> absPath(astPath); + fm.makeAbsolutePath(absPath); + + std::unique_ptr<MapExtDefNamesConsumer> consumer = + std::make_unique<MapExtDefNamesConsumer>(unit->getASTContext(), absPath); + consumer->HandleTranslationUnit(unit->getASTContext()); + + return true; +} + +static int HandleFiles(ArrayRef<std::string> sourceFiles, + CompilationDatabase &compilations) { + std::vector<std::string> sourceToBeParsed; + for (StringRef src : sourceFiles) { + if (src.endswith(".ast")) { + if (!HandleAST(src)) { + return 1; + } + } else { + sourceToBeParsed.push_back(src.str()); + } + } + + if (!sourceToBeParsed.empty()) { + ClangTool Tool(compilations, sourceToBeParsed); + return Tool.run(newFrontendActionFactory<MapExtDefNamesAction>().get()); + } + + return 0; +} + int main(int argc, const char **argv) { // Print a stack trace if we signal out. sys::PrintStackTraceOnErrorSignal(argv[0], false); @@ -127,8 +183,6 @@ } CommonOptionsParser &OptionsParser = ExpectedParser.get(); - ClangTool Tool(OptionsParser.getCompilations(), - OptionsParser.getSourcePathList()); - - return Tool.run(newFrontendActionFactory<MapExtDefNamesAction>().get()); + return HandleFiles(OptionsParser.getSourcePathList(), + OptionsParser.getCompilations()); } Index: clang/test/Analysis/func-mapping-test.cpp =================================================================== --- clang/test/Analysis/func-mapping-test.cpp +++ clang/test/Analysis/func-mapping-test.cpp @@ -1,4 +1,6 @@ // RUN: %clang_extdef_map %s -- | FileCheck --implicit-check-not "c:@y" --implicit-check-not "c:@z" %s +// RUN: %clang -emit-ast %s -o %t.ast +// RUN: %clang_extdef_map %t.ast -- | FileCheck --implicit-check-not "c:@y" --implicit-check-not "c:@z" %s int f(int) { return 0;
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
