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 B2F003858425 for ; Thu, 22 Dec 2022 21:40:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B2F003858425 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671745254; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gKFVkzRwLwnGwrJQ/N92AWK8AH41pDZ/1g+f1lMNZ+Q=; b=cq7qynaxDQ9+SRLSha0TMfl6IO5LMhsBMaIEKxxVnxoewQjPPcT2iUYz0eA0B0DUnRDI+K +l+l40TUihLUN5PrYYbjD9amNFdD4oabSK0Ss+xK7CdWVY2uh33V4NbdBH4vFXBH/C4g7w Mvj8ZG9kQdkHWUKgm9G1rqn9YOisqwk= Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-615-MlZm9EmrNBOtx26LFkDx_g-1; Thu, 22 Dec 2022 16:40:52 -0500 X-MC-Unique: MlZm9EmrNBOtx26LFkDx_g-1 Received: by mail-qt1-f199.google.com with SMTP id j26-20020ac84c9a000000b003a7e6d38e01so1247623qtv.14 for ; Thu, 22 Dec 2022 13:40:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=gKFVkzRwLwnGwrJQ/N92AWK8AH41pDZ/1g+f1lMNZ+Q=; b=a+PRXc9insec6bEkUgyKnhBStWRls565FSXZz8/Y6R4vEWYIpCqXRXCQIzjFebsEWQ W3URExP+xvXBEwz/RoNNgmkh0CIZ6iWmqccE5AS+6xk7QF05c4eArVBWUPCRZQnK/gW+ gGyvvCkpnxrmJQkwMVhF71W5V+59oWHFmzUBZQ5QVQurF101NX2vbriJn0GTolvpVuSo V5z5uRQGQzc+G/SC3+ny2x1sy8P7GXaWbkDUXWNdseuAKVQjno5Lhwg9yHp2HfEbdYxt FRCcx14D3xiIHmFHCWi+taJyx5QZYlk9n1r106f8o6o93sq13576XweAmn1wtIdbR79K ZLww== X-Gm-Message-State: AFqh2koGMPeFMobKsSl8T0pNVqsRfpE5/EESpTExlogG159dNhSsiNAZ puX1xSMdFDq+lNZsp9sloswS/qnHHXUw4jGO9tosWFQ1pydCGsMaf8cbnpKsztAXV8RLRtlta++ FVAvk2z9dRwmoalU= X-Received: by 2002:a05:6214:5c8a:b0:4c7:5f2b:5d0 with SMTP id lj10-20020a0562145c8a00b004c75f2b05d0mr27276357qvb.32.1671745252324; Thu, 22 Dec 2022 13:40:52 -0800 (PST) X-Google-Smtp-Source: AMrXdXsYfjf1NXt4r4lDc+XtWewBqiq7th/YnKUHyFY0SwP77aS0Iq3X8d7A8VUNPtMBpwNruJD0aw== X-Received: by 2002:a05:6214:5c8a:b0:4c7:5f2b:5d0 with SMTP id lj10-20020a0562145c8a00b004c75f2b05d0mr27276335qvb.32.1671745251994; Thu, 22 Dec 2022 13:40:51 -0800 (PST) Received: from [192.168.1.108] (130-44-159-43.s15913.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.159.43]) by smtp.gmail.com with ESMTPSA id pj8-20020a05620a1d8800b006cfc7f9eea0sm940299qkn.122.2022.12.22.13.40.50 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 22 Dec 2022 13:40:51 -0800 (PST) Message-ID: <3ebc61d5-f662-7064-8b03-d7689cd1bb4a@redhat.com> Date: Thu, 22 Dec 2022 16:40:50 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.5.1 Subject: Re: [PATCH 1/3] libstdc++: Improve output of default contract violation handler [PR107792] To: =?UTF-8?Q?Arsen_Arsenovi=c4=87?= Cc: gcc-patches@gcc.gnu.org, jwakely@redhat.com, libstdc++@gcc.gnu.org References: <20221222110306.3869396-1-arsen@aarsen.me> From: Jason Merrill In-Reply-To: <20221222110306.3869396-1-arsen@aarsen.me> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP 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: On 12/22/22 06:03, Arsen Arsenović wrote: > From: Jonathan Wakely > > Make the output more readable. Don't output anything unless verbose > termination is enabled at configure-time. LGTM if Jonathan agrees. The testsuite changes should be applied in the same commit. > libstdc++-v3/ChangeLog: > > PR libstdc++/107792 > PR libstdc++/107778 > * src/experimental/contract.cc (handle_contract_violation): Make > output more readable. > --- > Heh, wouldn't be me if I forgot nothing. Sorry about that. > > How's this? > > libstdc++-v3/src/experimental/contract.cc | 50 ++++++++++++++++++----- > 1 file changed, 39 insertions(+), 11 deletions(-) > > diff --git a/libstdc++-v3/src/experimental/contract.cc b/libstdc++-v3/src/experimental/contract.cc > index c8d2697eddc..2d41a6326cf 100644 > --- a/libstdc++-v3/src/experimental/contract.cc > +++ b/libstdc++-v3/src/experimental/contract.cc > @@ -1,4 +1,5 @@ > // -*- C++ -*- std::experimental::contract_violation and friends > + > // Copyright (C) 2019-2022 Free Software Foundation, Inc. > // > // This file is part of GCC. > @@ -23,19 +24,46 @@ > // . > > #include > -#include > +#if _GLIBCXX_HOSTED && _GLIBCXX_VERBOSE > +# include > +#endif > > __attribute__ ((weak)) void > handle_contract_violation (const std::experimental::contract_violation &violation) > { > - std::cerr << "default std::handle_contract_violation called: \n" > - << " " << violation.file_name() > - << " " << violation.line_number() > - << " " << violation.function_name() > - << " " << violation.comment() > - << " " << violation.assertion_level() > - << " " << violation.assertion_role() > - << " " << (int)violation.continuation_mode() > - << std::endl; > +#if _GLIBCXX_HOSTED && _GLIBCXX_VERBOSE > + bool level_default_p = violation.assertion_level() == "default"; > + bool role_default_p = violation.assertion_role() == "default"; > + bool cont_mode_default_p = violation.continuation_mode() > + == std::experimental::contract_violation_continuation_mode::never_continue; > + > + const char* modes[]{ "off", "on" }; // Must match enumerators in header. > + std::cerr << "contract violation in function " << violation.function_name() > + << " at " << violation.file_name() << ':' << violation.line_number() > + << ": " << violation.comment(); > + > + const char* delimiter = "\n["; > + > + if (!level_default_p) > + { > + std::cerr << delimiter << "level:" << violation.assertion_level(); > + delimiter = ", "; > + } > + if (!role_default_p) > + { > + std::cerr << delimiter << "role:" << violation.assertion_role(); > + delimiter = ", "; > + } > + if (!cont_mode_default_p) > + { > + std::cerr << delimiter << "continue:" > + << modes[(int)violation.continuation_mode() & 1]; > + delimiter = ", "; > + } > + > + if (delimiter[0] == ',') > + std::cerr << ']'; > + > + std::cerr << std::endl; > +#endif > } > -