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

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@201626 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Basic/DiagnosticDriverKinds.td b/include/clang/Basic/DiagnosticDriverKinds.td
index 214b203dfbb22e3ba010063cde7315d738110550..f100b57d07ab2e712b6e8f6b40a3d7b93576c931 100644 (file)
--- a/include/clang/Basic/DiagnosticDriverKinds.td
+++ b/include/clang/Basic/DiagnosticDriverKinds.td
@@ -171,5 +171,6 @@ def err_drv_modules_validate_once_requires_timestamp : Error<
   "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">>;
 }

diff --git a/lib/Driver/Job.cpp b/lib/Driver/Job.cpp
index 7fd43e3c56cad972528b4094628a1f1458d43d0f..2775d892f7803238570fdf8301efb0c68fccf392 100644 (file)
--- a/lib/Driver/Job.cpp
+++ b/lib/Driver/Job.cpp
@@ -164,8 +164,7 @@ int FallbackCommand::Execute(const StringRef **Redirects, std::string *ErrMsg,
     *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;

diff --git a/test/Driver/cl-fallback.c b/test/Driver/cl-fallback.c
index 2e59ccdbbaad1a8b8c6fb3c34c29e4691ff95658..d67fa42ca8a450042a9f32477d33db1cf57a94ac 100644 (file)
--- a/test/Driver/cl-fallback.c
+++ b/test/Driver/cl-fallback.c
@@ -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."