maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[clangd] Disable delayed template parsing in the main file 

Summary:
This is on by default in windows and breaks most features in template bodies.
We'd already disabled it in code completion, now disable it for building ASTs.

Potential regressions:
 - we may give spurious errors where files with templates relying on delayed
   parsing are directly opened
 - we may misparse such template bodies that are instantiated (and therefore
   *were* previously parsed)

Still *probably* a win overall. Avoiding the regressions entirely would be
substantial work and we don't have plans for it now.

Fixes https://github.com/clangd/clangd/issues/302 (again)

Reviewers: kadircet

Subscribers: ilya-biryukov, MaskRay, jkorous, arphaman, usaxena95, cfe-commits

Tags: #clang

Differential Revision: https://reviews.llvm.org/D78848
This commit is contained in:
Sam McCall 2020-04-25 03:03:01 +02:00
parent 7d57d22baa
commit 6d7637dc46
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clang-tools-extra/clangd/ParsedAST.cpp
View File

@ -256,6 +256,9 @@ ParsedAST::build(llvm::StringRef Version,
// Recovery expression currently only works for C++. // Recovery expression currently only works for C++.
if (CI->getLangOpts()->CPlusPlus) if (CI->getLangOpts()->CPlusPlus)
CI->getLangOpts()->RecoveryAST = Opts.BuildRecoveryAST; CI->getLangOpts()->RecoveryAST = Opts.BuildRecoveryAST;
// This is on-by-default in windows to allow parsing SDK headers, but it
// breaks many features. Disable it for the main-file (not preamble).
CI->getLangOpts()->DelayedTemplateParsing = false;
StoreDiags ASTDiags; StoreDiags ASTDiags;
std::string Content = std::string(Buffer->getBuffer()); std::string Content = std::string(Buffer->getBuffer());

11
clang-tools-extra/clangd/unittests/ParsedASTTests.cpp
View File

@ -175,6 +175,17 @@ TEST(ParsedASTTest,
AllOf(DeclNamed("foo"), WithTemplateArgs("<bool>"))})); AllOf(DeclNamed("foo"), WithTemplateArgs("<bool>"))}));
} }
TEST(ParsedASTTest, IgnoresDelayedTemplateParsing) {
auto TU = TestTU::withCode(R"cpp(
template <typename T> void xxx() {
int yyy = 0;
}
)cpp");
TU.ExtraArgs.push_back("-fdelayed-template-parsing");
auto AST = TU.build();
EXPECT_EQ(Decl::Var, findUnqualifiedDecl(AST, "yyy").getKind());
}
TEST(ParsedASTTest, TokensAfterPreamble) { TEST(ParsedASTTest, TokensAfterPreamble) {
TestTU TU; TestTU TU;
TU.AdditionalFiles["foo.h"] = R"( TU.AdditionalFiles["foo.h"] = R"(