kadircet updated this revision to Diff 495891.
kadircet marked 3 inline comments as done.
kadircet added a comment.
- Use raw strings
- Rebase
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D143093/new/
https://reviews.llvm.org/D143093
Files:
clang-tools-extra/clangd/Preamble.cpp
clang-tools-extra/clangd/unittests/PreambleTests.cpp
Index: clang-tools-extra/clangd/unittests/PreambleTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/PreambleTests.cpp
+++ clang-tools-extra/clangd/unittests/PreambleTests.cpp
@@ -289,6 +289,7 @@
#define BAR
[[BAR]])cpp",
R"cpp(#line 0 ".*main.cpp"
+#undef BAR
#line 2
#define BAR
)cpp",
@@ -300,6 +301,7 @@
[[BAR]])cpp",
R"cpp(#line 0 ".*main.cpp"
+#undef BAR
#line 2
#define BAR
)cpp",
@@ -311,6 +313,7 @@
BAR
[[BAR]])cpp",
R"cpp(#line 0 ".*main.cpp"
+#undef BAR
#line 3
#define BAR
)cpp",
@@ -343,8 +346,10 @@
)cpp");
llvm::StringLiteral ExpectedPatch(R"cpp(#line 0 ".*main.cpp"
+#undef BAR
#line 2
#define BAR\(X, Y\) X Y
+#undef BAR
#line 3
#define BAR\(X\) X
)cpp");
@@ -694,23 +699,17 @@
{
Annotations Code("#define [[FOO]] 1\n");
// Check ranges for notes.
- Annotations NewCode(R"(#define $barxyz[[BARXYZ]] 1
+ Annotations NewCode(R"(#define BARXYZ 1
#define $foo1[[FOO]] 1
void foo();
#define $foo2[[FOO]] 2)");
auto AST = createPatchedAST(Code.code(), NewCode.code(), AdditionalFiles);
EXPECT_THAT(
*AST->getDiagnostics(),
- ElementsAre(
- // FIXME: This diagnostics shouldn't exist. It's emitted from the
- // preamble patch to the stale location inside preamble.
- AllOf(Field(&Diag::Name, Eq("-Wmacro-redefined")),
- Field(&Diag::File, HasSubstr("_preamble_patch_")),
- withNote(Diag(NewCode.range("barxyz")))),
- AllOf(
- Diag(NewCode.range("foo2"), "-Wmacro-redefined"),
- // FIXME: This should be translated into main file.
- withNote(Field(&Note::File, HasSubstr("_preamble_patch_"))))));
+ ElementsAre(AllOf(
+ Diag(NewCode.range("foo2"), "-Wmacro-redefined"),
+ // FIXME: This should be translated into main file.
+ withNote(Field(&Note::File, HasSubstr("_preamble_patch_"))))));
}
}
Index: clang-tools-extra/clangd/Preamble.cpp
===================================================================
--- clang-tools-extra/clangd/Preamble.cpp
+++ clang-tools-extra/clangd/Preamble.cpp
@@ -213,6 +213,9 @@
// Full text that's representing the directive, including the `#`.
std::string Text;
unsigned Offset;
+ tok::PPKeywordKind Directive = tok::PPKeywordKind::pp_not_keyword;
+ // Name of the macro being defined in the case of a #define directive.
+ std::string MacroName;
bool operator==(const TextualPPDirective &RHS) const {
return std::tie(DirectiveLine, Offset, Text) ==
@@ -283,6 +286,8 @@
return;
TextualDirectives.emplace_back();
TextualPPDirective &TD = TextualDirectives.back();
+ TD.Directive = tok::pp_define;
+ TD.MacroName = MacroNameTok.getIdentifierInfo()->getName().str();
const auto *MI = MD->getMacroInfo();
TD.Text =
@@ -560,8 +565,8 @@
if (BuiltPreamble) {
log("Built preamble of size {0} for file {1} version {2} in {3} seconds",
- BuiltPreamble->getSize(), FileName, Inputs.Version,
- PreambleTimer.getTime());
+ BuiltPreamble->getSize(), FileName, Inputs.Version,
+ PreambleTimer.getTime());
std::vector<Diag> Diags = PreambleDiagnostics.take();
auto Result = std::make_shared<PreambleData>(std::move(*BuiltPreamble));
Result->Version = Inputs.Version;
@@ -724,6 +729,10 @@
// reduce complexity. The former might cause problems because scanning is
// imprecise and might pick directives from disabled regions.
for (const auto &TD : ModifiedScan->TextualDirectives) {
+ // Introduce an #undef directive before #defines to suppress any
+ // re-definition warnings.
+ if (TD.Directive == tok::pp_define)
+ Patch << "#undef " << TD.MacroName << '\n';
Patch << "#line " << TD.DirectiveLine << '\n';
Patch << TD.Text << '\n';
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
