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 143973857BB5 for ; Thu, 26 May 2022 15:11:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 143973857BB5 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-607-bUpMk4Y4O-ydAmTIrMBHOw-1; Thu, 26 May 2022 11:11:14 -0400 X-MC-Unique: bUpMk4Y4O-ydAmTIrMBHOw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 01710100BAB7 for ; Thu, 26 May 2022 15:11:14 +0000 (UTC) Received: from blarsen.com (ovpn-116-42.gru2.redhat.com [10.97.116.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 290F32026D64; Thu, 26 May 2022 15:11:12 +0000 (UTC) From: Bruno Larsen To: gdb-patches@sourceware.org Subject: [PATCH v3 04/14] change gdb.base/nodebug.c to not fail with clang Date: Thu, 26 May 2022 12:10:31 -0300 Message-Id: <20220526151041.23223-5-blarsen@redhat.com> In-Reply-To: <20220526151041.23223-1-blarsen@redhat.com> References: <20220526151041.23223-1-blarsen@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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: Thu, 26 May 2022 15:11:17 -0000 Clang organizes the variables differently to gcc in the original version of this code, leading to the following differences when testing p (int*) &dataglobal + 1 gcc: $16 = (int *) 0x404034 clang: $16 = (int *) 0x404034 The code change to nodebug.c makes it so gcc and clang will place the same variable under dataglobal8, generating the same output. --- No change in v3. No change in v2. --- gdb/testsuite/gdb.base/nodebug.c | 2 +- gdb/testsuite/gdb.base/nodebug.exp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/gdb.base/nodebug.c b/gdb/testsuite/gdb.base/nodebug.c index c7bc93991b8..572255697bb 100644 --- a/gdb/testsuite/gdb.base/nodebug.c +++ b/gdb/testsuite/gdb.base/nodebug.c @@ -3,8 +3,8 @@ /* Test that things still (sort of) work when compiled without -g. */ -int dataglobal = 3; /* Should go in global data */ static int datalocal = 4; /* Should go in local data */ +int dataglobal = 3; /* Should go in global data */ int bssglobal; /* Should go in global bss */ static int bsslocal; /* Should go in local bss */ diff --git a/gdb/testsuite/gdb.base/nodebug.exp b/gdb/testsuite/gdb.base/nodebug.exp index 0dbd0ad153e..fbff6ecb395 100644 --- a/gdb/testsuite/gdb.base/nodebug.exp +++ b/gdb/testsuite/gdb.base/nodebug.exp @@ -187,7 +187,7 @@ if [nodebug_runto inner] then { {"dataglobal + 1" "" $dataglobal_unk_re $dataglobal_unk_re} {"&dataglobal" "" "\\($data_var_type \\*\\) $hex " " = $data_var_type \\*"} {"&dataglobal + 1" "" $ptr_math_re $ptr_math_re} - {"(int *) &dataglobal + 1" "" " = \\(int \\*\\) $hex " "int \\*"} + {"(int *) &dataglobal + 1" "" " = \\(int \\*\\) $hex " "int \\*"} {"&(int) dataglobal + 1" "" $not_mem_re $not_mem_re} {"&dataglobal, &dataglobal" "" "\\($data_var_type \\*\\) $hex " " = $data_var_type \\*"} {"*dataglobal" "" $dataglobal_unk_re $dataglobal_unk_re} -- 2.31.1