diff options
| -rw-r--r-- | include/clang/Basic/DiagnosticGroups.td | 5 | ||||
| -rw-r--r-- | include/clang/Basic/DiagnosticSemaKinds.td | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/clang/Basic/DiagnosticGroups.td b/include/clang/Basic/DiagnosticGroups.td index c89ab09b3a..7fb14705df 100644 --- a/include/clang/Basic/DiagnosticGroups.td +++ b/include/clang/Basic/DiagnosticGroups.td @@ -54,6 +54,7 @@ def : DiagGroup<"effc++">; def FourByteMultiChar : DiagGroup<"four-char-constants">; def GlobalConstructors : DiagGroup<"global-constructors">; def : DiagGroup<"idiomatic-parentheses">; +def LogicalOpParentheses: DiagGroup<"logical-op-parentheses">; def IgnoredQualifiers : DiagGroup<"ignored-qualifiers">; def : DiagGroup<"import">; def : DiagGroup<"init-self">; @@ -162,7 +163,9 @@ def CharSubscript : DiagGroup<"char-subscripts">; // -Widiomatic-parentheses contains warnings about 'idiomatic' // missing parentheses; it is off by default. -def Parentheses : DiagGroup<"parentheses", [DiagGroup<"idiomatic-parentheses">]>; +def Parentheses : DiagGroup<"parentheses", + [LogicalOpParentheses, + DiagGroup<"idiomatic-parentheses">]>; // -Wconversion has its own warnings, but we split a few out for // legacy reasons: diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td index 4c8325621f..277653e7ea 100644 --- a/include/clang/Basic/DiagnosticSemaKinds.td +++ b/include/clang/Basic/DiagnosticSemaKinds.td @@ -2158,7 +2158,7 @@ def warn_logical_instead_of_bitwise : Warning< "remove constant">, InGroup<DiagGroup<"constant-logical-operand">>; def warn_logical_and_in_logical_or : Warning< - "'&&' within '||'">, InGroup<Parentheses>; + "'&&' within '||'">, InGroup<LogicalOpParentheses>; def note_logical_and_in_logical_or_silence : Note< "place parentheses around the '&&' expression to silence this warning">; |