Hide dbgs() stream for when built with -fmodules.

[marsupial]

Summary

Make DebugCounter::print and ump methods to be const correct.

[aprantl]

I'm slightly confused why this works as a fix for the Debug build. Isn't this patch a no-op for a debug build?

[aprantl]

That said, this patch is still obviously correct.

[marsupial]

This should be more 'obviously' correct.
Sorry, some CMake confusion here....

[marsupial]

Formatting.

[marsupial]

Remove spurious newline.

[aprantl]

LGTM, thanks!

include/llvm/Support/DebugCounter.h

#endif // NDEBUG
   }
 
   // Set a registered counter to a given value.
   static void setCounterValue(unsigned ID, const std::pair<int, int> &Val) {
     auto &Us = instance();
     Us.Counters[ID] = Val;
   }
 
+#ifndef NDEBUG
   // Dump or print the current counter set.
-  LLVM_DUMP_METHOD void dump() { print(dbgs()); }
+  LLVM_DUMP_METHOD void dump() {
+    print(dbgs());
+  }
+#endif
 
   void print(raw_ostream &OS);
 
   // Get the counter ID for a given named counter, or return 0 if none is found.
   unsigned getCounterId(const std::string &Name) const {
     return RegisteredCounters.idFor(Name);
   }
 

include/llvm/Transforms/Scalar/GVNExpression.h

public:
   }
 
   void print(raw_ostream &OS) const {
     OS << "{ ";
     printInternal(OS, true);
     OS << "}";
   }
 
+#ifndef NDEBUG
   LLVM_DUMP_METHOD void dump() const {
     print(dbgs());
     dbgs() << "\n";
   }
+#endif
 };
 
 inline raw_ostream &operator<<(raw_ostream &OS, const Expression &E) {
   E.print(OS);
   return OS;
 }
 
 class BasicExpression : public Expression {