From patchwork Mon Oct 10 12:17:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 680382 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sszfr72ylz9s65 for ; Mon, 10 Oct 2016 23:18:12 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=An4FSCUm; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:mime-version:content-type; q=dns; s= default; b=j0Nv8Wxzvt1Hm4tVW9XOSKMaw5GIKch6fXqjSuVrBLtuj9KPNoo8r 9AdHc7R3rFkI1zZXHIut+aEwJ5qN1JLTxt97mb7iuydK0KyKoIIEXpwOPrRgu8pt 4Uv3UYl4pvFiCSPAy1gVEah7NxuJGssZ6yGodQDR5Bbc9lc8V3S1mM= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:mime-version:content-type; s= default; bh=cXnwzC3rVmdRf42deBhx4MyBL5U=; b=An4FSCUmAQN+cdPhI73j amgaZyqBbuCoq9bKiuBTLG0UuFFrYB8bVlH6IfVgS5ScpH0sbqaXFfQ2iF/Q1m8V nrpnekWKOKgOTG5sfn00aUeGXqLfrqjD3VL2LJneOz+h2xqDLbJdZJ82e2T6Z+ci 1TIDl1ECg2Sm4SRPKexVDhU= Received: (qmail 12101 invoked by alias); 10 Oct 2016 12:17:54 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 11546 invoked by uid 89); 10 Oct 2016 12:17:53 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.2 required=5.0 tests=BAYES_00, KAM_LAZY_DOMAIN_SECURITY, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=no version=3.3.2 spammy=Ready, user-friendly, userfriendly, 6910 X-Spam-User: qpsmtpd, 2 recipients X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 10 Oct 2016 12:17:43 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B05957EA82; Mon, 10 Oct 2016 12:17:42 +0000 (UTC) Received: from localhost (ovpn-116-122.ams2.redhat.com [10.36.116.122]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u9ACHf14001159; Mon, 10 Oct 2016 08:17:42 -0400 Date: Mon, 10 Oct 2016 13:17:41 +0100 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [PATCH] LWG 2733, LWG 2759 reject bool in gcd and lcm Message-ID: <20161010121741.GA7961@redhat.com> MIME-Version: 1.0 Content-Disposition: inline X-Clacks-Overhead: GNU Terry Pratchett User-Agent: Mutt/1.7.0 (2016-08-17) These DRs are only in Tentatively Ready status, but they're not controversial so implementing them immediately seems sensible. The deleted function is sufficient, but the static assertions are more user-friendly (and are only tested once, not in every recursive call to __gcd or __lcm). * include/experimental/numeric (gcd, lcm): Make bool arguments ill-formed. * include/std/numeric (gcd, lcm): Likewise. * testsuite/26_numerics/gcd/gcd_neg.cc: New test. * testsuite/26_numerics/lcm/lcm_neg.cc: New test. Tested x86_64-linux, committed to trunk. commit a785026d8d928a1492daf6919a57d6cda714f714 Author: Jonathan Wakely Date: Mon Oct 10 11:58:27 2016 +0100 LWG 2733, LWG 2759 reject bool in gcd and lcm * include/experimental/numeric (gcd, lcm): Make bool arguments ill-formed. * include/std/numeric (gcd, lcm): Likewise. * testsuite/26_numerics/gcd/gcd_neg.cc: New test. * testsuite/26_numerics/lcm/lcm_neg.cc: New test. diff --git a/libstdc++-v3/include/experimental/numeric b/libstdc++-v3/include/experimental/numeric index 6d1dc21..0ce4bda 100644 --- a/libstdc++-v3/include/experimental/numeric +++ b/libstdc++-v3/include/experimental/numeric @@ -57,8 +57,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION constexpr common_type_t<_Mn, _Nn> gcd(_Mn __m, _Nn __n) { - static_assert(is_integral<_Mn>::value, "arguments to gcd are integers"); - static_assert(is_integral<_Nn>::value, "arguments to gcd are integers"); + static_assert(is_integral<_Mn>::value, "gcd arguments are integers"); + static_assert(is_integral<_Nn>::value, "gcd arguments are integers"); + static_assert(!is_same<_Mn, bool>::value, "gcd arguments are not bools"); + static_assert(!is_same<_Nn, bool>::value, "gcd arguments are not bools"); return std::__detail::__gcd(__m, __n); } @@ -67,8 +69,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION constexpr common_type_t<_Mn, _Nn> lcm(_Mn __m, _Nn __n) { - static_assert(is_integral<_Mn>::value, "arguments to lcm are integers"); - static_assert(is_integral<_Nn>::value, "arguments to lcm are integers"); + static_assert(is_integral<_Mn>::value, "lcm arguments are integers"); + static_assert(is_integral<_Nn>::value, "lcm arguments are integers"); + static_assert(!is_same<_Mn, bool>::value, "lcm arguments are not bools"); + static_assert(!is_same<_Nn, bool>::value, "lcm arguments are not bools"); return std::__detail::__lcm(__m, __n); } diff --git a/libstdc++-v3/include/std/numeric b/libstdc++-v3/include/std/numeric index 7b1ab98..4414081 100644 --- a/libstdc++-v3/include/std/numeric +++ b/libstdc++-v3/include/std/numeric @@ -96,6 +96,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __abs_integral(_Tp __val) { return __val; } + void __abs_integral(bool) = delete; + template constexpr common_type_t<_Mn, _Nn> __gcd(_Mn __m, _Nn __n) @@ -129,8 +131,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION constexpr common_type_t<_Mn, _Nn> gcd(_Mn __m, _Nn __n) { - static_assert(is_integral<_Mn>::value, "arguments to gcd are integers"); - static_assert(is_integral<_Nn>::value, "arguments to gcd are integers"); + static_assert(is_integral<_Mn>::value, "gcd arguments are integers"); + static_assert(is_integral<_Nn>::value, "gcd arguments are integers"); + static_assert(!is_same<_Mn, bool>::value, "gcd arguments are not bools"); + static_assert(!is_same<_Nn, bool>::value, "gcd arguments are not bools"); return __detail::__gcd(__m, __n); } @@ -140,8 +144,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION constexpr common_type_t<_Mn, _Nn> lcm(_Mn __m, _Nn __n) { - static_assert(is_integral<_Mn>::value, "arguments to lcm are integers"); - static_assert(is_integral<_Nn>::value, "arguments to lcm are integers"); + static_assert(is_integral<_Mn>::value, "lcm arguments are integers"); + static_assert(is_integral<_Nn>::value, "lcm arguments are integers"); + static_assert(!is_same<_Mn, bool>::value, "lcm arguments are not bools"); + static_assert(!is_same<_Nn, bool>::value, "lcm arguments are not bools"); return __detail::__lcm(__m, __n); } diff --git a/libstdc++-v3/testsuite/26_numerics/gcd/gcd_neg.cc b/libstdc++-v3/testsuite/26_numerics/gcd/gcd_neg.cc new file mode 100644 index 0000000..231ce8d --- /dev/null +++ b/libstdc++-v3/testsuite/26_numerics/gcd/gcd_neg.cc @@ -0,0 +1,39 @@ +// Copyright (C) 2016 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library 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, or (at your option) +// any later version. + +// This library 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 library; see the file COPYING3. If not see +// . + +// { dg-options "-std=gnu++1z" } +// { dg-do compile { target c++1z } } + +#include + +void +test01() +{ + std::gcd(true, 1); // { dg-error "from here" } + std::gcd(1, true); // { dg-error "from here" } + std::gcd(true, true); // { dg-error "from here" } + std::gcd(0.1, 1); // { dg-error "from here" } + std::gcd(1, 0.1); // { dg-error "from here" } + std::gcd(0.1, 0.1); // { dg-error "from here" } +} + +// { dg-error "integers" "" { target *-*-* } 134 } +// { dg-error "integers" "" { target *-*-* } 135 } +// { dg-error "not bools" "" { target *-*-* } 136 } +// { dg-error "not bools" "" { target *-*-* } 137 } +// { dg-prune-output "deleted function" } +// { dg-prune-output "invalid operands" } diff --git a/libstdc++-v3/testsuite/26_numerics/lcm/lcm_neg.cc b/libstdc++-v3/testsuite/26_numerics/lcm/lcm_neg.cc new file mode 100644 index 0000000..085ad77 --- /dev/null +++ b/libstdc++-v3/testsuite/26_numerics/lcm/lcm_neg.cc @@ -0,0 +1,39 @@ +// Copyright (C) 2016 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library 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, or (at your option) +// any later version. + +// This library 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 library; see the file COPYING3. If not see +// . + +// { dg-options "-std=gnu++1z" } +// { dg-do compile { target c++1z } } + +#include + +void +test01() +{ + std::lcm(true, 1); // { dg-error "from here" } + std::lcm(1, true); // { dg-error "from here" } + std::lcm(true, true); // { dg-error "from here" } + std::lcm(0.1, 1); // { dg-error "from here" } + std::lcm(1, 0.1); // { dg-error "from here" } + std::lcm(0.1, 0.1); // { dg-error "from here" } +} + +// { dg-error "integers" "" { target *-*-* } 147 } +// { dg-error "integers" "" { target *-*-* } 148 } +// { dg-error "not bools" "" { target *-*-* } 149 } +// { dg-error "not bools" "" { target *-*-* } 150 } +// { dg-prune-output "deleted function" } +// { dg-prune-output "invalid operands" }