From patchwork Tue Oct 15 20:18:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andi Kleen X-Patchwork-Id: 1997654 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=eBS/Xojj; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XSlmJ5kNhz1xsc for ; Wed, 16 Oct 2024 07:18:40 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7AA23385840B for ; Tue, 15 Oct 2024 20:18:38 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by sourceware.org (Postfix) with ESMTPS id E2B7C3858D20; Tue, 15 Oct 2024 20:18:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E2B7C3858D20 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=linux.intel.com Authentication-Results: sourceware.org; spf=none smtp.mailfrom=linux.intel.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org E2B7C3858D20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=192.198.163.7 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1729023500; cv=none; b=qsx+FvhXLXuJr/RZQpT2sVjKNJuBmCbSfHGLeYj/GB5a44QiStZ+O2kA24yw1AgP1KHnc0fQVK+YlyDpj4zzwBdP3BhUPsCkiefrbm4kZcDM7TnnY1A5WbJeQqbPJ4lm2tywBHDw8K83UNHVk3JCciFI3I7d6zbOIleVVdk/Lwk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1729023500; c=relaxed/simple; bh=nDeJ/91x53A3hp17pWEMn75TjWuRdsNv7h9K2UV3y+Q=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=b/Z3AXAd0goii+Ff/H8FBx757WDGU/cuzcx04z1Dhrm7tdSV8ot1y2ysrur3s5mujyt3Ep5jmqIBpYWPBR9iSAxuVLlwYdycbydrqteVg3FtxUjCadS86NLT47ccIdGPOYYYYg8MPj2d7nCdYOU/BjZPdFPKCE9s9ZbhZF9zEZo= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1729023498; x=1760559498; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=nDeJ/91x53A3hp17pWEMn75TjWuRdsNv7h9K2UV3y+Q=; b=eBS/XojjUCeYa/O+ua4Sc9tXEtC8DuqfrQva0cA9nEHVgjWm5vB+oYNK o28lzv5sWsqe/c/VlgyGl8uYxxkvraOS0pYomF3qJttYLLsZ7M5bhGnsX aTKwO+DZ1M/wRvb9SoXZSMw4wGqHCFWeskVKJSWDay80A0xJWaL7Omrh5 aQEjCTk/NSVZP0lAsl6AjSt8A02lcjS4WPfYxC3j9gX+bVNn2WtOwJkGN NvXqn8xvhOhbeq/M5zaiA+WjaCH+Wwbr3CQenxT+H4qARir9v2R42FofY ZctpZOYDKjQBUW+Q81//nTmL98PQRqJ9gzLGyjyuC+b4WNi8Jt11j4XH2 A==; X-CSE-ConnectionGUID: qTb7w9kJQAqX7xzyXzmCzQ== X-CSE-MsgGUID: hTSqeLWJTlCtazdYnkSzyg== X-IronPort-AV: E=McAfee;i="6700,10204,11225"; a="53853947" X-IronPort-AV: E=Sophos;i="6.11,206,1725346800"; d="scan'208";a="53853947" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Oct 2024 13:18:17 -0700 X-CSE-ConnectionGUID: AdgEJCnBQh+Sy9BHySxgvw== X-CSE-MsgGUID: O8r5a4PZRMOMXvXTiBDKeg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,206,1725346800"; d="scan'208";a="77629478" Received: from tassilo.jf.intel.com ([10.54.38.190]) by fmviesa006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Oct 2024 13:18:16 -0700 From: Andi Kleen To: gcc-patches@gcc.gnu.org Cc: Andi Kleen Subject: [PATCH] PR116510: Add missing fold_converts into tree switch if conversion Date: Tue, 15 Oct 2024 13:18:04 -0700 Message-ID: <20241015201804.1791191-1-ak@linux.intel.com> X-Mailer: git-send-email 2.46.2 MIME-Version: 1.0 X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_NONE, TXREP 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org From: Andi Kleen Passes test suite. Ok to commit? gcc/ChangeLog: PR middle-end/116510 * tree-if-conv.cc (predicate_bbs): Add missing fold_converts. gcc/testsuite/ChangeLog: * gcc.dg/vect/vect-switch-ifcvt-3.c: New test. --- gcc/testsuite/gcc.dg/vect/vect-switch-ifcvt-3.c | 12 ++++++++++++ gcc/tree-if-conv.cc | 9 ++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/vect/vect-switch-ifcvt-3.c diff --git a/gcc/testsuite/gcc.dg/vect/vect-switch-ifcvt-3.c b/gcc/testsuite/gcc.dg/vect/vect-switch-ifcvt-3.c new file mode 100644 index 000000000000..41bc8a1cf129 --- /dev/null +++ b/gcc/testsuite/gcc.dg/vect/vect-switch-ifcvt-3.c @@ -0,0 +1,12 @@ +/* { dg-do compile } */ +// PR116510 + +char excmap_def_0; +int gg_strescape_i; +void gg_strescape() { + for (; gg_strescape_i; gg_strescape_i++) + switch ((unsigned char)gg_strescape_i) + case '\\': + case '"': + excmap_def_0 = 0; +} diff --git a/gcc/tree-if-conv.cc b/gcc/tree-if-conv.cc index 90c754a48147..376a4642954d 100644 --- a/gcc/tree-if-conv.cc +++ b/gcc/tree-if-conv.cc @@ -1477,10 +1477,12 @@ predicate_bbs (loop_p loop) { tree low = build2_loc (loc, GE_EXPR, boolean_type_node, - index, CASE_LOW (label)); + index, fold_convert_loc (loc, TREE_TYPE (index), + CASE_LOW (label))); tree high = build2_loc (loc, LE_EXPR, boolean_type_node, - index, CASE_HIGH (label)); + index, fold_convert_loc (loc, TREE_TYPE (index), + CASE_HIGH (label))); case_cond = build2_loc (loc, TRUTH_AND_EXPR, boolean_type_node, low, high); @@ -1489,7 +1491,8 @@ predicate_bbs (loop_p loop) case_cond = build2_loc (loc, EQ_EXPR, boolean_type_node, index, - CASE_LOW (gimple_switch_label (sw, i))); + fold_convert_loc (loc, TREE_TYPE (index), + CASE_LOW (label))); if (i > 1) switch_cond = build2_loc (loc, TRUTH_OR_EXPR, boolean_type_node,