This is an archive of the discontinued LLVM Phabricator instance.

Differential D62527

[clangd] Remove the whitelist std symbols in CanonicalIncludes.
ClosedPublic

Authored by hokein on May 28 2019, 7:38 AM.

Details

Reviewers
sammccall
Commits
rG4c5a0d1683e1: [clangd] Remove the whitelist std symbols in CanonicalIncludes.
rL361952: [clangd] Remove the whitelist std symbols in CanonicalIncludes.
rCTE361952: [clangd] Remove the whitelist std symbols in CanonicalIncludes.
Summary

These symbols have been included via StdSymbolMap.inc.

Diff Detail

Event Timeline

hokein created this revision.May 28 2019, 7:38 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 28 2019, 7:38 AM
Herald added subscribers: kadircet, arphaman, jkorous and 2 others. · View Herald Transcript
Harbormaster completed remote builds in B32564: Diff 201668.May 28 2019, 7:40 AM
sammccall accepted this revision.May 29 2019, 3:31 AM
This revision is now accepted and ready to land.May 29 2019, 3:31 AM
hokein updated this revision to Diff 201869.May 29 2019, 5:03 AM

Remove more symbols.

Harbormaster completed remote builds in B32609: Diff 201869.May 29 2019, 5:04 AM
Closed by commit rCTE361952: [clangd] Remove the whitelist std symbols in CanonicalIncludes. (authored by hokein). · Explain WhyMay 29 2019, 5:09 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
clang-tools-extra/
clangd/
index/
12 lines

Diff 201668

clang-tools-extra/clangd/index/CanonicalIncludes.cpp

Show First 20 Lines • Show All 82 Lines • ▼ Show 20 LinescollectIWYUHeaderMaps(CanonicalIncludes *Includes) {
private: private:
CanonicalIncludes *const Includes; CanonicalIncludes *const Includes;
}; };
return llvm::make_unique<PragmaCommentHandler>(Includes); return llvm::make_unique<PragmaCommentHandler>(Includes);
} }
void addSystemHeadersMapping(CanonicalIncludes *Includes) { void addSystemHeadersMapping(CanonicalIncludes *Includes) {
static const std::vector<std::pair<const char *, const char *>> SymbolMap = { static const std::vector<std::pair<const char *, const char *>> SymbolMap = {
// Map symbols in <iosfwd> to their preferred includes.
{"std::basic_filebuf", "<fstream>"},
{"std::filebuf", "<fstream>"},
{"std::wfilebuf", "<fstream>"},
{"std::basic_istream", "<istream>"},
{"std::istream", "<istream>"},
{"std::wistream", "<istream>"},
{"std::basic_ostream", "<ostream>"},
{"std::ostream", "<ostream>"},
{"std::wostream", "<ostream>"},
{"std::uint_least16_t", "<cstdint>"}, // <type_traits> redeclares these {"std::uint_least16_t", "<cstdint>"}, // <type_traits> redeclares these
{"std::uint_least32_t", "<cstdint>"}, {"std::uint_least32_t", "<cstdint>"},
#define SYMBOL(Name, NameSpace, Header) { #NameSpace#Name, #Header }, #define SYMBOL(Name, NameSpace, Header) { #NameSpace#Name, #Header },
#include "StdSymbolMap.inc" #include "StdSymbolMap.inc"
#undef SYMBOL #undef SYMBOL
}; };
for (const auto &Pair : SymbolMap) for (const auto &Pair : SymbolMap)
Includes->addSymbolMapping(Pair.first, Pair.second); Includes->addSymbolMapping(Pair.first, Pair.second);
// FIXME: remove the std header mapping once we support ambiguous symbols, now // FIXME: remove the std header mapping once we support ambiguous symbols, now
// it serves as a fallback to disambiguate: // it serves as a fallback to disambiguate:
// - symbols with mulitiple headers (e.g. std::move) // - symbols with mulitiple headers (e.g. std::move)
// - symbols with a primary template in one header and a specialization in
// another (std::abs)
static const std::vector<std::pair<const char *, const char *>> static const std::vector<std::pair<const char *, const char *>>
SystemHeaderMap = { SystemHeaderMap = {
{"include/__stddef_max_align_t.h", "<cstddef>"}, {"include/__stddef_max_align_t.h", "<cstddef>"},
{"include/__wmmintrin_aes.h", "<wmmintrin.h>"}, {"include/__wmmintrin_aes.h", "<wmmintrin.h>"},
{"include/__wmmintrin_pclmul.h", "<wmmintrin.h>"}, {"include/__wmmintrin_pclmul.h", "<wmmintrin.h>"},
{"include/adxintrin.h", "<immintrin.h>"}, {"include/adxintrin.h", "<immintrin.h>"},
{"include/ammintrin.h", "<ammintrin.h>"}, {"include/ammintrin.h", "<ammintrin.h>"},
{"include/avx2intrin.h", "<immintrin.h>"}, {"include/avx2intrin.h", "<immintrin.h>"},
▲ Show 20 Lines • Show All 652 Lines • Show Last 20 Lines