mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-22 03:40:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove some TYPE_ARG_TYPES usage in objc/

Browse Source 
remove some TYPE_ARG_TYPES usage in objc/
	* objc-act.c (objc_compare_types): Use function_args_iterator
	instead of TYPE_ARG_TYPES to compare function argument types.

From-SVN: r173977
This commit is contained in:
Nathan Froyd 2011-05-20 19:57:52 +00:00 committed by Nathan Froyd
parent e6450c11b2
commit 769b55b24f
2 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/objc/ChangeLog
View File

@ -1,3 +1,8 @@
2011-05-20 Nathan Froyd <froydnj@codesourcery.com>
* objc-act.c (objc_compare_types): Use function_args_iterator
instead of TYPE_ARG_TYPES to compare function argument types.
2011-05-13 Toon Moene <toon@moene.org>
* objc-next-runtime-abi-02.c (newabi_append_ro):

35
gcc/objc/objc-act.c
View File

@ -2420,6 +2420,8 @@ objc_compare_types (tree ltyp, tree rtyp, int argno, tree callee)
lenient than C or C++ on this. */
if (TREE_CODE (ltyp) == FUNCTION_TYPE && TREE_CODE (rtyp) == FUNCTION_TYPE)
{
function_args_iterator liter, riter;
/* Return types must be covariant. */
if (!comptypes (TREE_TYPE (ltyp), TREE_TYPE (rtyp))
&& !objc_compare_types (TREE_TYPE (ltyp), TREE_TYPE (rtyp),
@ -2427,16 +2429,31 @@ objc_compare_types (tree ltyp, tree rtyp, int argno, tree callee)
return false;
/* Argument types must be contravariant. */
for (ltyp = TYPE_ARG_TYPES (ltyp), rtyp = TYPE_ARG_TYPES (rtyp);
ltyp && rtyp; ltyp = TREE_CHAIN (ltyp), rtyp = TREE_CHAIN (rtyp))
{
if (!comptypes (TREE_VALUE (rtyp), TREE_VALUE (ltyp))
&& !objc_compare_types (TREE_VALUE (rtyp), TREE_VALUE (ltyp),
argno, callee))
return false;
}
function_args_iter_init (&liter, ltyp);
function_args_iter_init (&riter, rtyp);
return (ltyp == rtyp);
while (1)
{
ltyp = function_args_iter_cond (&liter);
rtyp = function_args_iter_cond (&riter);
/* If we've exhaused both lists simulateously, we're done. */
if (ltyp == NULL_TREE && rtyp == NULL_TREE)
break;
/* If one list is shorter than the other, they fail to match. */
if (ltyp == NULL_TREE || rtyp == NULL_TREE)
return false;
if (!comptypes (rtyp, ltyp)
&& !objc_compare_types (rtyp, ltyp, argno, callee))
return false;
function_args_iter_next (&liter);
function_args_iter_next (&riter);
}
return true;
}
/* Past this point, we are only interested in ObjC class instances,