<html><head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class=""><br class=""><div><br class=""><blockquote type="cite" class=""><div class="">On Mar 11, 2019, at 2:03 PM, David Blaikie <<a href="mailto:dblaikie@gmail.com" class="">dblaikie@gmail.com</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div dir="ltr" class=""><br class=""><br class=""><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Thu, Mar 7, 2019 at 3:29 PM Adrian Prantl via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org" class="">llvm-commits@lists.llvm.org</a>> wrote:<br class=""></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: adrian<br class="">
Date: Thu Mar 7 15:30:19 2019<br class="">
New Revision: 355653<br class="">
<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=355653&view=rev" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-project?rev=355653&view=rev</a><br class="">
Log:<br class="">
Temporarily diasble debug output in GenericDomTreeConstruction.h<br class="">
to get the modules bots running again.<br class="">
<br class="">
The LLVM_DEBUG macro only plays well with a modular build of LLVM when<br class="">
the header is marked as textual, but doing so causes redefinition<br class="">
errors.<br class=""></blockquote><div class=""><br class="">What sort of redefinition errors?<br class=""></div></div></div></div></blockquote><div><br class=""></div><div>Redefinition of the functions defined in this header.</div><div><br class=""></div><div>-- adrian</div><br class=""><blockquote type="cite" class=""><div class=""><div dir="ltr" class=""><div class="gmail_quote"><div class=""> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br class="">
Modified:<br class="">
llvm/trunk/include/llvm/Support/GenericDomTreeConstruction.h<br class="">
llvm/trunk/include/llvm/module.modulemap<br class="">
<br class="">
Modified: llvm/trunk/include/llvm/Support/GenericDomTreeConstruction.h<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/GenericDomTreeConstruction.h?rev=355653&r1=355652&r2=355653&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/GenericDomTreeConstruction.h?rev=355653&r1=355652&r2=355653&view=diff</a><br class="">
==============================================================================<br class="">
--- llvm/trunk/include/llvm/Support/GenericDomTreeConstruction.h (original)<br class="">
+++ llvm/trunk/include/llvm/Support/GenericDomTreeConstruction.h Thu Mar 7 15:30:19 2019<br class="">
@@ -1185,6 +1185,10 @@ struct SemiNCAInfo {<br class="">
BUI.FuturePredecessors[U.getTo()].push_back({U.getFrom(), U.getKind()});<br class="">
}<br class="">
<br class="">
+#if 0<br class="">
+ // FIXME: The LLVM_DEBUG macro only plays well with a modular<br class="">
+ // build of LLVM when the header is marked as textual, but doing<br class="">
+ // so causes redefinition errors.<br class="">
LLVM_DEBUG(dbgs() << "About to apply " << NumLegalized << " updates\n");<br class="">
LLVM_DEBUG(if (NumLegalized < 32) for (const auto &U<br class="">
: reverse(BUI.Updates)) {<br class="">
@@ -1193,6 +1197,7 @@ struct SemiNCAInfo {<br class="">
dbgs() << "\n";<br class="">
});<br class="">
LLVM_DEBUG(dbgs() << "\n");<br class="">
+#endif<br class="">
<br class="">
// Recalculate the DominatorTree when the number of updates<br class="">
// exceeds a threshold, which usually makes direct updating slower than<br class="">
@@ -1218,8 +1223,13 @@ struct SemiNCAInfo {<br class="">
static void ApplyNextUpdate(DomTreeT &DT, BatchUpdateInfo &BUI) {<br class="">
assert(!BUI.Updates.empty() && "No updates to apply!");<br class="">
UpdateT CurrentUpdate = BUI.Updates.pop_back_val();<br class="">
+#if 0<br class="">
+ // FIXME: The LLVM_DEBUG macro only plays well with a modular<br class="">
+ // build of LLVM when the header is marked as textual, but doing<br class="">
+ // so causes redefinition errors.<br class="">
LLVM_DEBUG(dbgs() << "Applying update: ");<br class="">
LLVM_DEBUG(CurrentUpdate.dump(); dbgs() << "\n");<br class="">
+#endif<br class="">
<br class="">
// Move to the next snapshot of the CFG by removing the reverse-applied<br class="">
// current update. Since updates are performed in the same order they are<br class="">
<br class="">
Modified: llvm/trunk/include/llvm/module.modulemap<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/module.modulemap?rev=355653&r1=355652&r2=355653&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/module.modulemap?rev=355653&r1=355652&r2=355653&view=diff</a><br class="">
==============================================================================<br class="">
--- llvm/trunk/include/llvm/module.modulemap (original)<br class="">
+++ llvm/trunk/include/llvm/module.modulemap Thu Mar 7 15:30:19 2019<br class="">
@@ -353,9 +353,6 @@ module LLVM_Utils {<br class="">
exclude header "Support/PluginLoader.h"<br class="">
exclude header "Support/Solaris/sys/regset.h"<br class="">
<br class="">
- // This header uses the LLVM_DEBUG macro in function bodies.<br class="">
- textual header "Support/GenericDomTreeConstruction.h"<br class="">
-<br class="">
// These are intended for textual inclusion.<br class="">
textual header "Support/ARMTargetParser.def"<br class="">
textual header "Support/AArch64TargetParser.def"<br class="">
<br class="">
<br class="">
_______________________________________________<br class="">
llvm-commits mailing list<br class="">
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank" class="">llvm-commits@lists.llvm.org</a><br class="">
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank" class="">https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br class="">
</blockquote></div></div>
</div></blockquote></div><br class=""></body></html>