summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Wennborg <hans@hanshq.net>2017-07-26 16:15:18 +0000
committerHans Wennborg <hans@hanshq.net>2017-07-26 16:15:18 +0000
commit3378e4c41b473dcb573f8d7c99fc15eb8e855428 (patch)
treeb804229cb90920a0d1305b48de5de58a9b5b08b2
parentcbaa84db28323e892ac1188a5f2fb60a88d5b92e (diff)
Merging r308824:
------------------------------------------------------------------------ r308824 | yamaguchi | 2017-07-22 05:35:15 -0700 (Sat, 22 Jul 2017) | 5 lines [Bash-autocompletion] Fixed typo and add '-' after -Wno Summary: -Wno-<warning> was autocompleted as -Wno<warning>, so fixed this typo. Differential Revision: https://reviews.llvm.org/D35762 ------------------------------------------------------------------------ git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_50@309130 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/Basic/DiagnosticIDs.cpp2
-rw-r--r--test/Driver/autocomplete.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/Basic/DiagnosticIDs.cpp b/lib/Basic/DiagnosticIDs.cpp
index 932b3f1934..0cdaf8e036 100644
--- a/lib/Basic/DiagnosticIDs.cpp
+++ b/lib/Basic/DiagnosticIDs.cpp
@@ -516,7 +516,7 @@ std::vector<std::string> DiagnosticIDs::getDiagnosticFlags() {
std::string Diag(DiagGroupNames + I + 1, DiagGroupNames[I]);
I += DiagGroupNames[I] + 1;
Res.push_back("-W" + Diag);
- Res.push_back("-Wno" + Diag);
+ Res.push_back("-Wno-" + Diag);
}
return Res;
diff --git a/test/Driver/autocomplete.c b/test/Driver/autocomplete.c
index dec48bfb35..dbf8810f2e 100644
--- a/test/Driver/autocomplete.c
+++ b/test/Driver/autocomplete.c
@@ -42,5 +42,5 @@
// MRELOCMODEL_CC1: -mrelocation-model
// RUN: %clang --autocomplete=-Wma | FileCheck %s -check-prefix=WARNING
// WARNING: -Wmacro-redefined -Wmain -Wmain-return-type -Wmalformed-warning-check -Wmany-braces-around-scalar-init -Wmax-unsigned-zero
-// RUN: %clang --autocomplete=-Wnoinvalid-pp- | FileCheck %s -check-prefix=NOWARNING
-// NOWARNING: -Wnoinvalid-pp-token
+// RUN: %clang --autocomplete=-Wno-invalid-pp- | FileCheck %s -check-prefix=NOWARNING
+// NOWARNING: -Wno-invalid-pp-token