intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-17 14:48:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Lex] Consider a PCH header-guarded even with #endif truncated

Browse Source 
This seems to be a more useful behavior for tools that use preambles.
I believe it doesn't affect real compiles: the PCH is only included once
when used, and recursive inclusion of the main-file *within* the PCH
isn't supported in any case.

Differential Revision: https://reviews.llvm.org/D106204
This commit is contained in:
Sam McCall
2021-07-17 02:23:51 +02:00
parent eb03fa1d2c
commit fd22785054
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -667,7 +667,7 @@ TEST(ParsedASTTest, HeaderGuards) {
EXPECT_FALSE(mainIsGuarded(TU.build()));
TU.Code = guard(";");
EXPECT_FALSE(mainIsGuarded(TU.build())); // FIXME: true
EXPECT_TRUE(mainIsGuarded(TU.build()));
TU.Code = once(";");
EXPECT_TRUE(mainIsGuarded(TU.build()));
@@ -768,7 +768,7 @@ TEST(ParsedASTTest, HeaderGuardsSelfInclude) {
)cpp";
AST = TU.build();
EXPECT_THAT(*AST.getDiagnostics(), IsEmpty());
EXPECT_FALSE(mainIsGuarded(AST)); // FIXME: true
EXPECT_TRUE(mainIsGuarded(AST));
// Guarded too late...
TU.Code = R"cpp(
@@ -858,7 +858,7 @@ TEST(ParsedASTTest, HeaderGuardsImplIface) {
TU.AdditionalFiles = {{"impl.h", Implementation}};
auto AST = TU.build();
EXPECT_THAT(*AST.getDiagnostics(), IsEmpty());
EXPECT_FALSE(mainIsGuarded(AST)); // FIXME: true
EXPECT_TRUE(mainIsGuarded(AST));
// Slightly harder: the `#pragma once` is part of the preamble, and we
// need to transfer it to the main file's HeaderFileInfo.
TU.Code = once(Interface);

5
clang/lib/Lex/Lexer.cpp
View File

@@ -2793,6 +2793,11 @@ bool Lexer::LexEndOfFile(Token &Result, const char *CurPtr) {
if (PP->isRecordingPreamble() && PP->isInPrimaryFile()) {
PP->setRecordedPreambleConditionalStack(ConditionalStack);
// If the preamble cuts off the end of a header guard, consider it guarded.
// The guard is valid for the preamble content itself, and for tools the
// most useful answer is "yes, this file has a header guard".
if (!ConditionalStack.empty())
MIOpt.ExitTopLevelConditional();
ConditionalStack.clear();
}