OK.
On Wed, Apr 17, 2019 at 6:44 AM Richard Biener <rguent...@suse.de> wrote:
>
> On Tue, 16 Apr 2019, Richard Biener wrote:
>
> >
> > Two cases from a -fsynax-only tramp3d callgrind profile.
>
> Amended by two others.
>
> Bootstrapped and tested on x86_64-unknown-linux-gnu.
>
> OK?
>
> Thanks,
> Richard.
>
> 2019-04-17 Richard Biener <rguent...@suse.de>
>
> cp/
> * call.c (null_ptr_cst_p): Order checks according to expensiveness.
> (conversion_null_warnings): Likewise.
> * typeck.c (same_type_ignoring_top_level_qualifiers_p): Return
> early if type1 == type2.
>
> Index: gcc/cp/call.c
> ===================================================================
> --- gcc/cp/call.c (revision 270407)
> +++ gcc/cp/call.c (working copy)
> @@ -541,11 +541,11 @@ null_ptr_cst_p (tree t)
> STRIP_ANY_LOCATION_WRAPPER (t);
>
> /* Core issue 903 says only literal 0 is a null pointer constant. */
> - if (TREE_CODE (type) == INTEGER_TYPE
> - && !char_type_p (type)
> - && TREE_CODE (t) == INTEGER_CST
> + if (TREE_CODE (t) == INTEGER_CST
> + && !TREE_OVERFLOW (t)
> + && TREE_CODE (type) == INTEGER_TYPE
> && integer_zerop (t)
> - && !TREE_OVERFLOW (t))
> + && !char_type_p (type))
> return true;
> }
> else if (CP_INTEGRAL_TYPE_P (type))
> @@ -6844,8 +6844,9 @@ static void
> conversion_null_warnings (tree totype, tree expr, tree fn, int argnum)
> {
> /* Issue warnings about peculiar, but valid, uses of NULL. */
> - if (null_node_p (expr) && TREE_CODE (totype) != BOOLEAN_TYPE
> - && ARITHMETIC_TYPE_P (totype))
> + if (TREE_CODE (totype) != BOOLEAN_TYPE
> + && ARITHMETIC_TYPE_P (totype)
> + && null_node_p (expr))
> {
> location_t loc = get_location_for_expr_unwinding_for_system_header
> (expr);
> if (fn)
> @@ -6882,8 +6883,8 @@ conversion_null_warnings (tree totype, t
> }
> /* Handle zero as null pointer warnings for cases other
> than EQ_EXPR and NE_EXPR */
> - else if (null_ptr_cst_p (expr) &&
> - (TYPE_PTR_OR_PTRMEM_P (totype) || NULLPTR_TYPE_P (totype)))
> + else if ((TYPE_PTR_OR_PTRMEM_P (totype) || NULLPTR_TYPE_P (totype))
> + && null_ptr_cst_p (expr))
> {
> location_t loc = get_location_for_expr_unwinding_for_system_header
> (expr);
> maybe_warn_zero_as_null_pointer_constant (expr, loc);
> Index: gcc/cp/typeck.c
> ===================================================================
> --- gcc/cp/typeck.c (revision 270407)
> +++ gcc/cp/typeck.c (working copy)
> @@ -1508,6 +1508,8 @@ same_type_ignoring_top_level_qualifiers_
> {
> if (type1 == error_mark_node || type2 == error_mark_node)
> return false;
> + if (type1 == type2)
> + return true;
>
> type1 = cp_build_qualified_type (type1, TYPE_UNQUALIFIED);
> type2 = cp_build_qualified_type (type2, TYPE_UNQUALIFIED);
