From patchwork Tue Jul 10 10:14:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aldy Hernandez X-Patchwork-Id: 941900 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-481282-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="AtU8EHrB"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41PykH1CC0z9s0W for ; Tue, 10 Jul 2018 20:15:01 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=e3LuUngzFT4pRn16uCJqldX1hWRsTHIWpCz9ZfEWujOBWrtZHV snhOs/pFk/cC5sTJ3c6BxJfK34Pxi7knG3H3NrBIbPC5OXzk9SUs/DBMthIXB9fS JI4+qM5O3APWsI4ITLhunT8OSb7x4pjFiQNRTOp5vj/0siIZGu4YnANAI= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to :from:subject:message-id:date:mime-version:content-type; s= default; bh=O1BSjr6RWiPnROePfu/geAN/G88=; b=AtU8EHrBcKSzG8UMLou/ 3HqUXQt6bfpEAUw0XsUHQuFuFv9dV7uIzggNz2Fk0+nNEy/1mOmcEFR1uOX0313q YG9ngX6/clfi7m6YtNPLFuaMvAjO9EAgJo4lTjrsNeuqH7HTu0KPsfjKwhE1gqus 3Mcc3KOoR1UElpRG0C7xELI= Received: (qmail 43429 invoked by alias); 10 Jul 2018 10:14:54 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 43420 invoked by uid 89); 10 Jul 2018 10:14:52 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.2 spammy= X-HELO: mail-wr1-f44.google.com Received: from mail-wr1-f44.google.com (HELO mail-wr1-f44.google.com) (209.85.221.44) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 10 Jul 2018 10:14:51 +0000 Received: by mail-wr1-f44.google.com with SMTP id c13-v6so13942288wrt.1 for ; Tue, 10 Jul 2018 03:14:50 -0700 (PDT) Received: from abulafia.quesejoda.com (247.red-79-147-188.dynamicip.rima-tde.net. [79.147.188.247]) by smtp.gmail.com with ESMTPSA id q200-v6sm10403232wmg.8.2018.07.10.03.14.48 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Jul 2018 03:14:48 -0700 (PDT) To: gcc-patches From: Aldy Hernandez Subject: abstract gimple_call_nonnull*() from vr-values Message-ID: <3a4b09cc-e333-ea6a-2e76-1e6a3ae35388@redhat.com> Date: Tue, 10 Jul 2018 06:14:47 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 X-IsSubscribed: yes Ho hum, more abstractions. No change in functionality. OK for trunk? gcc/ * vr-values.c (gimple_stmt_nonzero_p): Abstract common code to... * gimple.c (gimple_call_nonnull_result_p): ...here... (gimple_call_nonnull_arg): ...and here. * gimple.h (gimple_call_nonnull_result_p): New. (gimple_call_nonnull_arg): New. diff --git a/gcc/gimple.c b/gcc/gimple.c index afdf583256c..8d56a966cc1 100644 --- a/gcc/gimple.c +++ b/gcc/gimple.c @@ -1548,6 +1548,57 @@ gimple_call_return_flags (const gcall *stmt) } +/* Return true if call STMT is known to return a non-zero result. */ + +bool +gimple_call_nonnull_result_p (gcall *call) +{ + tree fndecl = gimple_call_fndecl (call); + if (!fndecl) + return false; + if (flag_delete_null_pointer_checks && !flag_check_new + && DECL_IS_OPERATOR_NEW (fndecl) + && !TREE_NOTHROW (fndecl)) + return true; + + /* References are always non-NULL. */ + if (flag_delete_null_pointer_checks + && TREE_CODE (TREE_TYPE (fndecl)) == REFERENCE_TYPE) + return true; + + if (flag_delete_null_pointer_checks + && lookup_attribute ("returns_nonnull", + TYPE_ATTRIBUTES (gimple_call_fntype (call)))) + return true; + return gimple_alloca_call_p (call); +} + + +/* If CALL returns a non-null result in an argument, return that arg. */ + +tree +gimple_call_nonnull_arg (gcall *call) +{ + tree fndecl = gimple_call_fndecl (call); + if (!fndecl) + return NULL_TREE; + + unsigned rf = gimple_call_return_flags (call); + if (rf & ERF_RETURNS_ARG) + { + unsigned argnum = rf & ERF_RETURN_ARG_MASK; + if (argnum < gimple_call_num_args (call)) + { + tree arg = gimple_call_arg (call, argnum); + if (SSA_VAR_P (arg) + && infer_nonnull_range_by_attribute (call, arg)) + return arg; + } + } + return NULL_TREE; +} + + /* Return true if GS is a copy assignment. */ bool diff --git a/gcc/gimple.h b/gcc/gimple.h index 32e1908c534..a5dda9369bc 100644 --- a/gcc/gimple.h +++ b/gcc/gimple.h @@ -1488,6 +1488,8 @@ bool gimple_call_same_target_p (const gimple *, const gimple *); int gimple_call_flags (const gimple *); int gimple_call_arg_flags (const gcall *, unsigned); int gimple_call_return_flags (const gcall *); +bool gimple_call_nonnull_result_p (gcall *); +tree gimple_call_nonnull_arg (gcall *); bool gimple_assign_copy_p (gimple *); bool gimple_assign_ssa_name_copy_p (gimple *); bool gimple_assign_unary_nop_p (gimple *); diff --git a/gcc/vr-values.c b/gcc/vr-values.c index 32f64e047af..bba170f341b 100644 --- a/gcc/vr-values.c +++ b/gcc/vr-values.c @@ -313,35 +313,9 @@ gimple_stmt_nonzero_p (gimple *stmt) return gimple_assign_nonzero_p (stmt); case GIMPLE_CALL: { - tree fndecl = gimple_call_fndecl (stmt); - if (!fndecl) return false; - if (flag_delete_null_pointer_checks && !flag_check_new - && DECL_IS_OPERATOR_NEW (fndecl) - && !TREE_NOTHROW (fndecl)) - return true; - /* References are always non-NULL. */ - if (flag_delete_null_pointer_checks - && TREE_CODE (TREE_TYPE (fndecl)) == REFERENCE_TYPE) - return true; - if (flag_delete_null_pointer_checks && - lookup_attribute ("returns_nonnull", - TYPE_ATTRIBUTES (gimple_call_fntype (stmt)))) - return true; - - gcall *call_stmt = as_a (stmt); - unsigned rf = gimple_call_return_flags (call_stmt); - if (rf & ERF_RETURNS_ARG) - { - unsigned argnum = rf & ERF_RETURN_ARG_MASK; - if (argnum < gimple_call_num_args (call_stmt)) - { - tree arg = gimple_call_arg (call_stmt, argnum); - if (SSA_VAR_P (arg) - && infer_nonnull_range_by_attribute (stmt, arg)) - return true; - } - } - return gimple_alloca_call_p (stmt); + gcall *call_stmt = as_a (stmt); + return (gimple_call_nonnull_result_p (call_stmt) + || gimple_call_nonnull_arg (call_stmt)); } default: gcc_unreachable ();