summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNico Weber <nicolasweber@gmx.de>2014-08-18 23:02:03 +0000
committerNico Weber <nicolasweber@gmx.de>2014-08-18 23:02:03 +0000
commitf69cba649e8270a60663c66f0b0893b987990422 (patch)
tree6d7b0ead3ee175f53c0b3ad16c8e5878fcc66f55
parent43d22b83dcfcac2b63c5cfd7cf23f511275a0353 (diff)
downloadbcm5719-llvm-f69cba649e8270a60663c66f0b0893b987990422.tar.gz
bcm5719-llvm-f69cba649e8270a60663c66f0b0893b987990422.zip
Add a warning flag for an existing diagnostic.
One more, and the number of flags without a dedicated flag fits in two decimal digits :-) llvm-svn: 215946
-rw-r--r--clang/include/clang/Basic/DiagnosticSemaKinds.td3
-rw-r--r--clang/test/Misc/warning-flags.c3
2 files changed, 3 insertions, 3 deletions
diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td
index a1b2bc6389c..2385f375de6 100644
--- a/clang/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td
@@ -2074,7 +2074,8 @@ def err_attribute_aligned_not_power_of_two : Error<
def err_attribute_aligned_too_great : Error<
"requested alignment must be %0 bytes or smaller">;
def warn_redeclaration_without_attribute_prev_attribute_ignored : Warning<
- "%q0 redeclared without %1 attribute: previous %1 ignored">;
+ "%q0 redeclared without %1 attribute: previous %1 ignored">,
+ InGroup<DiagGroup<"inconsistent-dllimport">>;
def warn_attribute_ignored : Warning<"%0 attribute ignored">,
InGroup<IgnoredAttributes>;
def warn_attribute_after_definition_ignored : Warning<
diff --git a/clang/test/Misc/warning-flags.c b/clang/test/Misc/warning-flags.c
index 69706be283b..015b1f9dd5a 100644
--- a/clang/test/Misc/warning-flags.c
+++ b/clang/test/Misc/warning-flags.c
@@ -18,7 +18,7 @@ This test serves two purposes:
The list of warnings below should NEVER grow. It should gradually shrink to 0.
-CHECK: Warnings without flags (101):
+CHECK: Warnings without flags (100):
CHECK-NEXT: ext_delete_void_ptr_operand
CHECK-NEXT: ext_excess_initializers
CHECK-NEXT: ext_excess_initializers_in_char_array_initializer
@@ -106,7 +106,6 @@ CHECK-NEXT: warn_pragma_pack_show
CHECK-NEXT: warn_property_getter_owning_mismatch
CHECK-NEXT: warn_property_types_are_incompatible
CHECK-NEXT: warn_readonly_property
-CHECK-NEXT: warn_redeclaration_without_attribute_prev_attribute_ignored
CHECK-NEXT: warn_register_objc_catch_parm
CHECK-NEXT: warn_related_result_type_compatibility_class
CHECK-NEXT: warn_related_result_type_compatibility_protocol
OpenPOWER on IntegriCloud