Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2024-12-03 19:32:35 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Revert "Revert "[Tooling/Inclusion] Handle std::get symbol.""

Browse Source 
This reverts commit 7c9b15fbae. Breakage
was in downstream code.
This commit is contained in:
Kadir Cetinkaya 2023-02-24 01:05:15 +01:00
parent 22cd105a66
commit 5a623c2a08
No known key found for this signature in database
GPG Key ID: E39E36B8D2057ED6
5 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clang-tools-extra/clangd/index/CanonicalIncludes.cpp
View File

@ -717,7 +717,8 @@ llvm::StringRef CanonicalIncludes::mapSymbol(llvm::StringRef Scope,
if (Scope == "std::" && Name == "move")
return "<utility>";
if (auto StdSym = tooling::stdlib::Symbol::named(Scope, Name, Lang))
return StdSym->header().name();
if (auto Header = StdSym->header())
return Header->name();
return "";
}

2
clang/include/clang/Tooling/Inclusions/StandardLibrary.h
View File

@ -81,7 +81,7 @@ public:
llvm::StringRef name() const;
llvm::StringRef qualifiedName() const;
// The preferred header for this symbol (e.g. the suggested insertion).
Header header() const;
std::optional<Header> header() const;
// Some symbols may be provided by multiple headers.
llvm::SmallVector<Header> headers() const;

11
clang/lib/Tooling/Inclusions/Stdlib/StandardLibrary.cpp
View File

@ -14,6 +14,7 @@
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/Support/Casting.h"
#include <optional>
namespace clang {
namespace tooling {
@ -120,7 +121,8 @@ static int initialize(Lang Language) {
}
Mapping->SymbolNames[SymIndex] = {
QName.data(), NSLen, static_cast<unsigned int>(QName.size() - NSLen)};
Mapping->SymbolHeaderIDs[SymIndex].push_back(AddHeader(HeaderName));
if (!HeaderName.empty())
Mapping->SymbolHeaderIDs[SymIndex].push_back(AddHeader(HeaderName));
NSSymbolMap &NSSymbols = AddNS(QName.take_front(NSLen));
NSSymbols.try_emplace(QName.drop_front(NSLen), SymIndex);
@ -205,8 +207,11 @@ std::optional<Symbol> Symbol::named(llvm::StringRef Scope, llvm::StringRef Name,
}
return std::nullopt;
}
Header Symbol::header() const {
return Header(getMappingPerLang(Language)->SymbolHeaderIDs[ID][0], Language);
std::optional<Header> Symbol::header() const {
const auto& Headers = getMappingPerLang(Language)->SymbolHeaderIDs[ID];
if (Headers.empty())
return std::nullopt;
return Header(Headers.front(), Language);
}
llvm::SmallVector<Header> Symbol::headers() const {
llvm::SmallVector<Header> Results;

5
clang/lib/Tooling/Inclusions/Stdlib/StdSpecialSymbolMap.inc
View File

@ -218,3 +218,8 @@ SYMBOL(ssize, std::, <string_view>)
SYMBOL(ssize, std::, <unordered_map>)
SYMBOL(ssize, std::, <unordered_set>)
SYMBOL(ssize, std::, <vector>)
// std::get has a few variants for different types (tuple, array, pair etc)
// which is tricky to disambiguate without type information.
// Don't set any header for it, as it comes with the type header.
SYMBOL(get, std::, /*no headers*/)

3
clang/unittests/Tooling/StandardLibraryTest.cpp
View File

@ -58,6 +58,9 @@ TEST(StdlibTest, All) {
EXPECT_EQ(Vector->header(), *VectorH);
EXPECT_THAT(Vector->headers(), ElementsAre(*VectorH));
EXPECT_TRUE(stdlib::Symbol::named("std::", "get"));
EXPECT_FALSE(stdlib::Symbol::named("std::", "get")->header());
EXPECT_THAT(stdlib::Symbol::named("std::", "basic_iostream")->headers(),
ElementsAre(stdlib::Header::named("<istream>"),
stdlib::Header::named("<iostream>"),