Import LLVM 7.0.1 release including clang, lld and lldb.

1 files changed, 15 insertions, 1 deletions

diff --git a/gnu/llvm/tools/clang/lib/Frontend/HeaderIncludeGen.cpp b/gnu/llvm/tools/clang/lib/Frontend/HeaderIncludeGen.cpp
index 5bff4ecd0b4..9dc107c9d54 100644
--- a/gnu/llvm/tools/clang/lib/Frontend/HeaderIncludeGen.cpp
+++ b/gnu/llvm/tools/clang/lib/Frontend/HeaderIncludeGen.cpp
@@ -80,9 +80,23 @@ void clang::AttachHeaderIncludeGen(Preprocessor &PP,
                                    const DependencyOutputOptions &DepOpts,
                                    bool ShowAllHeaders, StringRef OutputPath,
                                    bool ShowDepth, bool MSStyle) {
-  raw_ostream *OutputFile = MSStyle ? &llvm::outs() : &llvm::errs();
+  raw_ostream *OutputFile = &llvm::errs();
   bool OwnsOutputFile = false;
 
+  // Choose output stream, when printing in cl.exe /showIncludes style.
+  if (MSStyle) {
+    switch (DepOpts.ShowIncludesDest) {
+    default:
+      llvm_unreachable("Invalid destination for /showIncludes output!");
+    case ShowIncludesDestination::Stderr:
+      OutputFile = &llvm::errs();
+      break;
+    case ShowIncludesDestination::Stdout:
+      OutputFile = &llvm::outs();
+      break;
+    }
+  }
+
   // Open the output file, if used.
   if (!OutputPath.empty()) {
     std::error_code EC;