From patchwork Thu Dec 14 13:22:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 178725 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:3b04:b0:fb:cd0c:d3e with SMTP id c4csp8539474dys; Thu, 14 Dec 2023 05:23:03 -0800 (PST) X-Google-Smtp-Source: AGHT+IGG7WaMpiNB6moa1CsUNi3kJDBKOJTW4MKhfaOKVx6sc1xGDwOHFWc9V+IQ78EdnG0uUR9e X-Received: by 2002:a05:620a:166a:b0:77f:2b7:42df with SMTP id d10-20020a05620a166a00b0077f02b742dfmr10615368qko.145.1702560183069; Thu, 14 Dec 2023 05:23:03 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1702560183; cv=pass; d=google.com; s=arc-20160816; b=NG5pbDFVFWJp7v4nLyu6rs2QMsiEdathFbKekfKeUcGZFrCGFVRU52eSBnUsCn84wi ADtMBRFlc6K40tLLxqRUIWmCbH7MTU2p5CqC2KxRLGNWkrXHHYjqZUmAMP5vTKCF9wvi L2nY+msoUD27lLj/4i8H4xWWU1qQmlWGbU1H1XRbCfWNs/8LPUMadPeGYx7EaZmq89KP M5LEfyTzjaMnxp+Inj4TaXiDBSD0WOFkcE0QPn3lozSQMSUg6F1ZUvsnIIe3Y89T8Idf rX7YFgOihUfaHMdPiZCx4frsNtHKLKdoKzCe/W8ZjTukCcL9Fh/rBZuvahWMmW+oadJ9 3fJA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:mime-version:message-id:date :user-agent:references:in-reply-to:subject:cc:to:from:ironport-sdr :arc-filter:dmarc-filter:delivered-to; bh=KUtf9OUVCY/dC7JkDNNb6lA/WBRcNK7qFt3vLWcG8D4=; fh=/xp/8bfokgEiw4p8nyx4U+WhEgIlLy5X3cF2uz1SfSE=; b=SA+aGUKsrIaCVBvwJDJGgS5ucxJ3WyWKX1CPbSbv6zxLeTOtQ7bcuaqjMmWPnGlYMs Fc6H30YZYDHOKDfCM4hlcdOVbLKpEc1xIxI9oFcS5Pdk6HLKbVT627DQXUmcLdT/Ed5N q6aml/9V1XZ2wMVdfUeir7Bn6kiHva4KYq1qfyMQd+GKqmO49WzntKmjwAtiUjENogrq oUxlEgszRmWbdQMkCLsmYcEEZXmHs923r5BN7pEz1CClTWLcX4R+WWu/MxxAyevIYjgM 01xyJ2NqQBbPRj5sNVd4/cbH/FTf2Z8GMLAeqnEh69TtUdnUQfp3pWktrt6Iv+zyZwfS O3sg== ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id t4-20020a05620a0b0400b0077dce97f98asi14258041qkg.83.2023.12.14.05.23.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Dec 2023 05:23:03 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C315038618B5 for ; Thu, 14 Dec 2023 13:23:02 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from esa4.mentor.iphmx.com (esa4.mentor.iphmx.com [68.232.137.252]) by sourceware.org (Postfix) with ESMTPS id 412B5385E010 for ; Thu, 14 Dec 2023 13:22:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 412B5385E010 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 412B5385E010 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=68.232.137.252 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702560160; cv=none; b=I+pevnqV28cvaor/UqY/nW2N+ZRFRNr2kyArVazIrx6jys034ygfD2oc07/RLx1tQCMF9WzMS8mJUR+ya+qZp0ZB8CwSa1IkH0ItC8Kvd3yW8hBuOTv3MiXi8SD/crBguvVf9sKMQoo2n9YuQYekLCOkS4f9BdBFI5JHPLN6o+I= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702560160; c=relaxed/simple; bh=x8q3b8tMmMJuGg7eafhiaHuMw0ubQc/0MFPsye53DI4=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=UQoUOmsblX4Lh4BOISQw2D1f0gboWVprCcfFElu37XE5sauqcQNUUWI5sCKYH4S0C0A0ztxvhrF4I8908cHzmLnzuDiRf3QHg9bh0PoyGE4mSmJp/vGbU6f2Dd9OInt7Erl/CNBjPn514ecA3BnpjB3h14APROWxu1jJho+VGsQ= ARC-Authentication-Results: i=1; server2.sourceware.org X-CSE-ConnectionGUID: Pjz3ofg5RyuRjQW7UWbA3A== X-CSE-MsgGUID: kB5ttIoeRuaO95V0LNQqtw== X-IronPort-AV: E=Sophos;i="6.04,275,1695715200"; d="scan'208,223";a="25252460" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 14 Dec 2023 05:22:36 -0800 IronPort-SDR: Xswfw9nBK+vNLeJ74iaAhaGPRON/oyUiySpDdNE9+awfYJO8whGRymf8KaUNgXsDo61grlizz6 pkDJLuy1eKgGosyh5HJjiA/nrXZl70xJSJZAFrwcmdqmdLhflY3hQM8VFTNi4+u3mGRWfz0Lwa FxjbX4N5E1m16AiBgjLWZBn8tRrebk/T1v3CzXUY51f4zv/eQk0I8mu4aUuJQyUDuFi2OL1pru N6KxATyNAlRWEtRnIJeEAChDV1GxENZpV+Qv3oln8fgvoA/v+FXAAcMjHVpwF+umVwP9YDsKBb 6iY= From: Thomas Schwinge To: Filip Kastl , CC: Richard Biener , Jan Hubicka Subject: In 'gcc/gimple-ssa-sccopy.cc', '#define INCLUDE_ALGORITHM' instead of '#include ' (was: [PATCH v4] A new copy propagation and PHI elimination pass) In-Reply-To: References: <571578n9-pn64-qqqq-q59s-866548669143@fhfr.qr> <39489or3-7659-5306-4133-6p3n2pr58p99@fhfr.qr> User-Agent: Notmuch/0.29.3+94~g74c3f1b (https://notmuchmail.org) Emacs/28.2 (x86_64-pc-linux-gnu) Date: Thu, 14 Dec 2023 14:22:22 +0100 Message-ID: <87zfyc7wc1.fsf@euler.schwinge.homeip.net> MIME-Version: 1.0 X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-13.mgc.mentorg.com (139.181.222.13) To svr-ies-mbx-10.mgc.mentorg.com (139.181.222.10) X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, KAM_SHORT, SPF_HELO_PASS, 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785263746603976459 X-GMAIL-MSGID: 1785263746603976459 Hi! On 2023-12-13T17:12:11+0100, Filip Kastl wrote: > --- /dev/null > +++ b/gcc/gimple-ssa-sccopy.cc > +#include Pushed to master branch commit 65e41f4fbfc539c5cc429c684176f8ea39f4b8f2 "In 'gcc/gimple-ssa-sccopy.cc', '#define INCLUDE_ALGORITHM' instead of '#include '", see attached. Grüße Thomas ----------------- Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955 From 65e41f4fbfc539c5cc429c684176f8ea39f4b8f2 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Thu, 14 Dec 2023 14:12:45 +0100 Subject: [PATCH] In 'gcc/gimple-ssa-sccopy.cc', '#define INCLUDE_ALGORITHM' instead of '#include ' ... to avoid issues such as: In file included from [...]/lib/gcc/i686-pc-linux-gnu/5.2.0/include/xmmintrin.h:34:0, from [...]/lib/gcc/i686-pc-linux-gnu/5.2.0/include/x86intrin.h:31, from [...]/i686-pc-linux-gnu/include/c++/5.2.0/i686-pc-linux-gnu/64/bits/opt_random.h:33, from [...]/i686-pc-linux-gnu/include/c++/5.2.0/random:50, from [...]/i686-pc-linux-gnu/include/c++/5.2.0/bits/stl_algo.h:66, from [...]/i686-pc-linux-gnu/include/c++/5.2.0/algorithm:62, from [...]/source-gcc/gcc/gimple-ssa-sccopy.cc:32: [...]/lib/gcc/i686-pc-linux-gnu/5.2.0/include/mm_malloc.h:42:12: error: attempt to use poisoned "malloc" return malloc (size); ^ make[2]: *** [Makefile:1197: gimple-ssa-sccopy.o] Error 1 Minor fix-up for commit cd794c3961017703a4d2ca0e854ea23b3d4b6373 "A new copy propagation and PHI elimination pass". gcc/ * gimple-ssa-sccopy.cc: '#define INCLUDE_ALGORITHM' instead of '#include '. --- gcc/gimple-ssa-sccopy.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc/gimple-ssa-sccopy.cc b/gcc/gimple-ssa-sccopy.cc index ac5ec32eb32..7ebb6c05caf 100644 --- a/gcc/gimple-ssa-sccopy.cc +++ b/gcc/gimple-ssa-sccopy.cc @@ -18,6 +18,7 @@ You should have received a copy of the GNU General Public License along with GCC; see the file COPYING3. If not see . */ +#define INCLUDE_ALGORITHM #include "config.h" #include "system.h" #include "coretypes.h" @@ -29,7 +30,6 @@ along with GCC; see the file COPYING3. If not see #include "gimple-iterator.h" #include "vec.h" #include "hash-set.h" -#include #include "ssa-iterators.h" #include "gimple-fold.h" #include "gimplify.h" -- 2.34.1