Author: bruno Date: Mon Jul 18 15:37:06 2016 New Revision: 275907 URL: http://llvm.org/viewvc/llvm-project?rev=275907&view=rev Log: [Sema] Create a separate group for incompatible function pointer warning
Give incompatible function pointer warning its own diagnostic group but still leave it as a subgroup of incompatible-pointer-types. This is in preparation to promote -Wincompatible-function-pointer-types to error on darwin. Differential Revision: https://reviews.llvm.org/D22248 rdar://problem/12907612 Added: cfe/trunk/test/Sema/incompatible-function-pointer-types.c Modified: cfe/trunk/include/clang/Basic/DiagnosticGroups.td cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td cfe/trunk/lib/Sema/SemaExpr.cpp cfe/trunk/test/Sema/initialize-noreturn.c cfe/trunk/test/Sema/overloadable.c Modified: cfe/trunk/include/clang/Basic/DiagnosticGroups.td URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticGroups.td?rev=275907&r1=275906&r2=275907&view=diff ============================================================================== --- cfe/trunk/include/clang/Basic/DiagnosticGroups.td (original) +++ cfe/trunk/include/clang/Basic/DiagnosticGroups.td Mon Jul 18 15:37:06 2016 @@ -225,9 +225,12 @@ def GNUIncludeNext : DiagGroup<"gnu-incl def IncompatibleMSStruct : DiagGroup<"incompatible-ms-struct">; def IncompatiblePointerTypesDiscardsQualifiers : DiagGroup<"incompatible-pointer-types-discards-qualifiers">; +def IncompatibleFunctionPointerTypes + : DiagGroup<"incompatible-function-pointer-types">; def IncompatiblePointerTypes : DiagGroup<"incompatible-pointer-types", - [IncompatiblePointerTypesDiscardsQualifiers]>; + [IncompatiblePointerTypesDiscardsQualifiers, + IncompatibleFunctionPointerTypes]>; def IncompleteUmbrella : DiagGroup<"incomplete-umbrella">; def NonModularIncludeInFrameworkModule : DiagGroup<"non-modular-include-in-framework-module">; Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=275907&r1=275906&r2=275907&view=diff ============================================================================== --- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td (original) +++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td Mon Jul 18 15:37:06 2016 @@ -6351,6 +6351,24 @@ def ext_typecheck_convert_incompatible_p "; remove *|" "; remove &}3">, InGroup<IncompatiblePointerTypes>; +def ext_typecheck_convert_incompatible_function_pointer : ExtWarn< + "incompatible function pointer types " + "%select{%diff{assigning to $ from $|assigning to different types}0,1" + "|%diff{passing $ to parameter of type $|" + "passing to parameter of different type}0,1" + "|%diff{returning $ from a function with result type $|" + "returning from function with different return type}0,1" + "|%diff{converting $ to type $|converting between types}0,1" + "|%diff{initializing $ with an expression of type $|" + "initializing with expression of different type}0,1" + "|%diff{sending $ to parameter of type $|" + "sending to parameter of different type}0,1" + "|%diff{casting $ to type $|casting between types}0,1}2" + "%select{|; dereference with *|" + "; take the address with &|" + "; remove *|" + "; remove &}3">, + InGroup<IncompatibleFunctionPointerTypes>; def ext_typecheck_convert_discards_qualifiers : ExtWarn< "%select{%diff{assigning to $ from $|assigning to different types}0,1" "|%diff{passing $ to parameter of type $|" Modified: cfe/trunk/lib/Sema/SemaExpr.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExpr.cpp?rev=275907&r1=275906&r2=275907&view=diff ============================================================================== --- cfe/trunk/lib/Sema/SemaExpr.cpp (original) +++ cfe/trunk/lib/Sema/SemaExpr.cpp Mon Jul 18 15:37:06 2016 @@ -12423,10 +12423,14 @@ bool Sema::DiagnoseAssignmentResult(Assi MayHaveConvFixit = true; break; case IncompatiblePointer: - DiagKind = - (Action == AA_Passing_CFAudited ? - diag::err_arc_typecheck_convert_incompatible_pointer : - diag::ext_typecheck_convert_incompatible_pointer); + if (Action == AA_Passing_CFAudited) + DiagKind = diag::err_arc_typecheck_convert_incompatible_pointer; + else if (SrcType->isFunctionPointerType() && + DstType->isFunctionPointerType()) + DiagKind = diag::ext_typecheck_convert_incompatible_function_pointer; + else + DiagKind = diag::ext_typecheck_convert_incompatible_pointer; + CheckInferredResultType = DstType->isObjCObjectPointerType() && SrcType->isObjCObjectPointerType(); if (Hint.isNull() && !CheckInferredResultType) { Added: cfe/trunk/test/Sema/incompatible-function-pointer-types.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/incompatible-function-pointer-types.c?rev=275907&view=auto ============================================================================== --- cfe/trunk/test/Sema/incompatible-function-pointer-types.c (added) +++ cfe/trunk/test/Sema/incompatible-function-pointer-types.c Mon Jul 18 15:37:06 2016 @@ -0,0 +1,14 @@ +// RUN: %clang_cc1 -fsyntax-only %s -Wincompatible-pointer-types -verify +// RUN: %clang_cc1 -fsyntax-only %s -Wincompatible-function-pointer-types -verify + +// This test ensures that the subgroup of -Wincompatible-pointer-types warnings +// that concern function pointers can be promoted (or not promoted) to an error +// *separately* from the other -Wincompatible-pointer-type warnings. +typedef int (*MyFnTyA)(int *, char *); + +int bar(char *a, int *b) { return 0; } +int foo(MyFnTyA x) { return 0; } // expected-note {{passing argument to parameter 'x' here}} + +void baz() { + foo(&bar); // expected-warning {{incompatible function pointer types passing 'int (*)(char *, int *)' to parameter of type 'MyFnTyA' (aka 'int (*)(int *, char *)')}} +} Modified: cfe/trunk/test/Sema/initialize-noreturn.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/initialize-noreturn.c?rev=275907&r1=275906&r2=275907&view=diff ============================================================================== --- cfe/trunk/test/Sema/initialize-noreturn.c (original) +++ cfe/trunk/test/Sema/initialize-noreturn.c Mon Jul 18 15:37:06 2016 @@ -8,7 +8,7 @@ void foo(void); void foo_noret(void) __attribute__((noreturn)); void test() { - Fn_noret fn2 = &foo; // expected-warning {{incompatible pointer types initializing 'Fn_noret'}} + Fn_noret fn2 = &foo; // expected-warning {{incompatible function pointer types initializing 'Fn_noret'}} Fn_noret fn3 = &foo_noret; Fn_ret fn4 = &foo_noret; Fn_ret fn5 = &foo; Modified: cfe/trunk/test/Sema/overloadable.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/overloadable.c?rev=275907&r1=275906&r2=275907&view=diff ============================================================================== --- cfe/trunk/test/Sema/overloadable.c (original) +++ cfe/trunk/test/Sema/overloadable.c Mon Jul 18 15:37:06 2016 @@ -109,7 +109,7 @@ void fn_type_conversions() { void (*ambiguous)(int *) = &foo; // expected-error{{initializing 'void (*)(int *)' with an expression of incompatible type '<overloaded function type>'}} expected-note@105{{candidate function}} expected-note@106{{candidate function}} void *vp_ambiguous = &foo; // expected-error{{initializing 'void *' with an expression of incompatible type '<overloaded function type>'}} expected-note@105{{candidate function}} expected-note@106{{candidate function}} - void (*specific1)(int *) = (void (*)(void *))&foo; // expected-warning{{incompatible pointer types initializing 'void (*)(int *)' with an expression of type 'void (*)(void *)'}} + void (*specific1)(int *) = (void (*)(void *))&foo; // expected-warning{{incompatible function pointer types initializing 'void (*)(int *)' with an expression of type 'void (*)(void *)'}} void *specific2 = (void (*)(void *))&foo; void disabled(void *c) __attribute__((overloadable, enable_if(0, ""))); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
