From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id y3M2ImH0n198DAAAWB0awg (envelope-from ) for ; Mon, 02 Nov 2020 06:58:25 -0500 Received: by simark.ca (Postfix, from userid 112) id 816341F08B; Mon, 2 Nov 2020 06:58:25 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (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 simark.ca (Postfix) with ESMTPS id 966451E58E for ; Mon, 2 Nov 2020 06:58:23 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 47340384BC3C; Mon, 2 Nov 2020 11:58:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 47340384BC3C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1604318302; bh=W5OCYYMJdl6RhaW2q8d9QovDSaMNfm3LxeoXbavsDMY=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=J59+svEjUsZRkVCuTdRIPKVo0kVeJ10v6Hf2BhYZNHTTK3fbYciaMgR8k4SRUqk95 ATOAtSduIBK3qarO83qtH7iv2jPmwGe0QYob2yFiFoSXjdy4D16XvWYnjH83Ki6YfI Kxfpux5RGQPevi11CRqvGYbg42wVdIXZY33semz8= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by sourceware.org (Postfix) with ESMTP id 14B07384BC3C for ; Mon, 2 Nov 2020 11:58:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 14B07384BC3C Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-408-MVkVozwrOrW_dSPK9jBeaA-1; Mon, 02 Nov 2020 06:58:13 -0500 X-MC-Unique: MVkVozwrOrW_dSPK9jBeaA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2D9F1101F7A2; Mon, 2 Nov 2020 11:58:12 +0000 (UTC) Received: from blade.nx (ovpn-115-15.ams2.redhat.com [10.36.115.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9C65E672C0; Mon, 2 Nov 2020 11:58:11 +0000 (UTC) Received: from blade.com (localhost [127.0.0.1]) by blade.nx (Postfix) with ESMTP id 8B709816CD2E; Mon, 2 Nov 2020 11:58:10 +0000 (GMT) To: gdb-patches@sourceware.org Subject: Re: [PATCH] Fix testcases using __attribute__((noclone)) with Clang Date: Mon, 2 Nov 2020 11:58:09 +0000 Message-Id: <1604318289-20432-1-git-send-email-gbenson@redhat.com> In-Reply-To: <5b045172-9175-e20d-ceff-89c3d44953a0@palves.net> References: <5b045172-9175-e20d-ceff-89c3d44953a0@palves.net> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="US-ASCII" X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Gary Benson via Gdb-patches Reply-To: Gary Benson Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" Clang fails to compile a number of files with the following warning: unknown attribute 'noclone' ignored [-Wunknown-attributes]. This commit adds a new header, lib/noclone.h, which defines the macro ATTRIBUTE_NOCLONE accordingly, and updates the relevant testcases to use it. gdb/testsuite/ChangeLog: * lib/attributes.h: New header. * gdb.base/backtrace.c: Include the above. Replace __attribute__(noclone)) with ATTRIBUTE_NOCLONE. * gdb.base/infcall-nested-structs.c: Likewise. * gdb.base/vla-optimized-out.c: Likewise. --- gdb/testsuite/ChangeLog | 8 +++ gdb/testsuite/gdb.base/backtrace.c | 8 +-- gdb/testsuite/gdb.base/infcall-nested-structs.c | 65 +++++++++++++------------ gdb/testsuite/gdb.base/vla-optimized-out.c | 4 +- gdb/testsuite/lib/attributes.h | 40 +++++++++++++++ 5 files changed, 89 insertions(+), 36 deletions(-) create mode 100644 gdb/testsuite/lib/attributes.h diff --git a/gdb/testsuite/gdb.base/backtrace.c b/gdb/testsuite/gdb.base/backtrace.c index bae8b1a..ce63e33 100644 --- a/gdb/testsuite/gdb.base/backtrace.c +++ b/gdb/testsuite/gdb.base/backtrace.c @@ -15,19 +15,21 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -int __attribute__((noinline,noclone)) +#include "../lib/attributes.h" + +int __attribute__((noinline)) ATTRIBUTE_NOCLONE baz () { return 0; /* Break here. */ } -int __attribute__((noinline,noclone)) +int __attribute__((noinline)) ATTRIBUTE_NOCLONE bar () { return baz (); } -int __attribute__((noinline,noclone)) +int __attribute__((noinline)) ATTRIBUTE_NOCLONE foo () { return bar (); diff --git a/gdb/testsuite/gdb.base/infcall-nested-structs.c b/gdb/testsuite/gdb.base/infcall-nested-structs.c index c0c8e19..ee347d4 100644 --- a/gdb/testsuite/gdb.base/infcall-nested-structs.c +++ b/gdb/testsuite/gdb.base/infcall-nested-structs.c @@ -33,6 +33,7 @@ in the structs.exp test script. */ #include +#include "../lib/attributes.h" /* Useful abreviations. */ typedef char tc; @@ -51,13 +52,13 @@ #endif /* TEST_COMPLEX */ #define MAKE_CHECK_FUNCS(TYPE) \ - int __attribute__((noinline,noclone)) \ + int __attribute__((noinline)) ATTRIBUTE_NOCLONE \ check_arg_ ## TYPE (struct TYPE arg) \ { \ return cmp_ ## TYPE (arg, ref_val_ ## TYPE); \ } \ \ - struct TYPE __attribute__((noinline,noclone)) \ + struct TYPE __attribute__((noinline)) ATTRIBUTE_NOCLONE \ rtn_str_ ## TYPE (void) \ { \ return (ref_val_ ## TYPE); \ @@ -128,141 +129,141 @@ #endif -int __attribute__((noinline,noclone)) +int __attribute__((noinline)) ATTRIBUTE_NOCLONE cmp_struct_01_01 (struct struct_01_01 a, struct struct_01_01 b) { return a.s2.s1.a == b.s2.s1.a; } -int __attribute__((noinline,noclone)) +int __attribute__((noinline)) ATTRIBUTE_NOCLONE cmp_struct_01_02 (struct struct_01_02 a, struct struct_01_02 b) { return a.a == b.a; } -int __attribute__((noinline,noclone)) +int __attribute__((noinline)) ATTRIBUTE_NOCLONE cmp_struct_01_03 (struct struct_01_03 a, struct struct_01_03 b) { return a.s4.s3.a == b.s4.s3.a; } -int __attribute__((noinline,noclone)) +int __attribute__((noinline)) ATTRIBUTE_NOCLONE cmp_struct_01_04 (struct struct_01_04 a, struct struct_01_04 b) { return a.a == b.a; } -int __attribute__((noinline,noclone)) +int __attribute__((noinline)) ATTRIBUTE_NOCLONE cmp_struct_02_01 (struct struct_02_01 a, struct struct_02_01 b) { return a.s2.s1.a == b.s2.s1.a && a.s2.s1.b == b.s2.s1.b; } -int __attribute__((noinline,noclone)) +int __attribute__((noinline)) ATTRIBUTE_NOCLONE cmp_struct_02_02 (struct struct_02_02 a, struct struct_02_02 b) { return a.a == b.a && a.b == b.b; } -int __attribute__((noinline,noclone)) +int __attribute__((noinline)) ATTRIBUTE_NOCLONE cmp_struct_02_03 (struct struct_02_03 a, struct struct_02_03 b) { return a.s4.s3.a == b.s4.s3.a && a.s6.s5.b == b.s6.s5.b; } -int __attribute__((noinline,noclone)) +int __attribute__((noinline)) ATTRIBUTE_NOCLONE cmp_struct_02_04 (struct struct_02_04 a, struct struct_02_04 b) { return a.a == b.a && a.b == b.b; } -int __attribute__((noinline,noclone)) +int __attribute__((noinline)) ATTRIBUTE_NOCLONE cmp_struct_04_01 (struct struct_04_01 a, struct struct_04_01 b) { return a.s2.s1.a == b.s2.s1.a && a.s2.s1.b == b.s2.s1.b && a.s2.s1.c == b.s2.s1.c && a.s2.s1.d == b.s2.s1.d; } -int __attribute__((noinline,noclone)) +int __attribute__((noinline)) ATTRIBUTE_NOCLONE cmp_struct_04_02 (struct struct_04_02 a, struct struct_04_02 b) { return a.a == b.a && a.b == b.b && a.c == b.c && a.d == b.d; } -int __attribute__((noinline,noclone)) +int __attribute__((noinline)) ATTRIBUTE_NOCLONE cmp_struct_04_03 (struct struct_04_03 a, struct struct_04_03 b) { return a.s4.s3.a == b.s4.s3.a && a.s6.s5.b == b.s6.s5.b && a.s8.s7.c == b.s8.s7.c && a.s10.s9.d == b.s10.s9.d; } -int __attribute__((noinline,noclone)) +int __attribute__((noinline)) ATTRIBUTE_NOCLONE cmp_struct_04_04 (struct struct_04_04 a, struct struct_04_04 b) { return a.a == b.a && a.b == b.b && a.c == b.c && a.d == b.d; } -int __attribute__((noinline,noclone)) +int __attribute__((noinline)) ATTRIBUTE_NOCLONE cmp_struct_05_01 (struct struct_05_01 a, struct struct_05_01 b) { return a.s2.s1.a == b.s2.s1.a && a.s2.s1.b == b.s2.s1.b && a.s2.s1.c == b.s2.s1.c && a.s2.s1.d == b.s2.s1.d && a.s2.s1.e == b.s2.s1.e; } -int __attribute__((noinline,noclone)) +int __attribute__((noinline)) ATTRIBUTE_NOCLONE cmp_struct_05_02 (struct struct_05_02 a, struct struct_05_02 b) { return a.a == b.a && a.b == b.b && a.c == b.c && a.d == b.d && a.e == b.e; } -int __attribute__((noinline,noclone)) +int __attribute__((noinline)) ATTRIBUTE_NOCLONE cmp_struct_05_03 (struct struct_05_03 a, struct struct_05_03 b) { return a.s4.s3.a == b.s4.s3.a && a.s6.s5.b == b.s6.s5.b && a.s8.s7.c == b.s8.s7.c && a.s10.s9.d == b.s10.s9.d && a.s12.s11.e == b.s12.s11.e; } -int __attribute__((noinline,noclone)) +int __attribute__((noinline)) ATTRIBUTE_NOCLONE cmp_struct_05_04 (struct struct_05_04 a, struct struct_05_04 b) { return a.a == b.a && a.b == b.b && a.c == b.c && a.d == b.d && a.e == b.e; } #ifdef __cplusplus -int __attribute__((noinline,noclone)) +int __attribute__((noinline)) ATTRIBUTE_NOCLONE cmp_struct_static_02_01 (struct struct_static_02_01 a, struct struct_static_02_01 b) { return a.s2.s1.a == b.s2.s1.a && a.s2.s1.b == b.s2.s1.b; } -int __attribute__((noinline,noclone)) +int __attribute__((noinline)) ATTRIBUTE_NOCLONE cmp_struct_static_02_02 (struct struct_static_02_02 a, struct struct_static_02_02 b) { return a.a == b.a && a.b == b.b; } -int __attribute__((noinline,noclone)) +int __attribute__((noinline)) ATTRIBUTE_NOCLONE cmp_struct_static_02_03 (struct struct_static_02_03 a, struct struct_static_02_03 b) { return a.s4.s3.a == b.s4.s3.a && a.s6.s5.b == b.s6.s5.b; } -int __attribute__((noinline,noclone)) +int __attribute__((noinline)) ATTRIBUTE_NOCLONE cmp_struct_static_02_04 (struct struct_static_02_04 a, struct struct_static_02_04 b) { return a.a == b.a && a.b == b.b; } -int __attribute__((noinline,noclone)) +int __attribute__((noinline)) ATTRIBUTE_NOCLONE cmp_struct_static_04_01 (struct struct_static_04_01 a, struct struct_static_04_01 b) { return a.s2.s1.a == b.s2.s1.a && a.s2.s1.b == b.s2.s1.b && a.s2.s1.c == b.s2.s1.c && a.s2.s1.d == b.s2.s1.d; } -int __attribute__((noinline,noclone)) +int __attribute__((noinline)) ATTRIBUTE_NOCLONE cmp_struct_static_04_02 (struct struct_static_04_02 a, struct struct_static_04_02 b) { return a.a == b.a && a.b == b.b && a.c == b.c && a.d == b.d; } -int __attribute__((noinline,noclone)) +int __attribute__((noinline)) ATTRIBUTE_NOCLONE cmp_struct_static_04_03 (struct struct_static_04_03 a, struct struct_static_04_03 b) { return a.s4.s3.a == b.s4.s3.a && a.s6.s5.b == b.s6.s5.b && a.s8.s7.c == b.s8.s7.c && a.s10.s9.d == b.s10.s9.d; } -int __attribute__((noinline,noclone)) +int __attribute__((noinline)) ATTRIBUTE_NOCLONE cmp_struct_static_04_04 (struct struct_static_04_04 a, struct struct_static_04_04 b) { return a.a == b.a && a.b == b.b && a.c == b.c && a.d == b.d; } -int __attribute__((noinline,noclone)) +int __attribute__((noinline)) ATTRIBUTE_NOCLONE cmp_struct_static_06_01 (struct struct_static_06_01 a, struct struct_static_06_01 b) { return a.s2.s1.a == b.s2.s1.a && a.s2.s1.b == b.s2.s1.b && a.s2.s1.c == b.s2.s1.c && a.s2.s1.d == b.s2.s1.d && a.s2.s1.e == b.s2.s1.e && a.f == b.f; } -int __attribute__((noinline,noclone)) +int __attribute__((noinline)) ATTRIBUTE_NOCLONE cmp_struct_static_06_02 (struct struct_static_06_02 a, struct struct_static_06_02 b) { return a.a == b.a && a.b == b.b && a.c == b.c && a.d == b.d && a.e == b.e && a.f == b.f; } -int __attribute__((noinline,noclone)) +int __attribute__((noinline)) ATTRIBUTE_NOCLONE cmp_struct_static_06_03 (struct struct_static_06_03 a, struct struct_static_06_03 b) { return a.s4.s3.a == b.s4.s3.a && a.s6.s5.b == b.s6.s5.b && a.s8.s7.c == b.s8.s7.c && a.s10.s9.d == b.s10.s9.d && a.s12.s11.e == b.s12.s11.e && a.s12.s11.f == b.s12.s11.f; } -int __attribute__((noinline,noclone)) +int __attribute__((noinline)) ATTRIBUTE_NOCLONE cmp_struct_static_06_04 (struct struct_static_06_04 a, struct struct_static_06_04 b) { return a.a == b.a && a.b == b.b && a.c == b.c && a.d == b.d && a.e == b.e @@ -366,7 +367,7 @@ int __attribute__((noinline,noclone)) #define CALL_LINE(NAME) val += check_arg_ ## NAME (rtn_str_ ## NAME ()) -int __attribute__((noinline,noclone)) +int __attribute__((noinline)) ATTRIBUTE_NOCLONE call_all () { int val = 0; @@ -407,7 +408,7 @@ int __attribute__((noinline,noclone)) int volatile v = 1; -void __attribute__((noinline, noclone)) +void __attribute__((noinline)) ATTRIBUTE_NOCLONE breakpt (void) { v++; diff --git a/gdb/testsuite/gdb.base/vla-optimized-out.c b/gdb/testsuite/gdb.base/vla-optimized-out.c index edc2b5e..d21df7a 100644 --- a/gdb/testsuite/gdb.base/vla-optimized-out.c +++ b/gdb/testsuite/gdb.base/vla-optimized-out.c @@ -18,9 +18,11 @@ /* The version of this test-case with f1 tagged with noinline only is equivalent to gcc/testsuite/gcc.dg/guality/vla-1.c. */ +#include "../lib/attributes.h" + int #ifdef NOCLONE -__attribute__((noinline, noclone)) +__attribute__((noinline)) ATTRIBUTE_NOCLONE #else __attribute__((noinline)) #endif diff --git a/gdb/testsuite/lib/attributes.h b/gdb/testsuite/lib/attributes.h new file mode 100644 index 0000000..b66567c --- /dev/null +++ b/gdb/testsuite/lib/attributes.h @@ -0,0 +1,40 @@ +/* This file is part of GDB, the GNU debugger. + + Copyright (C) 2020 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +/* Compatibility macro for __attribute__((noclone)). */ + +#ifndef ATTRIBUTES_H +#define ATTRIBUTES_H + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __has_attribute +# if !__has_attribute (noclone) +# define ATTRIBUTE_NOCLONE +# endif +#endif +#ifndef ATTRIBUTE_NOCLONE +# define ATTRIBUTE_NOCLONE __attribute__((noclone)) +#endif + +#ifdef __cplusplus +} +#endif + +#endif /* ATTRIBUTES_H */ -- 1.8.3.1