From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oa1-x2a.google.com (mail-oa1-x2a.google.com [IPv6:2001:4860:4864:20::2a]) by sourceware.org (Postfix) with ESMTPS id 0F04A385C413 for ; Tue, 30 Aug 2022 12:07:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0F04A385C413 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org Received: by mail-oa1-x2a.google.com with SMTP id 586e51a60fabf-11eb44f520dso11894737fac.10 for ; Tue, 30 Aug 2022 05:07:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc; bh=06B3ryeQKiYh9T6ToNeLbAFb7nhd48A809yTUCdeHDs=; b=Yaia2jvOe7qV7m71OznHTvBMDOX3M8LlpOGfgAFJx3RoWr5/7nwNXJrkQaaVrhc2lc jLDhu3uWzNTqrdMN0VhlwFpNwkQhAsE0FNOTy8nNoyP3DIawPLe5QCi5X+TP0nBmdOmZ 7OH4t/ze0peK+kW/9iUTDek1iM4a/EGdxfwcNKhr7js6lpI0UgvVyW40lOErX/pWMcNP dxGmMUm6zcS5Oz+U6zVkY3bU0w2jZZLB7NVMsefnPSNNUdubn9lX4fR0KDVgYwBeFxdO CYzHWL7s9ibCazNp7t8lKnNG0UCx/JMbzTf68TamT7Se4cSChVohgsslog60vSBrraku y/0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc; bh=06B3ryeQKiYh9T6ToNeLbAFb7nhd48A809yTUCdeHDs=; b=HlRy0nTw8l7128s/M+r4b4zpyR4tWlDWwn9qDceMuzunzGeIVbiVFAwY7mupaLcOR/ Pz67unDARYLid3nwHd1NzIv0u7exGM1RwxDPyywQB5FnEqeyRvOD/xUaKHCZO4LvYlQb BaC7imEpqu7a+Jm1U/AkK9qoSXk9J7L+CVfNjgds5yMW3nOSPqyvAKhORHrEF5ClhOks yEa+n7hqyaa0wG1Y3sASp+6p9Ls1CDhUqH7Gd/jFRugFuxEcGYwXpoAqHbzkojM5bmka PGrapYSr8PbE/OZpm1kJDsFFtCHiHwpNEbknTmtY4ILsD2IfF+0TVFubbPCMyQ84Ekgl b3ng== X-Gm-Message-State: ACgBeo0EwjGZlPKQDVjZy7DcLh+byALF4aRQzqqONuvhzDFWiVctX6a8 +qqAjMSQLCQHi7VpswjDC+rbw/WGw53P6w== X-Google-Smtp-Source: AA6agR4m5showzUr4EQLCsor68Nwk5e+Lh9FfDqqeIi7pRuW5PDczbsInlfCMHT9ZSCbiu+Rdp7Ngw== X-Received: by 2002:a05:6870:b28d:b0:10e:6805:b9c1 with SMTP id c13-20020a056870b28d00b0010e6805b9c1mr9625126oao.37.1661861267284; Tue, 30 Aug 2022 05:07:47 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c0:745e:31d8:f463:7d91:9d28]) by smtp.gmail.com with ESMTPSA id u187-20020acaabc4000000b00342df642fd3sm5984684oie.48.2022.08.30.05.07.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 05:07:46 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH] nptl: x86_64: Use same code for CURRENT_STACK_FRAME and stackinfo_get_sp Date: Tue, 30 Aug 2022 09:07:43 -0300 Message-Id: <20220830120743.1072319-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,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 List-Id: It avoids the possible warning of uninitialized 'frame' variable when building with clang: ../sysdeps/nptl/jmp-unwind.c:27:42: error: variable 'frame' is uninitialized when used here [-Werror,-Wuninitialized] __pthread_cleanup_upto (env->__jmpbuf, CURRENT_STACK_FRAME); The resulting code is similar to CURRENT_STACK_FRAME. Checked on x86_64-linux-gnu. --- sysdeps/x86/nptl/pthreaddef.h | 4 +++- sysdeps/x86_64/stackinfo.h | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sysdeps/x86/nptl/pthreaddef.h b/sysdeps/x86/nptl/pthreaddef.h index 63fdbcb27c..7df65931a3 100644 --- a/sysdeps/x86/nptl/pthreaddef.h +++ b/sysdeps/x86/nptl/pthreaddef.h @@ -42,7 +42,9 @@ #ifdef __x86_64__ /* The frame pointer is not usable. */ # define CURRENT_STACK_FRAME \ - ({ register char *frame __asm__("rsp"); frame; }) + ({ register void * p__ __asm__(RSP_REG); \ + asm volatile("" : "=r" (p__)); \ + p__; }) #else # define CURRENT_STACK_FRAME __builtin_frame_address (0) #endif diff --git a/sysdeps/x86_64/stackinfo.h b/sysdeps/x86_64/stackinfo.h index 34c9d0b576..7354632132 100644 --- a/sysdeps/x86_64/stackinfo.h +++ b/sysdeps/x86_64/stackinfo.h @@ -40,7 +40,9 @@ for which they need to act as barriers as well, hence the additional (unnecessary) parameters. */ #define stackinfo_get_sp() \ - ({ void *p__; asm volatile ("mov %%" RSP_REG ", %0" : "=r" (p__)); p__; }) + ({ register void * p__ __asm__(RSP_REG); \ + asm volatile("" : "=r" (p__)); \ + p__; }) #define stackinfo_sub_sp(ptr) \ ({ ptrdiff_t d__; \ asm volatile ("sub %%" RSP_REG " , %0" : "=r" (d__) : "0" (ptr)); \ -- 2.34.1