[llvm-branch-commits] [llvm-branch] r299409 - Partial merge of r293110 into the 4.0 branch

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Mon Apr  3 20:17:09 2017
New Revision: 299409

URL: http://llvm.org/viewvc/llvm-project?rev=299409&view=rev
Log:
Partial merge of r293110 into the 4.0 branch

Avoid printing optimization remarks from llc unless they are enabled.

Fixes http://llvm.org/PR32184

Modified:
    llvm/branches/release_40/tools/llc/llc.cpp

Modified: llvm/branches/release_40/tools/llc/llc.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_40/tools/llc/llc.cpp?rev=299409&r1=299408&r2=299409&view=diff
==============================================================================
--- llvm/branches/release_40/tools/llc/llc.cpp (original)
+++ llvm/branches/release_40/tools/llc/llc.cpp Mon Apr  3 20:17:09 2017
@@ -233,6 +233,10 @@ static void DiagnosticHandler(const Diag
   if (DI.getSeverity() == DS_Error)
     *HasError = true;
 
+  if (auto *Remark = dyn_cast<DiagnosticInfoOptimizationBase>(&DI))
+    if (!Remark->isEnabled())
+      return;
+
   DiagnosticPrinterRawOStream DP(errs());
   errs() << LLVMContext::getDiagnosticMessagePrefix(DI.getSeverity()) << ": ";
   DI.print(DP);