procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PR c++/81067 - redundant NULL warning.

Browse source 
* call.c (convert_like_real): Restore null_node handling.

From-SVN: r256803
This commit is contained in:
Jason Merrill 2018-01-17 12:44:42 -05:00 • committed by Jason Merrill
parent 2625472ffa
commit d2edcd7083
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gcc/cp/ChangeLog
View file

@ -1,3 +1,8 @@
2018-01-17 Jason Merrill <jason@redhat.com>
PR c++/81067 - redundant NULL warning.
* call.c (convert_like_real): Restore null_node handling.
2018-01-17 Jason Merrill <jason@redhat.com> 2018-01-17 Jason Merrill <jason@redhat.com>
PR c++/81843 - ICE with variadic member template. PR c++/81843 - ICE with variadic member template.

6
gcc/cp/call.c
View file

@ -6804,6 +6804,12 @@ convert_like_real (conversion *convs, tree expr, tree fn, int argnum,
if (type_unknown_p (expr)) if (type_unknown_p (expr))
expr = instantiate_type (totype, expr, complain); expr = instantiate_type (totype, expr, complain);
if (expr == null_node
&& INTEGRAL_OR_UNSCOPED_ENUMERATION_TYPE_P (totype))
/* If __null has been converted to an integer type, we do not want to
continue to warn about uses of EXPR as an integer, rather than as a
pointer. */
expr = build_int_cst (totype, 0);
return expr; return expr;
case ck_ambig: case ck_ambig:
/* We leave bad_p off ck_ambig because overload resolution considers /* We leave bad_p off ck_ambig because overload resolution considers