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

class.c (method_name_cmp, [...]): Method names can never be NULL.

Browse Source 
* class.c (method_name_cmp, resort_method_name_cmp): Method names
	can never be NULL.

From-SVN: r251350
This commit is contained in:
Nathan Sidwell 2017-08-25 12:27:48 +00:00 committed by Nathan Sidwell
parent e2da9ffe3c
commit bb5d50b599
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gcc/cp/ChangeLog
View File

@ -1,5 +1,8 @@
2017-08-25 Nathan Sidwell <nathan@acm.org>
* class.c (method_name_cmp, resort_method_name_cmp): Method names
can never be NULL.
Conversion operators have a special name
* cp-tree.h (CPTI_CONV_OP_MARKER, CPTI_CONV_OP_IDENTIFIER): New.
(conv_op_marker, conv_op_identifier): New.

25
gcc/cp/class.c
View File

@ -2263,12 +2263,6 @@ method_name_cmp (const void* m1_p, const void* m2_p)
const tree *const m1 = (const tree *) m1_p;
const tree *const m2 = (const tree *) m2_p;
if (*m1 == NULL_TREE && *m2 == NULL_TREE)
return 0;
if (*m1 == NULL_TREE)
return -1;
if (*m2 == NULL_TREE)
return 1;
if (OVL_NAME (*m1) < OVL_NAME (*m2))
return -1;
return 1;
@ -2282,20 +2276,13 @@ resort_method_name_cmp (const void* m1_p, const void* m2_p)
{
const tree *const m1 = (const tree *) m1_p;
const tree *const m2 = (const tree *) m2_p;
if (*m1 == NULL_TREE && *m2 == NULL_TREE)
return 0;
if (*m1 == NULL_TREE)
tree n1 = OVL_NAME (*m1);
tree n2 = OVL_NAME (*m2);
resort_data.new_value (&n1, resort_data.cookie);
resort_data.new_value (&n2, resort_data.cookie);
if (n1 < n2)
return -1;
if (*m2 == NULL_TREE)
return 1;
{
tree d1 = OVL_NAME (*m1);
tree d2 = OVL_NAME (*m2);
resort_data.new_value (&d1, resort_data.cookie);
resort_data.new_value (&d2, resort_data.cookie);
if (d1 < d2)
return -1;
}
return 1;
}