From patchwork Wed Jun 1 13:17:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 1637972 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=Np5eTmdD; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LCqT00NTLz9s0w for ; Wed, 1 Jun 2022 23:17:54 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C20623830645 for ; Wed, 1 Jun 2022 13:17:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C20623830645 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1654089471; bh=ebNyC71/YJIM/qe70d0cXp68pWSAP/rrFf+5a9oBPLk=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=Np5eTmdDxiHiSMVlLZh6W0hIHkWoXvlmfB7SZTojyIYcNaeajiX2diJGIP/pWwG/i QyYGbAzo/Cw5pNr26kz44dyQYURxjIDmq5QSaIeImHEfcKZ9LvQiepEF8zU6rbpcFN 4O48xmA9hyZ2XRMNbzFAMTUZXqCRgSSbxkSAHrUw= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id 7A2E938344CC for ; Wed, 1 Jun 2022 13:17:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7A2E938344CC Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out1.suse.de (Postfix) with ESMTP id 49E4A21AC0 for ; Wed, 1 Jun 2022 13:17:29 +0000 (UTC) Received: from wotan.suse.de (wotan.suse.de [10.160.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by relay2.suse.de (Postfix) with ESMTPS id 4494D2C141 for ; Wed, 1 Jun 2022 13:17:29 +0000 (UTC) Date: Wed, 1 Jun 2022 13:17:29 +0000 (UTC) To: gcc-patches@gcc.gnu.org Subject: [PATCH] tree-optimization/105786 - avoid strlen replacement for pointers User-Agent: Alpine 2.22 (LSU 394 2020-01-19) MIME-Version: 1.0 X-Spam-Status: No, score=-10.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, MISSING_MID, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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: Richard Biener via Gcc-patches From: Richard Biener Reply-To: Richard Biener Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Message-Id: <20220601131751.C20623830645@sourceware.org> This avoids matching strlen to a pointer result, avoiding ICEing because of an integer adjustment using PLUS_EXPR on pointers. Boostrapped and tested on x86_64-unknown-linux-gnu, pushed. 2022-06-01 Richard Biener PR tree-optimization/105786 * tree-loop-distribution.cc (loop_distribution::transform_reduction_loop): Only do strlen replacement for integer type reductions. * gcc.dg/torture/pr105786.c: New testcase. --- gcc/testsuite/gcc.dg/torture/pr105786.c | 13 +++++++++++++ gcc/tree-loop-distribution.cc | 1 + 2 files changed, 14 insertions(+) create mode 100644 gcc/testsuite/gcc.dg/torture/pr105786.c diff --git a/gcc/testsuite/gcc.dg/torture/pr105786.c b/gcc/testsuite/gcc.dg/torture/pr105786.c new file mode 100644 index 00000000000..64aacf74b0a --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr105786.c @@ -0,0 +1,13 @@ +/* { dg-do compile } */ + +void sink(const char*); +static const char *a; +int main() +{ + const char *b = a; + for (int i = 0; i < 2; ++i) + while (*b++) + ; + sink(b); + return 0; +} diff --git a/gcc/tree-loop-distribution.cc b/gcc/tree-loop-distribution.cc index db6e9096a86..086b59ca2be 100644 --- a/gcc/tree-loop-distribution.cc +++ b/gcc/tree-loop-distribution.cc @@ -3658,6 +3658,7 @@ loop_distribution::transform_reduction_loop (loop_p loop) /* Handle strlen like loops. */ if (store_dr == NULL && integer_zerop (pattern) + && INTEGRAL_TYPE_P (TREE_TYPE (reduction_var)) && TREE_CODE (reduction_iv.base) == INTEGER_CST && TREE_CODE (reduction_iv.step) == INTEGER_CST && integer_onep (reduction_iv.step))