From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-yb1-xb34.google.com (mail-yb1-xb34.google.com [IPv6:2607:f8b0:4864:20::b34]) by sourceware.org (Postfix) with ESMTPS id EFB193858C50 for ; Sun, 5 Feb 2023 22:55:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EFB193858C50 Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=google.com Received: by mail-yb1-xb34.google.com with SMTP id g2so12033031ybk.8 for ; Sun, 05 Feb 2023 14:55:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=bYCQgm2W0c83SnpyAU0XYH3giGBSJyScEmdWjTLZvUg=; b=heQ3Ozs19hFmOCYvwkwEHSmogkl9eA0QLhoE/2/9I8F03BN4mbNvhIWcHJZ9d4Hogv ///D6WAnmxAbF0K1nVspaa7BP1zKspqCbI35cqZDANmuVkg1DEpQzNp+CT/10NPsKw/4 o2jl4V4vTtX5frFtTnTsP8FjXHhCM3z40WNVVhrVLKxOdTEbGQndDJjUL8fHmE6Y0nTs 48h8bgdPtCJ4rgJKHkW5Mhi3HoVA8ygkjNqCcglfvALtOmHPtAvEkQ7ZRkLfpnww54cp gAP72E4scu8avc7AhjuqhVjY2OJz1VPWS+AaOGufiiLW6lL3ryiHfoiz2bqrvFYCZvKp z9/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=bYCQgm2W0c83SnpyAU0XYH3giGBSJyScEmdWjTLZvUg=; b=gQueeU2AClQ57CmYFEPT71CEaWYDdYBCokZ+xTamDw5qRm7DD54fT8YtnulxQnozku NfIQ9XKsW0th+yvWAqs2eiNBnWQHXCHLRDFgUlkicVXjRpVcHXr+akYiXNLA1REnI7U8 2XjEf1SWeB5QMlldXxYcHABzIhTh8o4lAZIDVvX1PQUYyhlehLYZqXBzmizYIBP20nOi PHLFsJKQwm8/AKVR+66I+B3S04XC0FbVkIRHOuGGtukryn+28cIVYj90I+JTyhTDWDJW BJj0fm8y+w+PEPm3aX2/vxVJ6e7uwkMSQM/uhTG21AAxfWkcQwrX2ygmId9LtJUZAHTL Darg== X-Gm-Message-State: AO0yUKWgBjQqVDW1jRaJYhbIvdKN80Y7Gh0zRxHY6Vt9etNAjnHZq571 ArYBWLzq2Frzgcfched53pafcQxRdhUBEyH+V9o0kg== X-Google-Smtp-Source: AK7set8t+bMxw+wT5kEBVKQ4kRc+1Sg3QYukI/x5pl/2YZBGuqTJy/QTk/cleSgm5V0ThW4R7Spwh8ZJL0ViLVoD0Ro= X-Received: by 2002:a05:6902:8e:b0:883:c8f9:64df with SMTP id h14-20020a056902008e00b00883c8f964dfmr606552ybs.295.1675637740985; Sun, 05 Feb 2023 14:55:40 -0800 (PST) MIME-Version: 1.0 References: <871qnlfhtv.fsf@oldenburg.str.redhat.com> <20230124111019.GC3298@brightrain.aerifal.cx> <878rhsgoxn.fsf@oldenburg.str.redhat.com> <20230124112307.GE3298@brightrain.aerifal.cx> <87zga8f83f.fsf@oldenburg.str.redhat.com> <871qn3yix8.fsf@oldenburg.str.redhat.com> <87o7q7wxli.fsf@oldenburg.str.redhat.com> In-Reply-To: <87o7q7wxli.fsf@oldenburg.str.redhat.com> From: Paul Pluzhnikov Date: Sun, 5 Feb 2023 14:55:10 -0800 Message-ID: Subject: Re: [patch] Use __builtin_FILE and __builtin_LINE in assert implementation in C++ To: Florian Weimer Cc: Jonathan Wakely , Szabolcs Nagy , Rich Felker , Paul Pluzhnikov via Libc-alpha Content-Type: multipart/mixed; boundary="0000000000005377ff05f3fbd01f" X-Spam-Status: No, score=-24.7 required=5.0 tests=BAYES_00,DKIMWL_WL_MED,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,ENV_AND_HDR_SPF_MATCH,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,USER_IN_DEF_DKIM_WL,USER_IN_DEF_SPF_WL 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: --0000000000005377ff05f3fbd01f Content-Type: text/plain; charset="UTF-8" On Sun, Feb 5, 2023 at 2:34 PM Florian Weimer wrote: > > * Paul Pluzhnikov: > > > +# if __has_builtin(__builtin_FILE) > > +# define __ASSERT_FILE __builtin_FILE() > > +# define __ASSERT_LINE __builtin_LINE() I picked __ASSERT_FILE to match (already used) __ASSERT_FUNCTION. Mixing __glibc_assert_file with __ASSERT_FUNCTION creates a cognitive dissonance for me. How strongly do you feel about this? > __has_builtin itself needs to be conditionalized. 8-( Revised patch attached. Thanks, -- Paul Pluzhnikov --0000000000005377ff05f3fbd01f Content-Type: text/plain; charset="US-ASCII"; name="assert-patch-20230205a.txt" Content-Disposition: attachment; filename="assert-patch-20230205a.txt" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_ldrzegkg0 ZGlmZiAtLWdpdCBhL2Fzc2VydC9hc3NlcnQuaCBiL2Fzc2VydC9hc3NlcnQuaAppbmRleCA3MjIw OWJjNWU3Li5hMjhhZDQ4NWU5IDEwMDY0NAotLS0gYS9hc3NlcnQvYXNzZXJ0LmgKKysrIGIvYXNz ZXJ0L2Fzc2VydC5oCkBAIC04NiwxMCArODYsMjEgQEAgX19FTkRfREVDTFMKICAgIHBhcmVudGhl c2VzIGFyb3VuZCBFWFBSLiAgT3RoZXJ3aXNlLCB0aG9zZSBhZGRlZCBwYXJlbnRoZXNlcyB3b3Vs ZAogICAgc3VwcHJlc3Mgd2FybmluZ3Mgd2UnZCBleHBlY3QgdG8gYmUgZGV0ZWN0ZWQgYnkgZ2Nj J3MgLVdwYXJlbnRoZXNlcy4gICovCiAjIGlmIGRlZmluZWQgX19jcGx1c3BsdXMKKyMgIGlmIGRl ZmluZWQoX19oYXNfYnVpbHRpbikKKyMgICBpZiBfX2hhc19idWlsdGluKF9fYnVpbHRpbl9GSUxF KQorIyAgICBkZWZpbmUgX19BU1NFUlRfRklMRSBfX2J1aWx0aW5fRklMRSgpCisjICAgIGRlZmlu ZSBfX0FTU0VSVF9MSU5FIF9fYnVpbHRpbl9MSU5FKCkKKyMgICBlbmRpZgorIyAgZW5kaWYKKyMg IGlmICFkZWZpbmVkKF9fQVNTRVJUX0ZJTEUpCisjICAgZGVmaW5lIF9fQVNTRVJUX0ZJTEUgX19G SUxFX18KKyMgICBkZWZpbmUgX19BU1NFUlRfTElORSBfX0xJTkVfXworIyAgZW5kaWYKICMgIGRl ZmluZSBhc3NlcnQoZXhwcikJCQkJCQkJXAogICAgICAoc3RhdGljX2Nhc3QgPGJvb2w+IChleHBy KQkJCQkJCVwKICAgICAgID8gdm9pZCAoMCkJCQkJCQkJXAotICAgICAgOiBfX2Fzc2VydF9mYWls ICgjZXhwciwgX19GSUxFX18sIF9fTElORV9fLCBfX0FTU0VSVF9GVU5DVElPTikpCisgICAgICA6 IF9fYXNzZXJ0X2ZhaWwgKCNleHByLCBfX0FTU0VSVF9GSUxFLCBfX0FTU0VSVF9MSU5FLCAgICAg ICAgICAgICBcCisgICAgICAgICAgICAgICAgICAgICAgIF9fQVNTRVJUX0ZVTkNUSU9OKSkKICMg ZWxpZiAhZGVmaW5lZCBfX0dOVUNfXyB8fCBkZWZpbmVkIF9fU1RSSUNUX0FOU0lfXwogIyAgZGVm aW5lIGFzc2VydChleHByKQkJCQkJCQlcCiAgICAgKChleHByKQkJCQkJCQkJXAo= --0000000000005377ff05f3fbd01f--