[llvm] r355653 - Temporarily diasble debug output in GenericDomTreeConstruction.h

[Adrian Prantl via llvm-commits]

> On Mar 11, 2019, at 2:03 PM, David Blaikie <dblaikie at gmail.com> wrote:
> 
> 
> 
> On Thu, Mar 7, 2019 at 3:29 PM Adrian Prantl via llvm-commits <llvm-commits at lists.llvm.org <mailto:llvm-commits at lists.llvm.org>> wrote:
> Author: adrian
> Date: Thu Mar  7 15:30:19 2019
> New Revision: 355653
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=355653&view=rev <http://llvm.org/viewvc/llvm-project?rev=355653&view=rev>
> Log:
> Temporarily diasble debug output in GenericDomTreeConstruction.h
> to get the modules bots running again.
> 
> The LLVM_DEBUG macro only plays well with a modular build of LLVM when
> the header is marked as textual, but doing so causes redefinition
> errors.
> 
> What sort of redefinition errors?

Redefinition of the functions defined in this header.

-- adrian

>  
> 
> Modified:
>     llvm/trunk/include/llvm/Support/GenericDomTreeConstruction.h
>     llvm/trunk/include/llvm/module.modulemap
> 
> Modified: llvm/trunk/include/llvm/Support/GenericDomTreeConstruction.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/GenericDomTreeConstruction.h?rev=355653&r1=355652&r2=355653&view=diff <http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/GenericDomTreeConstruction.h?rev=355653&r1=355652&r2=355653&view=diff>
> ==============================================================================
> --- llvm/trunk/include/llvm/Support/GenericDomTreeConstruction.h (original)
> +++ llvm/trunk/include/llvm/Support/GenericDomTreeConstruction.h Thu Mar  7 15:30:19 2019
> @@ -1185,6 +1185,10 @@ struct SemiNCAInfo {
>        BUI.FuturePredecessors[U.getTo()].push_back({U.getFrom(), U.getKind()});
>      }
> 
> +#if 0
> +    // FIXME: The LLVM_DEBUG macro only plays well with a modular
> +    // build of LLVM when the header is marked as textual, but doing
> +    // so causes redefinition errors.
>      LLVM_DEBUG(dbgs() << "About to apply " << NumLegalized << " updates\n");
>      LLVM_DEBUG(if (NumLegalized < 32) for (const auto &U
>                                             : reverse(BUI.Updates)) {
> @@ -1193,6 +1197,7 @@ struct SemiNCAInfo {
>        dbgs() << "\n";
>      });
>      LLVM_DEBUG(dbgs() << "\n");
> +#endif
> 
>      // Recalculate the DominatorTree when the number of updates
>      // exceeds a threshold, which usually makes direct updating slower than
> @@ -1218,8 +1223,13 @@ struct SemiNCAInfo {
>    static void ApplyNextUpdate(DomTreeT &DT, BatchUpdateInfo &BUI) {
>      assert(!BUI.Updates.empty() && "No updates to apply!");
>      UpdateT CurrentUpdate = BUI.Updates.pop_back_val();
> +#if 0
> +    // FIXME: The LLVM_DEBUG macro only plays well with a modular
> +    // build of LLVM when the header is marked as textual, but doing
> +    // so causes redefinition errors.
>      LLVM_DEBUG(dbgs() << "Applying update: ");
>      LLVM_DEBUG(CurrentUpdate.dump(); dbgs() << "\n");
> +#endif
> 
>      // Move to the next snapshot of the CFG by removing the reverse-applied
>      // current update. Since updates are performed in the same order they are
> 
> Modified: llvm/trunk/include/llvm/module.modulemap
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/module.modulemap?rev=355653&r1=355652&r2=355653&view=diff <http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/module.modulemap?rev=355653&r1=355652&r2=355653&view=diff>
> ==============================================================================
> --- llvm/trunk/include/llvm/module.modulemap (original)
> +++ llvm/trunk/include/llvm/module.modulemap Thu Mar  7 15:30:19 2019
> @@ -353,9 +353,6 @@ module LLVM_Utils {
>      exclude header "Support/PluginLoader.h"
>      exclude header "Support/Solaris/sys/regset.h"
> 
> -    // This header uses the LLVM_DEBUG macro in function bodies.
> -    textual header "Support/GenericDomTreeConstruction.h"
> -
>      // These are intended for textual inclusion.
>      textual header "Support/ARMTargetParser.def"
>      textual header "Support/AArch64TargetParser.def"
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org <mailto:llvm-commits at lists.llvm.org>
> https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits <https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190311/a7e850b9/attachment.html>