From patchwork Sat May 7 03:28:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giuliano Belinassi X-Patchwork-Id: 1628627 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=GZ7lnn3Z; 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 4Kxjd7645gz9sGF for ; Tue, 10 May 2022 00:06:03 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id AD3473948A79 for ; Mon, 9 May 2022 14:06:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AD3473948A79 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1652105161; bh=AeanGk91sXNhdNkqTK1cEloqbJA6NRHAgn2QtLHgtJk=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=GZ7lnn3ZGNVOWb6LfJoE64TzLRavB4hSG+6ryRxbPP2BZiuMUMr+jZ27bs9cKlS9q W2XU1ICqX6Rv6s1peI+JWTlhY40zgWmfLe+p3CfVZGBJb0D6vTC1m2V51zLwuicq+H yztfide01yFdUxstoSPCIn4CEMit/DxEkwZ+JzF8= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from localhost (unknown [189.33.66.186]) by sourceware.org (Postfix) with ESMTP id 29BCC3948A61 for ; Mon, 9 May 2022 14:04:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 29BCC3948A61 Received: by localhost (Postfix, from userid 1000) id 7D56DC6612F; Sat, 7 May 2022 00:28:36 -0300 (-03) To: gcc-patches@gcc.gnu.org Subject: [PATCH v2] PR105169 Fix references to discarded sections Date: Sat, 7 May 2022 00:28:35 -0300 Message-Id: <20220507032835.9731-1-gbelinassi@suse.de> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, FSL_HELO_NON_FQDN_1, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, HELO_LOCALHOST, KAM_DMARC_NONE, KAM_DMARC_STATUS, KAM_LAZY_DOMAIN_SECURITY, KHOP_HELO_FCRDNS, RCVD_IN_PBL, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: Giuliano Belinassi via Gcc-patches From: Giuliano Belinassi Reply-To: Giuliano Belinassi Cc: gbelinassi@suse.de, matz@suse.de, rguenther@sused.de Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" When -fpatchable-function-entry= is enabled, certain C++ codes fails to link because of generated references to discarded sections in __patchable_function_entry section. This commit fixes this problem by puting those references in a COMDAT section. On the previous patch, GCC fails to compile with --enable-vtable-verify enabled. This version compiles fine with it. 2022-05-06 Giuliano Belinassi PR c++/105169 * targhooks.cc (default_print_patchable_function_entry_1): Handle COMDAT case. * varasm.cc (switch_to_comdat_section): New (handle_vtv_comdat_section): Call switch_to_comdat_section. * varasm.h: Declare switch_to_comdat_section. gcc/testsuite/ChangeLog 2022-05-06 Giuliano Belinassi PR c++/105169 * g++.dg/modules/pr105169.h: New file. * g++.dg/modules/pr105169_a.C: New test. * g++.dg/modules/pr105169_b.C: New file. --- gcc/targhooks.cc | 8 ++++-- gcc/testsuite/g++.dg/modules/pr105169.h | 22 +++++++++++++++ gcc/testsuite/g++.dg/modules/pr105169_a.C | 25 +++++++++++++++++ gcc/testsuite/g++.dg/modules/pr105169_b.C | 12 +++++++++ gcc/varasm.cc | 33 ++++++++++++++--------- gcc/varasm.h | 2 ++ 6 files changed, 87 insertions(+), 15 deletions(-) create mode 100644 gcc/testsuite/g++.dg/modules/pr105169.h create mode 100644 gcc/testsuite/g++.dg/modules/pr105169_a.C create mode 100644 gcc/testsuite/g++.dg/modules/pr105169_b.C diff --git a/gcc/targhooks.cc b/gcc/targhooks.cc index 399d6f874dc..b15ae19bcb6 100644 --- a/gcc/targhooks.cc +++ b/gcc/targhooks.cc @@ -2009,8 +2009,12 @@ default_print_patchable_function_entry_1 (FILE *file, patch_area_number++; ASM_GENERATE_INTERNAL_LABEL (buf, "LPFE", patch_area_number); - switch_to_section (get_section ("__patchable_function_entries", - flags, current_function_decl)); + section *sect = get_section ("__patchable_function_entries", + flags, current_function_decl); + if (HAVE_COMDAT_GROUP && DECL_COMDAT_GROUP (current_function_decl)) + switch_to_comdat_section (sect, current_function_decl); + else + switch_to_section (sect); assemble_align (POINTER_SIZE); fputs (asm_op, file); assemble_name_raw (file, buf); diff --git a/gcc/testsuite/g++.dg/modules/pr105169.h b/gcc/testsuite/g++.dg/modules/pr105169.h new file mode 100644 index 00000000000..a7e76270531 --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/pr105169.h @@ -0,0 +1,22 @@ +class IPXAddressClass +{ +public: + IPXAddressClass(void); +}; + +class WinsockInterfaceClass +{ + +public: + WinsockInterfaceClass(void); + + virtual void Set_Broadcast_Address(void*){}; + + virtual int Get_Protocol(void) + { + return 0; + }; + +protected: +}; + diff --git a/gcc/testsuite/g++.dg/modules/pr105169_a.C b/gcc/testsuite/g++.dg/modules/pr105169_a.C new file mode 100644 index 00000000000..66dc4b7901f --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/pr105169_a.C @@ -0,0 +1,25 @@ +/* { dg-module-do link } */ +/* { dg-options "-std=c++11 -fpatchable-function-entry=1 -O2" } */ +/* { dg-additional-options "-std=c++11 -fpatchable-function-entry=1 -O2" } */ + +/* This test is in the "modules" package because it supports multiple files + linkage. */ + +#include "pr105169.h" + +WinsockInterfaceClass* PacketTransport; + +IPXAddressClass::IPXAddressClass(void) +{ +} + +int function() +{ + return PacketTransport->Get_Protocol(); +} + +int main() +{ + IPXAddressClass ipxaddr; + return 0; +} diff --git a/gcc/testsuite/g++.dg/modules/pr105169_b.C b/gcc/testsuite/g++.dg/modules/pr105169_b.C new file mode 100644 index 00000000000..5f8b00dfe51 --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/pr105169_b.C @@ -0,0 +1,12 @@ +/* { dg-module-do link } */ +/* { dg-options "-std=c++11 -fpatchable-function-entry=1 -O2" } */ +/* { dg-additional-options "-std=c++11 -fpatchable-function-entry=1 -O2" } */ + +/* This test is in the "modules" package because it supports multiple files + linkage. */ + +#include "pr105169.h" + +WinsockInterfaceClass::WinsockInterfaceClass(void) +{ +} diff --git a/gcc/varasm.cc b/gcc/varasm.cc index c41f17d64f7..6454f1ce519 100644 --- a/gcc/varasm.cc +++ b/gcc/varasm.cc @@ -8457,25 +8457,21 @@ default_asm_output_ident_directive (const char *ident_str) fprintf (asm_out_file, "%s\"%s\"\n", ident_asm_op, ident_str); } - -/* This function ensures that vtable_map variables are not only - in the comdat section, but that each variable has its own unique - comdat name. Without this the variables end up in the same section - with a single comdat name. - +/* Switch to a COMDAT section with COMDAT name of decl. + FIXME: resolve_unique_section needs to deal better with decls with both DECL_SECTION_NAME and DECL_ONE_ONLY. Once that is fixed, this if-else statement can be replaced with a single call to "switch_to_section (sect)". */ -static void -handle_vtv_comdat_section (section *sect, const_tree decl ATTRIBUTE_UNUSED) +void +switch_to_comdat_section (section *sect, tree decl) { #if defined (OBJECT_FORMAT_ELF) targetm.asm_out.named_section (sect->named.name, sect->named.common.flags | SECTION_LINKONCE, - DECL_NAME (decl)); + decl); in_section = sect; #else /* Neither OBJECT_FORMAT_PE, nor OBJECT_FORMAT_COFF is set here. @@ -8490,18 +8486,18 @@ handle_vtv_comdat_section (section *sect, const_tree decl ATTRIBUTE_UNUSED) { char *name; - if (TREE_CODE (DECL_NAME (decl)) == IDENTIFIER_NODE) + if (TREE_CODE (decl) == IDENTIFIER_NODE) name = ACONCAT ((sect->named.name, "$", - IDENTIFIER_POINTER (DECL_NAME (decl)), NULL)); + IDENTIFIER_POINTER (decl), NULL)); else name = ACONCAT ((sect->named.name, "$", - IDENTIFIER_POINTER (DECL_COMDAT_GROUP (DECL_NAME (decl))), + IDENTIFIER_POINTER (DECL_COMDAT_GROUP (decl)), NULL)); targetm.asm_out.named_section (name, sect->named.common.flags | SECTION_LINKONCE, - DECL_NAME (decl)); + decl); in_section = sect; } else @@ -8509,4 +8505,15 @@ handle_vtv_comdat_section (section *sect, const_tree decl ATTRIBUTE_UNUSED) #endif } +/* This function ensures that vtable_map variables are not only + in the comdat section, but that each variable has its own unique + comdat name. Without this the variables end up in the same section + with a single comdat name. */ + +static void +handle_vtv_comdat_section (section *sect, const_tree decl ATTRIBUTE_UNUSED) +{ + switch_to_comdat_section(sect, DECL_NAME (decl)); +} + #include "gt-varasm.h" diff --git a/gcc/varasm.h b/gcc/varasm.h index d5d8c4e5578..8ba8374e779 100644 --- a/gcc/varasm.h +++ b/gcc/varasm.h @@ -79,4 +79,6 @@ extern rtx assemble_static_space (unsigned HOST_WIDE_INT); extern rtx assemble_trampoline_template (void); +extern void switch_to_comdat_section (section *, tree); + #endif // GCC_VARASM_H