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 [63.128.21.124]) by sourceware.org (Postfix) with ESMTP id 6ED5F3857C74 for ; Wed, 16 Sep 2020 16:06:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 6ED5F3857C74 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-480-Te3kgrnUMVuiGAcJgP4BLg-1; Wed, 16 Sep 2020 12:06:02 -0400 X-MC-Unique: Te3kgrnUMVuiGAcJgP4BLg-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1B17383DBBE for ; Wed, 16 Sep 2020 16:06:02 +0000 (UTC) Received: from blade.nx (ovpn-115-39.ams2.redhat.com [10.36.115.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8FE3075141 for ; Wed, 16 Sep 2020 16:06:01 +0000 (UTC) Received: from blade.com (localhost [127.0.0.1]) by blade.nx (Postfix) with ESMTP id C224D816CCA9 for ; Wed, 16 Sep 2020 17:06:00 +0100 (BST) From: Gary Benson To: gdb-patches@sourceware.org Subject: [PATCH] Fix testcases using __attribute__((noclone)) with Clang Date: Wed, 16 Sep 2020 17:06:00 +0100 Message-Id: <1600272360-20954-1-git-send-email-gbenson@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII X-Spam-Status: No, score=-14.3 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org 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: , X-List-Received-Date: Wed, 16 Sep 2020 16:06:10 -0000 Hi all, 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. Checked on Fedora 32 x86_64, GCC and clang. Is this ok to commit? Cheers, Gary -- gdb/testsuite/ChangeLog: * lib/noclone.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/lib/noclone.h | 37 ++++++++++++++ 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 +- 5 files changed, 86 insertions(+), 36 deletions(-) create mode 100644 gdb/testsuite/lib/noclone.h diff --git a/gdb/testsuite/lib/noclone.h b/gdb/testsuite/lib/noclone.h new file mode 100644 index 0000000..b6a4aa7 --- /dev/null +++ b/gdb/testsuite/lib/noclone.h @@ -0,0 +1,37 @@ +/* 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 NOCLONE_H +#define NOCLONE_H + +#ifdef __cplusplus +extern "C" { +#endif + +#if __has_attribute(noclone) +# define ATTRIBUTE_NOCLONE __attribute__((noclone)) +#else +# define ATTRIBUTE_NOCLONE +#endif + +#ifdef __cplusplus +} +#endif + +#endif /* NOCLONE_H */ diff --git a/gdb/testsuite/gdb.base/backtrace.c b/gdb/testsuite/gdb.base/backtrace.c index bae8b1a..310a481 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/noclone.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..73f417d 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/noclone.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..4520f98 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/noclone.h" + int #ifdef NOCLONE -__attribute__((noinline, noclone)) +__attribute__((noinline)) ATTRIBUTE_NOCLONE #else __attribute__((noinline)) #endif -- 1.8.3.1