Remove -Wcompound-token-split-by-space from -Wall.

Use of a linebreak between the `(` and `{` in a GNU statement-expression
appears to be too common to include this warning in -Wall -- this occurs
in some Linux kernel headers, for example.

diff --git a/clang/include/clang/Basic/DiagnosticGroups.td b/clang/include/clang/Basic/DiagnosticGroups.td
index a79e057..6b4dcc8 100644 (file)
--- a/clang/include/clang/Basic/DiagnosticGroups.td
+++ b/clang/include/clang/Basic/DiagnosticGroups.td
@@ -949,7 +949,7 @@ def Consumed       : DiagGroup<"consumed">;
 // warning should be active _only_ when -Wall is passed in, mark it as
 // DefaultIgnore in addition to putting it here.
 def All : DiagGroup<"all", [Most, Parentheses, Switch, SwitchBool,
-                            MisleadingIndentation, CompoundTokenSplit]>;
+                            MisleadingIndentation]>;
 
 // Warnings that should be in clang-cl /w4.
 def : DiagGroup<"CL4", [All, Extra]>;

diff --git a/clang/test/Misc/warning-wall.c b/clang/test/Misc/warning-wall.c
index 6e11345..c63d4be 100644 (file)
--- a/clang/test/Misc/warning-wall.c
+++ b/clang/test/Misc/warning-wall.c
@@ -94,9 +94,6 @@ CHECK-NEXT:    -Wdangling-else
 CHECK-NEXT:  -Wswitch
 CHECK-NEXT:  -Wswitch-bool
 CHECK-NEXT:  -Wmisleading-indentation
-CHECK-NEXT:  -Wcompound-token-split
-CHECK-NEXT:    -Wcompound-token-split-by-macro
-CHECK-NEXT:    -Wcompound-token-split-by-space
 
 
 CHECK-NOT:-W

diff --git a/clang/test/Parser/compound-token-split.cpp b/clang/test/Parser/compound-token-split.cpp
index 2ec7955..0f1774a 100644 (file)
--- a/clang/test/Parser/compound-token-split.cpp
+++ b/clang/test/Parser/compound-token-split.cpp
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 %s -verify
 // RUN: %clang_cc1 %s -verify=expected,space -Wcompound-token-split
-// RUN: %clang_cc1 %s -verify=expected,space -Wall
 
 #ifdef LSQUARE
 [ // expected-note {{second '[' token is here}}