From patchwork Thu Mar 7 16:48:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitry Andric X-Patchwork-Id: 86939 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DFD57385770C for ; Thu, 7 Mar 2024 16:48:47 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) by sourceware.org (Postfix) with ESMTPS id E73BA3858C36 for ; Thu, 7 Mar 2024 16:48:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E73BA3858C36 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=andric.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=andric.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org E73BA3858C36 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=87.251.56.140 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709830104; cv=none; b=Eg1+FSBJbkgIJmJ6tcMie1jZW8GOnBKdFTRJAVSoJZuiJ5YXJKfufm5Kw+b37ypJbXjrWJE7d+zflT6NthSfVraZFLDP1SA27kVdp+ZhwsXmFfECNJ3uWVEI8k2qbtWuOTh3Qs0cDXJHOC5yLAfGJguET/PG3X3EE11PD+JuhRs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709830104; c=relaxed/simple; bh=yUHO44Sbe3k+ls7Z7TeSFOSXlnF2JacH509S6HAn/SY=; h=DKIM-Signature:From:Mime-Version:Subject:Message-Id:Date:To; b=PG4X9nP5/dBut91IVxuJ2z1O3jrd92HpJaVm7E50qu7/x1Y5EC36Q1z54HDtZptDuh7Biaqr7lmI8cOApJsM8h1oZSly6/74Hp+05AG+X1QwWh3SQrAhw1BQdxIkaTozyF7Tswq6Y987CvK+aISsACTuH0Jk/cYU8NtkKIj5xFQ= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from smtpclient.apple (longrow.home.andric.com [192.168.0.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id BAFC04D9B6 for ; Thu, 7 Mar 2024 17:48:14 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=andric.com; s=201904; t=1709830094; bh=yUHO44Sbe3k+ls7Z7TeSFOSXlnF2JacH509S6HAn/SY=; h=From:Subject:Message-Id:Date:To:From; b=Dy0IOGcYhOu/K6aD58S9ZwOorc9QahjhQMhPXIJYmGp0tZTOj+HCyrA/vnuJwgCcy at7ytTqm4funlZ3Y3P2w0apl0T1+m++o6eUszHz2PKaHdv86ykDCxztTIsPabarGrs N6tm0Occ0OYpDJtRULQLXReBtAt6cU9gVsSo3TPVzdgpjcCrK5ZgDBzgF4nCrKV5LZ DrUU9P3MU+MrzvCcG8exdzVNKl8Y9hQkLMAcxjzZpQ8MgCo60TJiJjltXNfE0THgaI hgHCk5WlVhpTLO5bCrRlFW8M73g8GbGywOhyQXaGLNcn4ETj0wLUuuadeyI58HT9C/ 46pjlmUATbYtQ== From: Dimitry Andric Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.700.6.1.1\)) Subject: [PATCH] Fix libcc1plugin and libc1plugin to avoid poisoned identifiers Message-Id: <15D35FFE-1E97-4047-A75C-F13D25826E15@andric.com> Date: Thu, 7 Mar 2024 17:48:14 +0100 To: GCC Patches X-Mailer: Apple Mail (2.3731.700.6.1.1) X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, 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+patchwork=sourceware.org@gcc.gnu.org Ref: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111632 Use INCLUDE_VECTOR before including system.h, instead of directly including , to avoid running into poisoned identifiers. Signed-off-by: Dimitry Andric --- libcc1/libcc1plugin.cc | 3 +-- libcc1/libcp1plugin.cc | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libcc1/libcc1plugin.cc b/libcc1/libcc1plugin.cc index 72d17c3b81c..e64847466f4 100644 --- a/libcc1/libcc1plugin.cc +++ b/libcc1/libcc1plugin.cc @@ -32,6 +32,7 @@ #undef PACKAGE_VERSION #define INCLUDE_MEMORY +#define INCLUDE_VECTOR #include "gcc-plugin.h" #include "system.h" #include "coretypes.h" @@ -69,8 +70,6 @@ #include "gcc-c-interface.h" #include "context.hh" -#include - using namespace cc1_plugin; diff --git a/libcc1/libcp1plugin.cc b/libcc1/libcp1plugin.cc index 0eff7c68d29..da68c5d0ac1 100644 --- a/libcc1/libcp1plugin.cc +++ b/libcc1/libcp1plugin.cc @@ -33,6 +33,7 @@ #undef PACKAGE_VERSION #define INCLUDE_MEMORY +#define INCLUDE_VECTOR #include "gcc-plugin.h" #include "system.h" #include "coretypes.h" @@ -71,8 +72,6 @@ #include "rpc.hh" #include "context.hh" -#include - using namespace cc1_plugin;