Author: Kadir Cetinkaya Date: 2020-07-31T11:50:01+02:00 New Revision: 161882816540fc011554e4a820ab896278491b6a
URL: https://github.com/llvm/llvm-project/commit/161882816540fc011554e4a820ab896278491b6a DIFF: https://github.com/llvm/llvm-project/commit/161882816540fc011554e4a820ab896278491b6a.diff LOG: [clang][Syntax] syntax::Arena doesnt own TokenBuffer Currently an Arena can only be built while consuming a TokenBuffer, some users (like clangd) might want to share a TokenBuffer with multiple compenents. This patch changes Arena's TokenBuffer member to be a reference so that it can be created with read-only token buffers. Differential Revision: https://reviews.llvm.org/D84973 Added: Modified: clang/include/clang/Tooling/Syntax/Tree.h clang/lib/Tooling/Syntax/Tree.cpp clang/unittests/Tooling/Syntax/TreeTest.cpp Removed: ################################################################################ diff --git a/clang/include/clang/Tooling/Syntax/Tree.h b/clang/include/clang/Tooling/Syntax/Tree.h index bc581004c46e..dd51e0a74070 100644 --- a/clang/include/clang/Tooling/Syntax/Tree.h +++ b/clang/include/clang/Tooling/Syntax/Tree.h @@ -39,7 +39,7 @@ namespace syntax { class Arena { public: Arena(SourceManager &SourceMgr, const LangOptions &LangOpts, - TokenBuffer Tokens); + const TokenBuffer &Tokens); const SourceManager &sourceManager() const { return SourceMgr; } const LangOptions &langOptions() const { return LangOpts; } @@ -56,7 +56,7 @@ class Arena { private: SourceManager &SourceMgr; const LangOptions &LangOpts; - TokenBuffer Tokens; + const TokenBuffer &Tokens; /// IDs and storage for additional tokenized files. llvm::DenseMap<FileID, std::vector<syntax::Token>> ExtraTokens; /// Keeps all the allocated nodes and their intermediate data structures. diff --git a/clang/lib/Tooling/Syntax/Tree.cpp b/clang/lib/Tooling/Syntax/Tree.cpp index 37579e6145b6..2944819afc96 100644 --- a/clang/lib/Tooling/Syntax/Tree.cpp +++ b/clang/lib/Tooling/Syntax/Tree.cpp @@ -33,8 +33,8 @@ static void traverse(syntax::Node *N, } // namespace syntax::Arena::Arena(SourceManager &SourceMgr, const LangOptions &LangOpts, - TokenBuffer Tokens) - : SourceMgr(SourceMgr), LangOpts(LangOpts), Tokens(std::move(Tokens)) {} + const TokenBuffer &Tokens) + : SourceMgr(SourceMgr), LangOpts(LangOpts), Tokens(Tokens) {} const clang::syntax::TokenBuffer &syntax::Arena::tokenBuffer() const { return Tokens; diff --git a/clang/unittests/Tooling/Syntax/TreeTest.cpp b/clang/unittests/Tooling/Syntax/TreeTest.cpp index bd639aa58166..a722ca2b1a45 100644 --- a/clang/unittests/Tooling/Syntax/TreeTest.cpp +++ b/clang/unittests/Tooling/Syntax/TreeTest.cpp @@ -35,6 +35,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" #include <cstdlib> +#include <memory> using namespace clang; @@ -59,22 +60,25 @@ class SyntaxTreeTest : public ::testing::Test, class BuildSyntaxTree : public ASTConsumer { public: BuildSyntaxTree(syntax::TranslationUnit *&Root, + std::unique_ptr<syntax::TokenBuffer> &TB, std::unique_ptr<syntax::Arena> &Arena, std::unique_ptr<syntax::TokenCollector> Tokens) - : Root(Root), Arena(Arena), Tokens(std::move(Tokens)) { + : Root(Root), TB(TB), Arena(Arena), Tokens(std::move(Tokens)) { assert(this->Tokens); } void HandleTranslationUnit(ASTContext &Ctx) override { - Arena = std::make_unique<syntax::Arena>(Ctx.getSourceManager(), - Ctx.getLangOpts(), - std::move(*Tokens).consume()); + TB = + std::make_unique<syntax::TokenBuffer>(std::move(*Tokens).consume()); Tokens = nullptr; // make sure we fail if this gets called twice. + Arena = std::make_unique<syntax::Arena>(Ctx.getSourceManager(), + Ctx.getLangOpts(), *TB); Root = syntax::buildSyntaxTree(*Arena, *Ctx.getTranslationUnitDecl()); } private: syntax::TranslationUnit *&Root; + std::unique_ptr<syntax::TokenBuffer> &TB; std::unique_ptr<syntax::Arena> &Arena; std::unique_ptr<syntax::TokenCollector> Tokens; }; @@ -82,20 +86,22 @@ class SyntaxTreeTest : public ::testing::Test, class BuildSyntaxTreeAction : public ASTFrontendAction { public: BuildSyntaxTreeAction(syntax::TranslationUnit *&Root, + std::unique_ptr<syntax::TokenBuffer> &TB, std::unique_ptr<syntax::Arena> &Arena) - : Root(Root), Arena(Arena) {} + : Root(Root), TB(TB), Arena(Arena) {} std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &CI, StringRef InFile) override { // We start recording the tokens, ast consumer will take on the result. auto Tokens = std::make_unique<syntax::TokenCollector>(CI.getPreprocessor()); - return std::make_unique<BuildSyntaxTree>(Root, Arena, + return std::make_unique<BuildSyntaxTree>(Root, TB, Arena, std::move(Tokens)); } private: syntax::TranslationUnit *&Root; + std::unique_ptr<syntax::TokenBuffer> &TB; std::unique_ptr<syntax::Arena> &Arena; }; @@ -132,7 +138,7 @@ class SyntaxTreeTest : public ::testing::Test, Compiler.setSourceManager(SourceMgr.get()); syntax::TranslationUnit *Root = nullptr; - BuildSyntaxTreeAction Recorder(Root, this->Arena); + BuildSyntaxTreeAction Recorder(Root, this->TB, this->Arena); // Action could not be executed but the frontend didn't identify any errors // in the code ==> problem in setting up the action. @@ -204,6 +210,7 @@ class SyntaxTreeTest : public ::testing::Test, new SourceManager(*Diags, *FileMgr); std::shared_ptr<CompilerInvocation> Invocation; // Set after calling buildTree(). + std::unique_ptr<syntax::TokenBuffer> TB; std::unique_ptr<syntax::Arena> Arena; }; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
