From 8530b6eee0fb82bee334146535e59f39223a469a Mon Sep 17 00:00:00 2001
From: Tyler Nowicki <tnowicki@apple.com>
Date: Fri, 18 Jul 2014 19:36:04 +0000
Subject: [PATCH] Rename DiagnosticInfoOptimizationWarning to
 DiagnosticInfoOptimizationFailure so the severity of the message is not part
 of the type name.

Reviewed by Alp Toker


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@213399 91177308-0d34-0410-b5e6-96231b3b80d8
---
 include/llvm/IR/DiagnosticInfo.h | 12 ++++++------
 lib/IR/DiagnosticInfo.cpp        |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/llvm/IR/DiagnosticInfo.h b/include/llvm/IR/DiagnosticInfo.h
index deceaa81b83..9c9f236180c 100644
--- a/include/llvm/IR/DiagnosticInfo.h
+++ b/include/llvm/IR/DiagnosticInfo.h
@@ -51,7 +51,7 @@ enum DiagnosticKind {
   DK_OptimizationRemark,
   DK_OptimizationRemarkMissed,
   DK_OptimizationRemarkAnalysis,
-  DK_OptimizationWarning,
+  DK_OptimizationFailure,
   DK_FirstPluginKind
 };
 
@@ -412,8 +412,8 @@ void emitOptimizationRemarkAnalysis(LLVMContext &Ctx, const char *PassName,
                                     const Function &Fn, const DebugLoc &DLoc,
                                     const Twine &Msg);
 
-/// Diagnostic information for optimization warnings.
-class DiagnosticInfoOptimizationWarning
+/// Diagnostic information for optimization failures.
+class DiagnosticInfoOptimizationFailure
     : public DiagnosticInfoOptimizationBase {
 public:
   /// \p Fn is the function where the diagnostic is being emitted. \p DLoc is
@@ -422,13 +422,13 @@ public:
   /// location. \p Msg is the message to show. Note that this class does not
   /// copy this message, so this reference must be valid for the whole life time
   /// of the diagnostic.
-  DiagnosticInfoOptimizationWarning(const Function &Fn, const DebugLoc &DLoc,
+  DiagnosticInfoOptimizationFailure(const Function &Fn, const DebugLoc &DLoc,
                                     const Twine &Msg)
-      : DiagnosticInfoOptimizationBase(DK_OptimizationWarning, DS_Warning,
+      : DiagnosticInfoOptimizationBase(DK_OptimizationFailure, DS_Warning,
                                        nullptr, Fn, DLoc, Msg) {}
 
   static bool classof(const DiagnosticInfo *DI) {
-    return DI->getKind() == DK_OptimizationWarning;
+    return DI->getKind() == DK_OptimizationFailure;
   }
 
   /// \see DiagnosticInfoOptimizationBase::isEnabled.
diff --git a/lib/IR/DiagnosticInfo.cpp b/lib/IR/DiagnosticInfo.cpp
index 0518c1ba96e..37cce2b0d78 100644
--- a/lib/IR/DiagnosticInfo.cpp
+++ b/lib/IR/DiagnosticInfo.cpp
@@ -190,19 +190,19 @@ void llvm::emitOptimizationRemarkAnalysis(LLVMContext &Ctx,
       DiagnosticInfoOptimizationRemarkAnalysis(PassName, Fn, DLoc, Msg));
 }
 
-bool DiagnosticInfoOptimizationWarning::isEnabled() const {
+bool DiagnosticInfoOptimizationFailure::isEnabled() const {
   // Only print warnings.
   return getSeverity() == DS_Warning;
 }
 
 void llvm::emitLoopVectorizeWarning(LLVMContext &Ctx, const Function &Fn,
                                     const DebugLoc &DLoc, const Twine &Msg) {
-  Ctx.diagnose(DiagnosticInfoOptimizationWarning(
+  Ctx.diagnose(DiagnosticInfoOptimizationFailure(
       Fn, DLoc, Twine("loop not vectorized: " + Msg)));
 }
 
 void llvm::emitLoopInterleaveWarning(LLVMContext &Ctx, const Function &Fn,
                                      const DebugLoc &DLoc, const Twine &Msg) {
-  Ctx.diagnose(DiagnosticInfoOptimizationWarning(
+  Ctx.diagnose(DiagnosticInfoOptimizationFailure(
       Fn, DLoc, Twine("loop not interleaved: " + Msg)));
 }