[llvm-branch-commits] [cfe-branch] r309130 - Merging r308824:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Wed Jul 26 09:15:18 2017
New Revision: 309130

URL: http://llvm.org/viewvc/llvm-project?rev=309130&view=rev
Log:
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
------------------------------------------------------------------------

Modified:
    cfe/branches/release_50/   (props changed)
    cfe/branches/release_50/lib/Basic/DiagnosticIDs.cpp
    cfe/branches/release_50/test/Driver/autocomplete.c

Propchange: cfe/branches/release_50/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 26 09:15:18 2017
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:308455,308897
+/cfe/trunk:308455,308824,308897
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_50/lib/Basic/DiagnosticIDs.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_50/lib/Basic/DiagnosticIDs.cpp?rev=309130&r1=309129&r2=309130&view=diff
==============================================================================
--- cfe/branches/release_50/lib/Basic/DiagnosticIDs.cpp (original)
+++ cfe/branches/release_50/lib/Basic/DiagnosticIDs.cpp Wed Jul 26 09:15:18 2017
@@ -516,7 +516,7 @@ std::vector<std::string> DiagnosticIDs::
     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;

Modified: cfe/branches/release_50/test/Driver/autocomplete.c
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_50/test/Driver/autocomplete.c?rev=309130&r1=309129&r2=309130&view=diff
==============================================================================
--- cfe/branches/release_50/test/Driver/autocomplete.c (original)
+++ cfe/branches/release_50/test/Driver/autocomplete.c Wed Jul 26 09:15:18 2017
@@ -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