mnauw updated this revision to Diff 258292.
mnauw added a comment.
As suggested, existing (YAML) Serialization test has been extended.
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D77938/new/
https://reviews.llvm.org/D77938
Files:
clang-tools-extra/clangd/index/YAMLSerialization.cpp
clang-tools-extra/clangd/unittests/SerializationTests.cpp
Index: clang-tools-extra/clangd/unittests/SerializationTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/SerializationTests.cpp
+++ clang-tools-extra/clangd/unittests/SerializationTests.cpp
@@ -16,6 +16,7 @@
using ::testing::_;
using ::testing::AllOf;
+using ::testing::ElementsAre;
using ::testing::Pair;
using ::testing::UnorderedElementsAre;
using ::testing::UnorderedElementsAreArray;
@@ -91,6 +92,20 @@
Object:
ID: 6512AEC512EA3A2D
...
+--- !Cmd
+Directory: 'testdir'
+CommandLine:
+ - 'cmd1'
+ - 'cmd2'
+...
+--- !Source
+URI: 'file:///path/source1.cpp'
+Flags: 1
+Digest: EED8F5EAF25C453C
+DirectIncludes:
+ - 'file:///path/inc1.h'
+ - 'file:///path/inc2.h'
+...
)";
MATCHER_P(ID, I, "") { return arg.ID == cantFail(SymbolID::fromStr(I)); }
@@ -155,6 +170,21 @@
EXPECT_THAT(
*ParsedYAML->Relations,
UnorderedElementsAre(Relation{Base, RelationKind::BaseOf, Derived}));
+
+ ASSERT_TRUE(bool(ParsedYAML->Cmd));
+ auto &Cmd = *ParsedYAML->Cmd;
+ ASSERT_EQ(Cmd.Directory, "testdir");
+ EXPECT_THAT(Cmd.CommandLine, ElementsAre("cmd1", "cmd2"));
+
+ ASSERT_TRUE(bool(ParsedYAML->Sources));
+ const auto *URI = "file:///path/source1.cpp";
+ ASSERT_TRUE(ParsedYAML->Sources->count(URI));
+ auto IGNDeserialized = ParsedYAML->Sources->lookup(URI);
+ EXPECT_EQ(llvm::toHex(IGNDeserialized.Digest), "EED8F5EAF25C453C");
+ EXPECT_THAT(IGNDeserialized.DirectIncludes,
+ ElementsAre("file:///path/inc1.h", "file:///path/inc2.h"));
+ EXPECT_EQ(IGNDeserialized.URI, URI);
+ EXPECT_EQ(IGNDeserialized.Flags, IncludeGraphNode::SourceFlag(1));
}
std::vector<std::string> YAMLFromSymbols(const SymbolSlab &Slab) {
Index: clang-tools-extra/clangd/index/YAMLSerialization.cpp
===================================================================
--- clang-tools-extra/clangd/index/YAMLSerialization.cpp
+++ clang-tools-extra/clangd/index/YAMLSerialization.cpp
@@ -41,6 +41,8 @@
llvm::Optional<clang::clangd::Symbol> Symbol;
llvm::Optional<RefBundle> Refs;
llvm::Optional<clang::clangd::Relation> Relation;
+ llvm::Optional<clang::clangd::IncludeGraphNode> Source;
+ llvm::Optional<clang::tooling::CompileCommand> Cmd;
};
// A class helps YAML to serialize the 32-bit encoded position (Line&Column),
// as YAMLIO can't directly map bitfields.
@@ -49,10 +51,16 @@
uint32_t Column;
};
+// avoid ODR violation of specialization for non-owned CompileCommand
+struct CompileCommandYAML : clang::tooling::CompileCommand {};
+
} // namespace
namespace llvm {
namespace yaml {
+using clang::clangd::FileDigest;
+using clang::clangd::IncludeGraph;
+using clang::clangd::IncludeGraphNode;
using clang::clangd::Ref;
using clang::clangd::RefKind;
using clang::clangd::Relation;
@@ -65,6 +73,7 @@
using clang::index::SymbolKind;
using clang::index::SymbolLanguage;
using clang::index::SymbolRole;
+using clang::tooling::CompileCommand;
// Helper to (de)serialize the SymbolID. We serialize it as a hex string.
struct NormalizedSymbolID {
@@ -308,6 +317,59 @@
}
};
+struct NormalizedSourceFlag {
+ NormalizedSourceFlag(IO &) {}
+ NormalizedSourceFlag(IO &, IncludeGraphNode::SourceFlag O) {
+ Flag = static_cast<uint8_t>(O);
+ }
+
+ IncludeGraphNode::SourceFlag denormalize(IO &) {
+ return static_cast<IncludeGraphNode::SourceFlag>(Flag);
+ }
+
+ uint8_t Flag = 0;
+};
+
+struct NormalizedFileDigest {
+ NormalizedFileDigest(IO &) {}
+ NormalizedFileDigest(IO &, const FileDigest &Digest) {
+ HexString = llvm::toHex(Digest);
+ }
+
+ FileDigest denormalize(IO &I) {
+ FileDigest Digest;
+ if (HexString.size() == Digest.size() * 2 &&
+ llvm::all_of(HexString, llvm::isHexDigit)) {
+ memcpy(Digest.data(), llvm::fromHex(HexString).data(), Digest.size());
+ } else {
+ I.setError(std::string("Bad hex file digest: ") + HexString);
+ }
+ return Digest;
+ }
+
+ std::string HexString;
+};
+
+template <> struct MappingTraits<IncludeGraphNode> {
+ static void mapping(IO &IO, IncludeGraphNode &Node) {
+ IO.mapRequired("URI", Node.URI);
+ MappingNormalization<NormalizedSourceFlag, IncludeGraphNode::SourceFlag>
+ NSourceFlag(IO, Node.Flags);
+ IO.mapRequired("Flags", NSourceFlag->Flag);
+ MappingNormalization<NormalizedFileDigest, FileDigest> NDigest(IO,
+ Node.Digest);
+ IO.mapRequired("Digest", NDigest->HexString);
+ IO.mapRequired("DirectIncludes", Node.DirectIncludes);
+ }
+};
+
+template <> struct MappingTraits<CompileCommandYAML> {
+ static void mapping(IO &IO, CompileCommandYAML &Cmd) {
+ IO.mapRequired("Directory", Cmd.Directory);
+ IO.mapRequired("CommandLine", Cmd.CommandLine);
+ }
+};
+
template <> struct MappingTraits<VariantEntry> {
static void mapping(IO &IO, VariantEntry &Variant) {
if (IO.mapTag("!Symbol", Variant.Symbol.hasValue())) {
@@ -322,6 +384,15 @@
if (!IO.outputting())
Variant.Relation.emplace();
MappingTraits<Relation>::mapping(IO, *Variant.Relation);
+ } else if (IO.mapTag("!Source", Variant.Source.hasValue())) {
+ if (!IO.outputting())
+ Variant.Source.emplace();
+ MappingTraits<IncludeGraphNode>::mapping(IO, *Variant.Source);
+ } else if (IO.mapTag("!Cmd", Variant.Cmd.hasValue())) {
+ if (!IO.outputting())
+ Variant.Cmd.emplace();
+ MappingTraits<CompileCommandYAML>::mapping(
+ IO, static_cast<CompileCommandYAML &>(*Variant.Cmd));
}
}
};
@@ -351,6 +422,18 @@
Entry.Relation = R;
Yout << Entry;
}
+ if (O.Sources) {
+ for (const auto &Source : *O.Sources) {
+ VariantEntry Entry;
+ Entry.Source = Source.getValue();
+ Yout << Entry;
+ }
+ }
+ if (O.Cmd) {
+ VariantEntry Entry;
+ Entry.Cmd = *O.Cmd;
+ Yout << Entry;
+ }
}
llvm::Expected<IndexFileIn> readYAML(llvm::StringRef Data) {
@@ -361,6 +444,8 @@
Arena; // store the underlying data of Position::FileURI.
llvm::UniqueStringSaver Strings(Arena);
llvm::yaml::Input Yin(Data, &Strings);
+ IncludeGraph Sources;
+ llvm::Optional<tooling::CompileCommand> Cmd;
while (Yin.setCurrentDocument()) {
llvm::yaml::EmptyContext Ctx;
VariantEntry Variant;
@@ -375,6 +460,17 @@
Refs.insert(Variant.Refs->first, Ref);
if (Variant.Relation)
Relations.insert(*Variant.Relation);
+ if (Variant.Source) {
+ auto &IGN = Variant.Source.getValue();
+ auto Entry = Sources.try_emplace(IGN.URI).first;
+ Entry->getValue() = std::move(IGN);
+ // Fixup refs to refer to map keys which will live on
+ Entry->getValue().URI = Entry->getKey();
+ for (auto &Include : Entry->getValue().DirectIncludes)
+ Include = Sources.try_emplace(Include).first->getKey();
+ }
+ if (Variant.Cmd)
+ Cmd = *Variant.Cmd;
Yin.nextDocument();
}
@@ -382,6 +478,9 @@
Result.Symbols.emplace(std::move(Symbols).build());
Result.Refs.emplace(std::move(Refs).build());
Result.Relations.emplace(std::move(Relations).build());
+ if (Sources.size())
+ Result.Sources = std::move(Sources);
+ Result.Cmd = std::move(Cmd);
return std::move(Result);
}
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
