Skip to content

Commit 34a1d37

Browse files
committed
Place diagnostic warn_ivar_use_hidden under the flag -Wshadow-ivar.
llvm-svn: 140329
1 parent 3c78ca0 commit 34a1d37

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

clang/include/clang/Basic/DiagnosticSemaKinds.td

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4626,7 +4626,8 @@ def note_getter_unavailable : Note<
46264626
def err_invalid_protocol_qualifiers : Error<
46274627
"invalid protocol qualifiers on non-ObjC type">;
46284628
def warn_ivar_use_hidden : Warning<
4629-
"local declaration of %0 hides instance variable">;
4629+
"local declaration of %0 hides instance variable">,
4630+
InGroup<DiagGroup<"shadow-ivar">>;
46304631
def error_ivar_use_in_class_method : Error<
46314632
"instance variable %0 accessed in class method">;
46324633
def error_implicit_ivar_access : Error<

clang/test/Misc/warning-flags.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ This test serves two purposes:
1717

1818
The list of warnings below should NEVER grow. It should gradually shrink to 0.
1919

20-
CHECK: Warnings without flags (311):
20+
CHECK: Warnings without flags (310):
2121
CHECK-NEXT: backslash_newline_space
2222
CHECK-NEXT: charize_microsoft_ext
2323
CHECK-NEXT: ext_anon_param_requires_type_specifier
@@ -219,7 +219,6 @@ CHECK-NEXT: warn_instance_method_on_class_found
219219
CHECK-NEXT: warn_integer_too_large
220220
CHECK-NEXT: warn_integer_too_large_for_signed
221221
CHECK-NEXT: warn_invalid_asm_cast_lvalue
222-
CHECK-NEXT: warn_ivar_use_hidden
223222
CHECK-NEXT: warn_label_attribute_not_unused
224223
CHECK-NEXT: warn_many_braces_around_scalar_init
225224
CHECK-NEXT: warn_maynot_respond

0 commit comments

Comments
 (0)