This is an archive of the discontinued LLVM Phabricator instance.

Differential D66378

[clang-doc] Fix casting not working in gcc 5.4.0
ClosedPublic

Authored by DiegoAstiazaran on Aug 16 2019, 6:43 PM.

Details

Reviewers
None
Commits
rGee6700f69766: [clang-doc] Fix casting not working in gcc 5.4.0
rCTE369182: [clang-doc] Fix casting not working in gcc 5.4.0
rL369182: [clang-doc] Fix casting not working in gcc 5.4.0
Summary

An implicit cast of std::string to llvm::SmallString<> was breaking GCC 5.4.0 builder.
A pair using llvm::SmallString<> now uses std::string.

Diff Detail

Repository
rL LLVM

Event Timeline

DiegoAstiazaran created this revision.Aug 16 2019, 6:43 PM
This revision was not accepted when it landed; it landed in state Needs Review.Aug 16 2019, 6:45 PM
Closed by commit rL369182: [clang-doc] Fix casting not working in gcc 5.4.0 (authored by DiegoAstiazaran). · Explain Why
This revision was automatically updated to reflect the committed changes.
Herald added a project: Restricted Project. · View Herald TranscriptAug 16 2019, 6:45 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
juliehockett added a subscriber: juliehockett.Aug 16 2019, 6:46 PM

LGTM, for posterity

Revision Contents

PathSize
clang-tools-extra/
trunk/
clang-doc/
8 lines

Diff 215732

clang-tools-extra/trunk/clang-doc/HTMLGenerator.cpp

Show First 20 Lines • Show All 83 Lines • ▼ Show 20 Lines
struct TagNode : public HTMLNode { struct TagNode : public HTMLNode {
TagNode(HTMLTag Tag) : HTMLNode(NodeType::NODE_TAG), Tag(Tag) {} TagNode(HTMLTag Tag) : HTMLNode(NodeType::NODE_TAG), Tag(Tag) {}
TagNode(HTMLTag Tag, const Twine &Text) : TagNode(Tag) { TagNode(HTMLTag Tag, const Twine &Text) : TagNode(Tag) {
Children.emplace_back(std::make_unique<TextNode>(Text.str())); Children.emplace_back(std::make_unique<TextNode>(Text.str()));
} }
HTMLTag Tag; // Name of HTML Tag (p, div, h1) HTMLTag Tag; // Name of HTML Tag (p, div, h1)
std::vector<std::unique_ptr<HTMLNode>> Children; // List of child nodes std::vector<std::unique_ptr<HTMLNode>> Children; // List of child nodes
std::vector<std::pair<llvm::SmallString<16>, llvm::SmallString<16>>> std::vector<std::pair<std::string, std::string>>
Attributes; // List of key-value attributes for tag Attributes; // List of key-value attributes for tag
void Render(llvm::raw_ostream &OS, int IndentationLevel) override; void Render(llvm::raw_ostream &OS, int IndentationLevel) override;
}; };
constexpr const char *kDoctypeDecl = "<!DOCTYPE html>"; constexpr const char *kDoctypeDecl = "<!DOCTYPE html>";
struct HTMLFile { struct HTMLFile {
▲ Show 20 Lines • Show All 172 Lines • ▼ Show 20 LinesgenStylesheetsHTML(StringRef InfoPath, const ClangDocContext &CDCtx) {
for (const auto &FilePath : CDCtx.UserStylesheets) { for (const auto &FilePath : CDCtx.UserStylesheets) {
auto LinkNode = std::make_unique<TagNode>(HTMLTag::TAG_LINK); auto LinkNode = std::make_unique<TagNode>(HTMLTag::TAG_LINK);
LinkNode->Attributes.emplace_back("rel", "stylesheet"); LinkNode->Attributes.emplace_back("rel", "stylesheet");
SmallString<128> StylesheetPath = computeRelativePath("", InfoPath); SmallString<128> StylesheetPath = computeRelativePath("", InfoPath);
llvm::sys::path::append(StylesheetPath, llvm::sys::path::append(StylesheetPath,
llvm::sys::path::filename(FilePath)); llvm::sys::path::filename(FilePath));
// Paths in HTML must be in posix-style // Paths in HTML must be in posix-style
llvm::sys::path::native(StylesheetPath, llvm::sys::path::Style::posix); llvm::sys::path::native(StylesheetPath, llvm::sys::path::Style::posix);
LinkNode->Attributes.emplace_back("href", StylesheetPath); LinkNode->Attributes.emplace_back("href", StylesheetPath.str());
Out.emplace_back(std::move(LinkNode)); Out.emplace_back(std::move(LinkNode));
} }
return Out; return Out;
} }
static std::vector<std::unique_ptr<TagNode>> static std::vector<std::unique_ptr<TagNode>>
genJsScriptsHTML(StringRef InfoPath, const ClangDocContext &CDCtx) { genJsScriptsHTML(StringRef InfoPath, const ClangDocContext &CDCtx) {
std::vector<std::unique_ptr<TagNode>> Out; std::vector<std::unique_ptr<TagNode>> Out;
for (const auto &FilePath : CDCtx.JsScripts) { for (const auto &FilePath : CDCtx.JsScripts) {
auto ScriptNode = std::make_unique<TagNode>(HTMLTag::TAG_SCRIPT); auto ScriptNode = std::make_unique<TagNode>(HTMLTag::TAG_SCRIPT);
SmallString<128> ScriptPath = computeRelativePath("", InfoPath); SmallString<128> ScriptPath = computeRelativePath("", InfoPath);
llvm::sys::path::append(ScriptPath, llvm::sys::path::filename(FilePath)); llvm::sys::path::append(ScriptPath, llvm::sys::path::filename(FilePath));
// Paths in HTML must be in posix-style // Paths in HTML must be in posix-style
llvm::sys::path::native(ScriptPath, llvm::sys::path::Style::posix); llvm::sys::path::native(ScriptPath, llvm::sys::path::Style::posix);
ScriptNode->Attributes.emplace_back("src", ScriptPath); ScriptNode->Attributes.emplace_back("src", ScriptPath.str());
Out.emplace_back(std::move(ScriptNode)); Out.emplace_back(std::move(ScriptNode));
} }
return Out; return Out;
} }
static std::unique_ptr<TagNode> genLink(const Twine &Text, const Twine &Link) { static std::unique_ptr<TagNode> genLink(const Twine &Text, const Twine &Link) {
auto LinkNode = std::make_unique<TagNode>(HTMLTag::TAG_A, Text); auto LinkNode = std::make_unique<TagNode>(HTMLTag::TAG_A, Text);
LinkNode->Attributes.emplace_back("href", Link.str()); LinkNode->Attributes.emplace_back("href", Link.str());
▲ Show 20 Lines • Show All 144 Lines • ▼ Show 20 LineswriteFileDefinition(const Location &L,
// The links to a specific line in the source code use the github / // The links to a specific line in the source code use the github /
// googlesource notation so it won't work for all hosting pages. // googlesource notation so it won't work for all hosting pages.
LocNumberNode->Attributes.emplace_back( LocNumberNode->Attributes.emplace_back(
"href", (FileURL + "#" + std::to_string(L.LineNumber)).str()); "href", (FileURL + "#" + std::to_string(L.LineNumber)).str());
Node->Children.emplace_back(std::move(LocNumberNode)); Node->Children.emplace_back(std::move(LocNumberNode));
Node->Children.emplace_back(std::make_unique<TextNode>(" of file ")); Node->Children.emplace_back(std::make_unique<TextNode>(" of file "));
auto LocFileNode = std::make_unique<TagNode>( auto LocFileNode = std::make_unique<TagNode>(
HTMLTag::TAG_A, llvm::sys::path::filename(FileURL)); HTMLTag::TAG_A, llvm::sys::path::filename(FileURL));
LocFileNode->Attributes.emplace_back("href", FileURL); LocFileNode->Attributes.emplace_back("href", FileURL.str());
Node->Children.emplace_back(std::move(LocFileNode)); Node->Children.emplace_back(std::move(LocFileNode));
return Node; return Node;
} }
static std::vector<std::unique_ptr<TagNode>> static std::vector<std::unique_ptr<TagNode>>
genHTML(const Index &Index, StringRef InfoPath, bool IsOutermostList); genHTML(const Index &Index, StringRef InfoPath, bool IsOutermostList);
// Generates a list of child nodes for the HTML head tag // Generates a list of child nodes for the HTML head tag
▲ Show 20 Lines • Show All 536 Lines • Show Last 20 Lines