From patchwork Thu Aug 20 01:21:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Malcolm X-Patchwork-Id: 1348132 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gcc.gnu.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=ImfkN3ma; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BX6LF1qQtz9sRN for ; Thu, 20 Aug 2020 11:21:24 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DCFB93857012; Thu, 20 Aug 2020 01:21:20 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DCFB93857012 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1597886480; bh=74k+B0ern40FmFc2maZoX+yqmOFCeHEPJb3gZuRcSWw=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=ImfkN3maaxmL67AwunJbnQw2zDi8whiVzqhqDm3HIiWYZTFS2lm/J5OvNEYU7NJkF pGOOkE3w+iYELMD2+ewJY7JbSqD1m+Tyq4dZZgJyUoHXqjfEERud8CL+VQ2fmanQzr JiRXZcvAowkRLTO/A6PQr5BZYUrW9YEkWdy/agOw= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by sourceware.org (Postfix) with ESMTP id 9B0DC3857C5A for ; Thu, 20 Aug 2020 01:21:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 9B0DC3857C5A Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-255-HD_plWdWPMyfB_klNZd9sw-1; Wed, 19 Aug 2020 21:21:14 -0400 X-MC-Unique: HD_plWdWPMyfB_klNZd9sw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 95CC1802B48 for ; Thu, 20 Aug 2020 01:21:13 +0000 (UTC) Received: from t470.redhat.com (ovpn-113-239.phx2.redhat.com [10.3.113.239]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3DF397DFFA; Thu, 20 Aug 2020 01:21:13 +0000 (UTC) To: gcc-patches@gcc.gnu.org Subject: [committed] analyzer: fix ICE on vector comparisons [PR96713] Date: Wed, 19 Aug 2020 21:21:11 -0400 Message-Id: <20200820012111.24453-1-dmalcolm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-13.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: David Malcolm via Gcc-patches From: David Malcolm Reply-To: David Malcolm Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Successfully bootstrapped & regrtested on x86_64-pc-linux-gnu. Pushed to master as r11-2776-g2f5951bd95e334d611f4be7bbe1a136c580f9c20. gcc/analyzer/ChangeLog: PR analyzer/96713 * region-model.cc (region_model::get_gassign_result): For comparisons, only use eval_condition when the lhs has boolean type, and use get_or_create_constant_svalue on the boolean constants directly rather than via get_rvalue. gcc/testsuite/ChangeLog: PR analyzer/96713 * gcc.dg/analyzer/pr96713.c: New test. --- gcc/analyzer/region-model.cc | 25 ++++++++++++------------- gcc/testsuite/gcc.dg/analyzer/pr96713.c | 8 ++++++++ 2 files changed, 20 insertions(+), 13 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/analyzer/pr96713.c diff --git a/gcc/analyzer/region-model.cc b/gcc/analyzer/region-model.cc index 8a5e74ebc0e..b8a0f9ffd3d 100644 --- a/gcc/analyzer/region-model.cc +++ b/gcc/analyzer/region-model.cc @@ -462,24 +462,23 @@ region_model::get_gassign_result (const gassign *assign, { tree rhs2 = gimple_assign_rhs2 (assign); - // TODO: constraints between svalues const svalue *rhs1_sval = get_rvalue (rhs1, ctxt); const svalue *rhs2_sval = get_rvalue (rhs2, ctxt); - tristate t = eval_condition (rhs1_sval, op, rhs2_sval); - if (t.is_known ()) - return get_rvalue (t.is_true () - ? boolean_true_node - : boolean_false_node, - ctxt); - else + if (TREE_TYPE (lhs) == boolean_type_node) { - // TODO: symbolic value for binop - const svalue *sval_binop - = m_mgr->get_or_create_binop (TREE_TYPE (lhs), op, - rhs1_sval, rhs2_sval); - return sval_binop; + /* Consider constraints between svalues. */ + tristate t = eval_condition (rhs1_sval, op, rhs2_sval); + if (t.is_known ()) + return m_mgr->get_or_create_constant_svalue + (t.is_true () ? boolean_true_node : boolean_false_node); } + + /* Otherwise, generate a symbolic binary op. */ + const svalue *sval_binop + = m_mgr->get_or_create_binop (TREE_TYPE (lhs), op, + rhs1_sval, rhs2_sval); + return sval_binop; } break; diff --git a/gcc/testsuite/gcc.dg/analyzer/pr96713.c b/gcc/testsuite/gcc.dg/analyzer/pr96713.c new file mode 100644 index 00000000000..fe9cafd73f1 --- /dev/null +++ b/gcc/testsuite/gcc.dg/analyzer/pr96713.c @@ -0,0 +1,8 @@ +typedef int __attribute__ ((vector_size (8))) V; + +void +foo (V d, V e) +{ + d <= e; + foo ((V){}, (V){}); +}