OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR objc/27377 (false compiler warnings generated in Objective-C code) 

gcc/
2009-04-08  David Ayers  <ayers@fsfe.org>

	PR objc/27377
	* c-typeck.c (build_conditional_expr): Emit ObjC warnings
	by calling objc_compare_types and surpress warnings about
	incompatible C pointers that are compatible ObjC pointers.

gcc/testsuite/
2009-04-02  David Ayers  <ayers@fsfe.org>

	PR objc/27377
	* objc.dg/conditional-1.m: New tests.

From-SVN: r145718
This commit is contained in:
David Ayers 2009-04-08 11:59:36 +00:00 committed by David Ayers
parent b813c95a12
commit d67252400f
4 changed files with 63 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/ChangeLog
View File

@ -1,3 +1,10 @@
2009-04-08 David Ayers <ayers@fsfe.org>
PR objc/27377
* c-typeck.c (build_conditional_expr): Emit ObjC warnings
by calling objc_compare_types and surpress warnings about
incompatible C pointers that are compatible ObjC pointers.
2009-04-07 Alan Modra <amodra@bigpond.net.au>
PR target/39634

8
gcc/c-typeck.c
View File

@ -3437,6 +3437,7 @@ build_conditional_expr (tree ifexp, tree op1, tree op2)
enum tree_code code2;
tree result_type = NULL;
tree orig_op1 = op1, orig_op2 = op2;
bool objc_ok;
/* Promote both alternatives. */
@ -3463,6 +3464,8 @@ build_conditional_expr (tree ifexp, tree op1, tree op2)
return error_mark_node;
}
objc_ok = objc_compare_types (type1, type2, -3, NULL_TREE);
/* Quickly detect the usual case where op1 and op2 have the same type
after promotion. */
if (TYPE_MAIN_VARIANT (type1) == TYPE_MAIN_VARIANT (type2))
@ -3546,8 +3549,9 @@ build_conditional_expr (tree ifexp, tree op1, tree op2)
}
else
{
pedwarn (input_location, 0,
"pointer type mismatch in conditional expression");
if (!objc_ok)
pedwarn (input_location, 0,
"pointer type mismatch in conditional expression");
result_type = build_pointer_type (void_type_node);
}
}

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2009-04-02 David Ayers <ayers@fsfe.org>
PR objc/27377
* objc.dg/conditional-1.m: New tests.
2009-04-08 Dodji Seketeli <dodji@redhat.com>
PR c++/39637

45
gcc/testsuite/objc.dg/conditional-1.m Normal file
View File

@ -0,0 +1,45 @@
/* Testing conditional warnings (without headers). */
/* Author: David Ayers */
/* { dg-do compile } */
#define nil ((id)0)
@interface MyObject
@end
@protocol MyProtocol
@end
@interface MyProtoObject <MyProtocol>
@end
int
main (int argc, char *argv[])
{
id var_id = nil;
id <MyProtocol> var_id_p = nil;
MyObject *var_obj = nil;
MyProtoObject *var_obj_p = nil;
var_id = (var_id == var_obj) ? var_id : var_obj;
var_id = (var_id == var_obj) ? var_id : var_obj_p;
/* Ayers: Currently, the following test case passes for
technically the wrong reason (see below).
*/
var_obj_p = (var_id == var_obj) ? var_obj_p : var_obj; /* { dg-warning "distinct Objective-C types" } */
var_obj_p = (var_id == var_obj) ? var_obj_p : var_id_p;
/* Ayers: The first of the following test cases
should probably warn for var_obj_p = var_obj,
yet that would require extensive changes to
build_conditional_expr to create a tree with
multiple types that the assignment would have
to evaluate both versions for correct diagnostics.
*/
var_obj_p = (var_id == var_obj) ? var_id : var_obj;
var_obj_p = (var_id == var_obj) ? var_id : var_obj_p;
return 0;
}