<div dir="ltr"><br><br><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">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: adrian<br>
Date: Thu Mar  7 15:30:19 2019<br>
New Revision: 355653<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=355653&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=355653&view=rev</a><br>
Log:<br>
Temporarily diasble debug output in GenericDomTreeConstruction.h<br>
to get the modules bots running again.<br>
<br>
The LLVM_DEBUG macro only plays well with a modular build of LLVM when<br>
the header is marked as textual, but doing so causes redefinition<br>
errors.<br></blockquote><div><br>What sort of redefinition errors?<br> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Modified:<br>
    llvm/trunk/include/llvm/Support/GenericDomTreeConstruction.h<br>
    llvm/trunk/include/llvm/module.modulemap<br>
<br>
Modified: llvm/trunk/include/llvm/Support/GenericDomTreeConstruction.h<br>
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">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/GenericDomTreeConstruction.h?rev=355653&r1=355652&r2=355653&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/Support/GenericDomTreeConstruction.h (original)<br>
+++ llvm/trunk/include/llvm/Support/GenericDomTreeConstruction.h Thu Mar  7 15:30:19 2019<br>
@@ -1185,6 +1185,10 @@ struct SemiNCAInfo {<br>
       BUI.FuturePredecessors[U.getTo()].push_back({U.getFrom(), U.getKind()});<br>
     }<br>
<br>
+#if 0<br>
+    // FIXME: The LLVM_DEBUG macro only plays well with a modular<br>
+    // build of LLVM when the header is marked as textual, but doing<br>
+    // so causes redefinition errors.<br>
     LLVM_DEBUG(dbgs() << "About to apply " << NumLegalized << " updates\n");<br>
     LLVM_DEBUG(if (NumLegalized < 32) for (const auto &U<br>
                                            : reverse(BUI.Updates)) {<br>
@@ -1193,6 +1197,7 @@ struct SemiNCAInfo {<br>
       dbgs() << "\n";<br>
     });<br>
     LLVM_DEBUG(dbgs() << "\n");<br>
+#endif<br>
<br>
     // Recalculate the DominatorTree when the number of updates<br>
     // exceeds a threshold, which usually makes direct updating slower than<br>
@@ -1218,8 +1223,13 @@ struct SemiNCAInfo {<br>
   static void ApplyNextUpdate(DomTreeT &DT, BatchUpdateInfo &BUI) {<br>
     assert(!BUI.Updates.empty() && "No updates to apply!");<br>
     UpdateT CurrentUpdate = BUI.Updates.pop_back_val();<br>
+#if 0<br>
+    // FIXME: The LLVM_DEBUG macro only plays well with a modular<br>
+    // build of LLVM when the header is marked as textual, but doing<br>
+    // so causes redefinition errors.<br>
     LLVM_DEBUG(dbgs() << "Applying update: ");<br>
     LLVM_DEBUG(CurrentUpdate.dump(); dbgs() << "\n");<br>
+#endif<br>
<br>
     // Move to the next snapshot of the CFG by removing the reverse-applied<br>
     // current update. Since updates are performed in the same order they are<br>
<br>
Modified: llvm/trunk/include/llvm/module.modulemap<br>
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">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/module.modulemap?rev=355653&r1=355652&r2=355653&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/module.modulemap (original)<br>
+++ llvm/trunk/include/llvm/module.modulemap Thu Mar  7 15:30:19 2019<br>
@@ -353,9 +353,6 @@ module LLVM_Utils {<br>
     exclude header "Support/PluginLoader.h"<br>
     exclude header "Support/Solaris/sys/regset.h"<br>
<br>
-    // This header uses the LLVM_DEBUG macro in function bodies.<br>
-    textual header "Support/GenericDomTreeConstruction.h"<br>
-<br>
     // These are intended for textual inclusion.<br>
     textual header "Support/ARMTargetParser.def"<br>
     textual header "Support/AArch64TargetParser.def"<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" rel="noreferrer" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div></div>