r201626 - clang-cl /fallback: turn the note into a warning

[Hans Wennborg]

Author: hans
Date: Tue Feb 18 20:10:19 2014
New Revision: 201626

URL: http://llvm.org/viewvc/llvm-project?rev=201626&view=rev
Log:
clang-cl /fallback: turn the note into a warning

Modified:
    cfe/trunk/include/clang/Basic/DiagnosticDriverKinds.td
    cfe/trunk/lib/Driver/Job.cpp
    cfe/trunk/test/Driver/cl-fallback.c

Modified: cfe/trunk/include/clang/Basic/DiagnosticDriverKinds.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticDriverKinds.td?rev=201626&r1=201625&r2=201626&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticDriverKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticDriverKinds.td Tue Feb 18 20:10:19 2014
@@ -171,5 +171,6 @@ def err_drv_modules_validate_once_requir
   "option '-fmodules-validate-once-per-build-session' requires "
   "'-fbuild-session-timestamp=<seconds since Epoch>'">;
 
-def note_drv_invoking_fallback : Note<"falling back to %0">;
+def warn_drv_invoking_fallback : Warning<"falling back to %0">,
+  InGroup<DiagGroup<"fallback">>;
 }

Modified: cfe/trunk/lib/Driver/Job.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Job.cpp?rev=201626&r1=201625&r2=201626&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Job.cpp (original)
+++ cfe/trunk/lib/Driver/Job.cpp Tue Feb 18 20:10:19 2014
@@ -164,8 +164,7 @@ int FallbackCommand::Execute(const Strin
     *ExecutionFailed = false;
 
   const Driver &D = getCreator().getToolChain().getDriver();
-  D.Diag(diag::note_drv_invoking_fallback).setForceEmit()
-      << Fallback->getExecutable();
+  D.Diag(diag::warn_drv_invoking_fallback) << Fallback->getExecutable();
 
   int SecondaryStatus = Fallback->Execute(Redirects, ErrMsg, ExecutionFailed);
   return SecondaryStatus;

Modified: cfe/trunk/test/Driver/cl-fallback.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/cl-fallback.c?rev=201626&r1=201625&r2=201626&view=diff
==============================================================================
--- cfe/trunk/test/Driver/cl-fallback.c (original)
+++ cfe/trunk/test/Driver/cl-fallback.c Tue Feb 18 20:10:19 2014
@@ -46,7 +46,7 @@
 // P-NOT: "cl.exe"
 
 // RUN: not %clang_cl /fallback /c -- %s 2>&1 | \
-// RUN:     FileCheck -check-prefix=ErrNote %s
-// ErrNote: note: falling back to {{.*}}cl.exe
+// RUN:     FileCheck -check-prefix=ErrWarn %s
+// ErrWarn: warning: falling back to {{.*}}cl.exe
 
 #error "This fails to compile."