From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id AEEE53858413 for ; Mon, 20 Mar 2023 15:45:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AEEE53858413 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1679327130; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references; bh=+RprTXjE1bVAUQyHkUPgpneyMwRoXfUJpOia9TsESts=; b=THE/2dSybwETUWZxZ/FhXgsB9/Pmwhn+2TIUCKsl82/1M6O6nKX/y9WJIsBjM4c6EBdk+w u13qCtOvq7IbOryRaAWKABpEN7tCQBZdPQD3jPW3bIyW6Vpxc3qhwrcUzPHPtAc3z6mb/A MXRo9SM23mrltuDxKs0wKicAssG58lc= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-457-jZaaClILMmue52gsQGG9HA-1; Mon, 20 Mar 2023 11:45:29 -0400 X-MC-Unique: jZaaClILMmue52gsQGG9HA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A2AAB1C29267 for ; Mon, 20 Mar 2023 15:45:28 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.39.192.16]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 64FFB40C83AC; Mon, 20 Mar 2023 15:45:28 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.17.1/8.17.1) with ESMTPS id 32KFjP763123540 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 20 Mar 2023 16:45:26 +0100 Received: (from jakub@localhost) by tucnak.zalov.cz (8.17.1/8.17.1/Submit) id 32KFjPnt3123539; Mon, 20 Mar 2023 16:45:25 +0100 Date: Mon, 20 Mar 2023 16:45:25 +0100 From: Jakub Jelinek To: Jason Merrill , gcc-patches@gcc.gnu.org Subject: Re: [PATCH] c++, v2: Drop TREE_READONLY on vars (possibly) initialized by tls wrapper [PR109164] Message-ID: Reply-To: Jakub Jelinek References: MIME-Version: 1.0 In-Reply-To: X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,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 List-Id: On Sat, Mar 18, 2023 at 04:09:55PM +0100, Jakub Jelinek via Gcc-patches wrote: > On Sat, Mar 18, 2023 at 01:54:58PM +0100, Jakub Jelinek via Gcc-patches wrote: > > The patch is mostly about DECL_EXTERNAL cases, the others are supposedly > > handled by the var_definition_p code there (or at least I assumed; > > testcases certainly test only DECL_EXTERNAL). > > I guess it could be done in cp_finish_decl, maybe better next to the > > /* A reference will be modified here, as it is initialized. */ > > if (! DECL_EXTERNAL (decl) > > && TREE_READONLY (decl) > > && TYPE_REF_P (type)) > > { > > was_readonly = 1; > > TREE_READONLY (decl) = 0; > > } > > spot, but we'd need to export the decl2.cc helpers for it, > > because not all DECL_THREAD_LOCAL_P vars need to be treated that way. > > if (VAR_P (decl) > > && CP_DECL_THREAD_LOCAL_P (decl) > > && var_needs_tls_wrapper (decl) > > && (!DECL_EXTERNAL (decl) || flag_extern_tls_init)) > > TREE_READONLY (decl) = 0; > > where var_needs_tls_wrapper would need to be exported from decl2.cc. > > Though, var_needs_tls_wrapper -> var_defined_without_dynamic_init > > needs > > DECL_NONTRIVIALLY_INITIALIZED_P/DECL_INITIALIZED_BY_CONSTANT_EXPRESSION_P, > > so perhaps that is accurate only closer to the end of cp_finish_decl? > > Here it is in patch form, tested so far on tls.exp: And successfully bootstrapped/regtested on x86_64-linux and i686-linux over the weekend. > 2023-03-18 Jakub Jelinek > > PR c++/109164 > * cp-tree.h (var_needs_tls_wrapper): Declare. > * decl2.cc (var_needs_tls_wrapper): No longer static. > * decl.cc (cp_finish_decl): Clear TREE_READONLY on TLS variables > for which a TLS wrapper will be needed. > > * g++.dg/tls/thread_local13.C: New test. > * g++.dg/tls/thread_local13-aux.cc: New file. > * g++.dg/tls/thread_local14.C: New test. > * g++.dg/tls/thread_local14-aux.cc: New file. Jakub