Fix bogus diagnostic format string.

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

diff --git a/include/clang/Basic/DiagnosticFrontendKinds.td b/include/clang/Basic/DiagnosticFrontendKinds.td
index 79147eac5f32e199bdc9a4b33572a3249440709b..b77614bbefc027adc07d8618feb1a4409c6bb2aa 100644 (file)
--- a/include/clang/Basic/DiagnosticFrontendKinds.td
+++ b/include/clang/Basic/DiagnosticFrontendKinds.td
@@ -82,7 +82,7 @@ def note_fixit_main_file_unchanged : Note<
 def warn_fixit_no_changes : Note<
     "FIX-IT detected errors it could not fix; no output will be generated">;
 
-def err_fe_clang : Error<"error invoking%s: %s">, DefaultFatal;
+def err_fe_invoking : Error<"error invoking%0: %1">, DefaultFatal;
 
 // PCH reader
 def err_relocatable_without_without_isysroot : Error<

diff --git a/tools/CIndex/CIndex.cpp b/tools/CIndex/CIndex.cpp
index d95aaee770c0f829e85942c1f0de092830fa2eea..df89d73ba8c0e64954c68047ac274dc3fc9e0080 100644 (file)
--- a/tools/CIndex/CIndex.cpp
+++ b/tools/CIndex/CIndex.cpp
@@ -1103,7 +1103,7 @@ clang_createTranslationUnitFromSourceFile(CXIndex CIdx,
         AllArgs += *I;
     }
 
-    Diags->Report(diag::err_fe_clang) << AllArgs << ErrMsg;
+    Diags->Report(diag::err_fe_invoking) << AllArgs << ErrMsg;
   }
 
   ASTUnit *ATU = ASTUnit::LoadFromPCHFile(astTmpFile, *Diags,

diff --git a/tools/CIndex/CIndexCodeCompletion.cpp b/tools/CIndex/CIndexCodeCompletion.cpp
index b646474c81409c5a5ff2aff3029494015f3a4e01..3b7674ec0d1d29b8f17a452e8b00e48f8fc1c055 100644 (file)
--- a/tools/CIndex/CIndexCodeCompletion.cpp
+++ b/tools/CIndex/CIndexCodeCompletion.cpp
@@ -330,7 +330,7 @@ CXCodeCompleteResults *clang_codeComplete(CXIndex CIdx,
         AllArgs += *I;
     }
     
-    Diags->Report(diag::err_fe_clang) << AllArgs << ErrMsg;
+    Diags->Report(diag::err_fe_invoking) << AllArgs << ErrMsg;
   }
 
   // Parse the resulting source file to find code-completion results.