<div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Tue, Oct 27, 2020 at 9:52 PM Maxim Kazantsev <<a href="mailto:mkazantsev@azul.com">mkazantsev@azul.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<div lang="RU" style="overflow-wrap: break-word;">
<div class="gmail-m_4413417669672404353WordSection1">
<p class="MsoNormal"><span lang="EN-US">Hi,<u></u><u></u></span></p>
<p class="MsoNormal"><span lang="EN-US"><u></u> <u></u></span></p>
<p class="MsoNormal"><span lang="EN-US">I have reverted this patch because `make check` build was broken (I guess some unit test wasn’t updated and could not compile).</span></p></div></div></blockquote><div><br></div><div>It'd be handy to have a bit more info - like what platform/configuration/etc - a link to a buildbot + quote from a buildbot would be ideal, since that carries a lot more information about the configuration.<br><br>If "make check" was broken generally, it would fail on a lot of buildbots/for a lot of people and likely come up sooner than one personal config - so it may be something novel/interesting in your configuration that is interesting/necessary to reproduce the issue.</div><div> <br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div lang="RU" style="overflow-wrap: break-word;"><div class="gmail-m_4413417669672404353WordSection1"><p class="MsoNormal"><span lang="EN-US"><u></u><u></u></span></p>
<p class="MsoNormal"><span lang="EN-US"><u></u> <u></u></span></p>
<p class="MsoNormal"><span lang="EN-US">--Max<u></u><u></u></span></p>
<p class="MsoNormal"><span lang="EN-US"><u></u> <u></u></span></p>
<div style="border-right:none;border-bottom:none;border-left:none;border-top:1pt solid rgb(225,225,225);padding:3pt 0cm 0cm">
<p class="MsoNormal"><b>From:</b> David Blaikie <<a href="mailto:dblaikie@gmail.com" target="_blank">dblaikie@gmail.com</a>> <br>
<b>Sent:</b> Wednesday, October 28, 2020 3:18 AM<br>
<b>To:</b> Jonas Devlieghere <<a href="mailto:jonas@devlieghere.com" target="_blank">jonas@devlieghere.com</a>>; Jonas Devlieghere <<a href="mailto:llvmlistbot@llvm.org" target="_blank">llvmlistbot@llvm.org</a>>; Maxim Kazantsev <<a href="mailto:mkazantsev@azul.com" target="_blank">mkazantsev@azul.com</a>><br>
<b>Cc:</b> llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>><br>
<b>Subject:</b> Re: [llvm] 3fce5ea - [DWARFLinker] Capitalize type names (NFC)<u></u><u></u></p>
</div>
<p class="MsoNormal"><u></u> <u></u></p>
<div>
<p class="MsoNormal">Looks like this got reverted in 113ad90a3422602021beaad81591af370dfae878 - not clear from the commit what exactly broke, but was there follow-up/did this end up getting fixed/recommitted?<u></u><u></u></p>
</div>
<p class="MsoNormal"><u></u> <u></u></p>
<div>
<div>
<p class="MsoNormal">On Thu, Oct 22, 2020 at 12:18 AM Jonas Devlieghere via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>> wrote:<u></u><u></u></p>
</div>
<blockquote style="border-top:none;border-right:none;border-bottom:none;border-left:1pt solid rgb(204,204,204);padding:0cm 0cm 0cm 6pt;margin-left:4.8pt;margin-right:0cm">
<p class="MsoNormal"><br>
Author: Jonas Devlieghere<br>
Date: 2020-10-22T00:18:07-07:00<br>
New Revision: 3fce5ea7ce663410d3fb533528158bdab3a3604e<br>
<br>
URL: <a href="https://github.com/llvm/llvm-project/commit/3fce5ea7ce663410d3fb533528158bdab3a3604e" target="_blank">
https://github.com/llvm/llvm-project/commit/3fce5ea7ce663410d3fb533528158bdab3a3604e</a><br>
DIFF: <a href="https://github.com/llvm/llvm-project/commit/3fce5ea7ce663410d3fb533528158bdab3a3604e.diff" target="_blank">
https://github.com/llvm/llvm-project/commit/3fce5ea7ce663410d3fb533528158bdab3a3604e.diff</a><br>
<br>
LOG: [DWARFLinker] Capitalize type names (NFC)<br>
<br>
Make these types conform to the LLVM Coding Standards:<br>
<br>
> Type names (including classes, structs, enums, typedefs, etc) should<br>
> be nouns and start with an upper-case letter.<br>
<br>
Added: <br>
<br>
<br>
Modified: <br>
llvm/include/llvm/DWARFLinker/DWARFLinker.h<br>
llvm/include/llvm/DWARFLinker/DWARFStreamer.h<br>
llvm/lib/DWARFLinker/DWARFLinker.cpp<br>
llvm/tools/dsymutil/DwarfLinkerForBinary.cpp<br>
<br>
Removed: <br>
<br>
<br>
<br>
################################################################################<br>
diff --git a/llvm/include/llvm/DWARFLinker/DWARFLinker.h b/llvm/include/llvm/DWARFLinker/DWARFLinker.h<br>
index 2fb61b9edf55..bac2be8eb370 100644<br>
--- a/llvm/include/llvm/DWARFLinker/DWARFLinker.h<br>
+++ b/llvm/include/llvm/DWARFLinker/DWARFLinker.h<br>
@@ -221,12 +221,12 @@ class DWARFFile {<br>
<br>
typedef std::function<void(const Twine &Warning, StringRef Context,<br>
const DWARFDie *DIE)><br>
- messageHandler;<br>
+ MessageHandler;<br>
typedef std::function<ErrorOr<DWARFFile &>(StringRef ContainerName,<br>
StringRef Path)><br>
- objFileLoader;<br>
-typedef std::map<std::string, std::string> swiftInterfacesMap;<br>
-typedef std::map<std::string, std::string> objectPrefixMap;<br>
+ ObjectFileLoader;<br>
+typedef std::map<std::string, std::string> SwiftInterfaceMap;<br>
+typedef std::map<std::string, std::string> ObjectPrefixMap;<br>
<br>
/// The core of the Dwarf linking logic.<br>
///<br>
@@ -295,28 +295,28 @@ class DWARFLinker {<br>
}<br>
<br>
/// Set warning handler which would be used to report warnings.<br>
- void setWarningHandler(messageHandler Handler) {<br>
+ void setWarningHandler(MessageHandler Handler) {<br>
Options.WarningHandler = Handler;<br>
}<br>
<br>
/// Set error handler which would be used to report errors.<br>
- void setErrorHandler(messageHandler Handler) {<br>
+ void setErrorHandler(MessageHandler Handler) {<br>
Options.ErrorHandler = Handler;<br>
}<br>
<br>
/// Set object files loader which would be used to load<br>
/// additional objects for splitted dwarf.<br>
- void setObjFileLoader(objFileLoader Loader) {<br>
+ void setObjFileLoader(ObjectFileLoader Loader) {<br>
Options.ObjFileLoader = Loader;<br>
}<br>
<br>
/// Set map for Swift interfaces.<br>
- void setSwiftInterfacesMap(swiftInterfacesMap *Map) {<br>
+ void setSwiftInterfaceMap(SwiftInterfaceMap *Map) {<br>
Options.ParseableSwiftInterfaces = Map;<br>
}<br>
<br>
/// Set prefix map for objects.<br>
- void setObjectPrefixMap(objectPrefixMap *Map) {<br>
+ void setObjectPrefixMap(ObjectPrefixMap *Map) {<br>
Options.ObjectPrefixMap = Map;<br>
}<br>
<br>
@@ -783,22 +783,22 @@ class DWARFLinker {<br>
std::string PrependPath;<br>
<br>
// warning handler<br>
- messageHandler WarningHandler = nullptr;<br>
+ MessageHandler WarningHandler = nullptr;<br>
<br>
// error handler<br>
- messageHandler ErrorHandler = nullptr;<br>
+ MessageHandler ErrorHandler = nullptr;<br>
<br>
- objFileLoader ObjFileLoader = nullptr;<br>
+ ObjectFileLoader ObjFileLoader = nullptr;<br>
<br>
/// A list of all .swiftinterface files referenced by the debug<br>
/// info, mapping Module name to path on disk. The entries need to<br>
/// be uniqued and sorted and there are only few entries expected<br>
/// per compile unit, which is why this is a std::map.<br>
/// this is dsymutil specific fag.<br>
- swiftInterfacesMap *ParseableSwiftInterfaces = nullptr;<br>
+ SwiftInterfaceMap *ParseableSwiftInterfaces = nullptr;<br>
<br>
/// A list of remappings to apply to file paths.<br>
- objectPrefixMap *ObjectPrefixMap = nullptr;<br>
+ ObjectPrefixMap *ObjectPrefixMap = nullptr;<br>
} Options;<br>
};<br>
<br>
<br>
diff --git a/llvm/include/llvm/DWARFLinker/DWARFStreamer.h b/llvm/include/llvm/DWARFLinker/DWARFStreamer.h<br>
index de58f5dedf24..326a9dbac0f4 100644<br>
--- a/llvm/include/llvm/DWARFLinker/DWARFStreamer.h<br>
+++ b/llvm/include/llvm/DWARFLinker/DWARFStreamer.h<br>
@@ -44,7 +44,7 @@ class DwarfStreamer : public DwarfEmitter {<br>
public:<br>
DwarfStreamer(OutputFileType OutFileType, raw_pwrite_stream &OutFile,<br>
std::function<StringRef(StringRef Input)> Translator,<br>
- bool Minimize, messageHandler Error, messageHandler Warning)<br>
+ bool Minimize, MessageHandler Error, MessageHandler Warning)<br>
: OutFile(OutFile), OutFileType(OutFileType), Translator(Translator),<br>
Minimize(Minimize), ErrorHandler(Error), WarningHandler(Warning) {}<br>
<br>
@@ -210,8 +210,8 @@ class DwarfStreamer : public DwarfEmitter {<br>
const CompileUnit &Unit,<br>
const std::vector<CompileUnit::AccelInfo> &Names);<br>
<br>
- messageHandler ErrorHandler = nullptr;<br>
- messageHandler WarningHandler = nullptr;<br>
+ MessageHandler ErrorHandler;<br>
+ MessageHandler WarningHandler;<br>
};<br>
<br>
} // end namespace llvm<br>
<br>
diff --git a/llvm/lib/DWARFLinker/DWARFLinker.cpp b/llvm/lib/DWARFLinker/DWARFLinker.cpp<br>
index 2b1227428105..352e65d02609 100644<br>
--- a/llvm/lib/DWARFLinker/DWARFLinker.cpp<br>
+++ b/llvm/lib/DWARFLinker/DWARFLinker.cpp<br>
@@ -207,7 +207,7 @@ static void resolveRelativeObjectPath(SmallVectorImpl<char> &Buf, DWARFDie CU) {<br>
/// DW_TAG_module blocks.<br>
static void analyzeImportedModule(<br>
const DWARFDie &DIE, CompileUnit &CU,<br>
- swiftInterfacesMap *ParseableSwiftInterfaces,<br>
+ SwiftInterfaceMap *ParseableSwiftInterfaces,<br>
std::function<void(const Twine &, const DWARFDie &)> ReportWarning) {<br>
if (CU.getLanguage() != dwarf::DW_LANG_Swift)<br>
return;<br>
@@ -252,7 +252,7 @@ static bool analyzeContextInfo(<br>
const DWARFDie &DIE, unsigned ParentIdx, CompileUnit &CU,<br>
DeclContext *CurrentDeclContext, UniquingStringPool &StringPool,<br>
DeclContextTree &Contexts, uint64_t ModulesEndOffset,<br>
- swiftInterfacesMap *ParseableSwiftInterfaces,<br>
+ SwiftInterfaceMap *ParseableSwiftInterfaces,<br>
std::function<void(const Twine &, const DWARFDie &)> ReportWarning,<br>
bool InImportedModule = false) {<br>
unsigned MyIdx = CU.getOrigUnit().getDIEIndex(DIE);<br>
@@ -1940,7 +1940,7 @@ static uint64_t getDwoId(const DWARFDie &CUDie, const DWARFUnit &Unit) {<br>
}<br>
<br>
static std::string remapPath(StringRef Path,<br>
- const objectPrefixMap &ObjectPrefixMap) {<br>
+ const ObjectPrefixMap &ObjectPrefixMap) {<br>
if (ObjectPrefixMap.empty())<br>
return Path.str();<br>
<br>
<br>
diff --git a/llvm/tools/dsymutil/DwarfLinkerForBinary.cpp b/llvm/tools/dsymutil/DwarfLinkerForBinary.cpp<br>
index 3c71567b54bb..c6bd88694db6 100644<br>
--- a/llvm/tools/dsymutil/DwarfLinkerForBinary.cpp<br>
+++ b/llvm/tools/dsymutil/DwarfLinkerForBinary.cpp<br>
@@ -384,7 +384,7 @@ bool DwarfLinkerForBinary::link(const DebugMap &Map) {<br>
<br>
llvm_unreachable("Unhandled DebugMap object");<br>
});<br>
- GeneralLinker.setSwiftInterfacesMap(&ParseableSwiftInterfaces);<br>
+ GeneralLinker.setSwiftInterfaceMap(&ParseableSwiftInterfaces);<br>
<br>
for (const auto &Obj : Map.objects()) {<br>
// N_AST objects (swiftmodule files) should get dumped directly into the<br>
<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><u></u><u></u></p>
</blockquote>
</div>
</div>
</div>
</blockquote></div></div>