From patchwork Thu Oct 11 15:21:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 190924 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id AB6712C008E for ; Fri, 12 Oct 2012 02:22:06 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1350573726; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject: References:In-Reply-To:Content-Type:Mailing-List:Precedence: List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=urzQM6iwQ30jdSoOpDua3pmHDBo=; b=x3/gYLBWy8+unIM SjNrN5qRhGDgGnrbVfqa9ErwZpiVimJD/W3RHAH1hLWkDUAM/CyEXT/ZAVNwdPgg O5Ta8WumWXs1pm9sIg/G7k/svJBnfGByFrMyEf5D7R3Ctl90GsRIzthx6Y9279KD fWZVmltgqKWgNBSpD9MS3iI9LUZ0= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject:References:In-Reply-To:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=FdP2wvWgKBcCs+9G8gze8CKY5q6+1M8UPKkCI0I70wwTRQDSdzO82bp6defkA4 ATcesE8X8KjO5nU4qn9syJepRUWN64SQKB8A+AnoSGMvpLRzTnnRvzhWblXvXMQF 85YMpgaYLNGDqxpCR0E3Ic1UFCUTCGYDfNWsmXjoTH0zw=; Received: (qmail 20372 invoked by alias); 11 Oct 2012 15:22:01 -0000 Received: (qmail 20362 invoked by uid 22791); 11 Oct 2012 15:21:59 -0000 X-SWARE-Spam-Status: No, hits=-8.1 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, KHOP_SPAMHAUS_DROP, KHOP_THREADED, RCVD_IN_DNSWL_HI, RCVD_IN_HOSTKARMA_W, RP_MATCHES_RCVD, SPF_HELO_PASS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 11 Oct 2012 15:21:56 +0000 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q9BFLsmJ003810 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 11 Oct 2012 11:21:54 -0400 Received: from [10.3.113.39] (ovpn-113-39.phx2.redhat.com [10.3.113.39]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q9BFLqUR014098; Thu, 11 Oct 2012 11:21:53 -0400 Message-ID: <5076E410.6060305@redhat.com> Date: Thu, 11 Oct 2012 11:21:52 -0400 From: Jason Merrill User-Agent: Mozilla/5.0 (X11; Linux i686; rv:15.0) Gecko/20120911 Thunderbird/15.0.1 MIME-Version: 1.0 To: Jack Howarth CC: Dominique Dhumieres , gcc-patches@gcc.gnu.org Subject: Re: RFC: C++ PATCH to support dynamic initialization and destruction of C++11 and OpenMP TLS variables References: <20121009140751.4F52F3BE1B@mailhost.lps.ens.fr> <20121009144314.GA1406@bromo.med.uc.edu> <50744261.2000404@redhat.com> In-Reply-To: <50744261.2000404@redhat.com> Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org On 10/09/2012 11:27 AM, Jason Merrill wrote: >>> FAIL: g++.dg/tls/thread_local7.C scan-assembler-not \\.data I've changed this test to require native TLS. >>> FAIL: g++.dg/tls/static-1.C * And I've fixed the compiler to not mess with thread_local wrappers on this test, since it uses __thread. Tested x86_64-pc-linux-gnu, applying to trunk. commit 3c317cba2f2b6100987ee720f7d7da76f5f43c19 Author: Jason Merrill Date: Tue Oct 9 12:55:52 2012 -0400 * decl.c (grokdeclarator): Set DECL_GNU_TLS_P for static data members, too. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 0b936ea..e78c664 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -10446,7 +10446,11 @@ grokdeclarator (const cp_declarator *declarator, DECL_EXTERNAL (decl) = 1; if (thread_p) - DECL_TLS_MODEL (decl) = decl_default_tls_model (decl); + { + DECL_TLS_MODEL (decl) = decl_default_tls_model (decl); + if (declspecs->gnu_thread_keyword_p) + DECL_GNU_TLS_P (decl) = true; + } if (constexpr_p && !initialized) { diff --git a/gcc/testsuite/g++.dg/gomp/tls-5.C b/gcc/testsuite/g++.dg/gomp/tls-5.C index 74e4faa..f1dcdae 100644 --- a/gcc/testsuite/g++.dg/gomp/tls-5.C +++ b/gcc/testsuite/g++.dg/gomp/tls-5.C @@ -1,6 +1,7 @@ // The reference temp should be TLS, not normal data. // { dg-require-effective-target c++11 } -// { dg-final { scan-assembler-not "\\.data" } } +// { dg-require-alias } +// { dg-final { scan-assembler-not "\\.data" { target tls_native } } } extern int&& ir; #pragma omp threadprivate (ir) diff --git a/gcc/testsuite/g++.dg/tls/static2.C b/gcc/testsuite/g++.dg/tls/static2.C new file mode 100644 index 0000000..ab688dd --- /dev/null +++ b/gcc/testsuite/g++.dg/tls/static2.C @@ -0,0 +1,18 @@ +// { dg-final { scan-assembler-not "_ZTHN1A1iE" } } +// { dg-final { scan-assembler-not "_ZTWN1A1iE" } } +// { dg-require-effective-target tls } + +struct A +{ + static __thread int i; +}; + +int +test () +{ + if (A::i != 8) + return 1; + + A::i = 17; + return 0; +} diff --git a/gcc/testsuite/g++.dg/tls/thread_local7.C b/gcc/testsuite/g++.dg/tls/thread_local7.C index 77a1c05..f453b96 100644 --- a/gcc/testsuite/g++.dg/tls/thread_local7.C +++ b/gcc/testsuite/g++.dg/tls/thread_local7.C @@ -2,7 +2,7 @@ // { dg-require-effective-target tls } // The reference temp should be TLS, not normal data. -// { dg-final { scan-assembler-not "\\.data" } } +// { dg-final { scan-assembler-not "\\.data" { target tls_native } } } void f() {