From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1946) id D29893858D37; Mon, 29 Jun 2020 22:59:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D29893858D37 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1593471589; bh=0ADFBHQuWTURA3hMJ+q9QI0O6a3Au6TK4nR6wTfEVLo=; h=From:To:Subject:Date:From; b=iAzPvmL3I7JeJIdnu0N1naMY236a3XQs5//t65FcIyW4/H+gOFuzFR82xYXo1BLhU ECDNybkYRbwKr0tGaWxYqVGgJwZHDcIdMT8FyiEZHDad/XM+LRLiG0WjrZCDkfLiBZ 5jesV84n20iZNIPZ2z3MUc4uEStYR4V3lQe0oMeg= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Ville Voutilainen To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r11-1722] Revert "Add a __nonnnull__ attribute to std::string's _CharT* constructor" X-Act-Checkin: gcc X-Git-Author: Ville Voutilainen X-Git-Refname: refs/heads/master X-Git-Oldrev: 9bca676cc7a1670be021567ae4a128a5082229d3 X-Git-Newrev: 2635f9e5086318f4560997d9741fdda496b9c801 Message-Id: <20200629225949.D29893858D37@sourceware.org> Date: Mon, 29 Jun 2020 22:59:49 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Jun 2020 22:59:49 -0000 https://gcc.gnu.org/g:2635f9e5086318f4560997d9741fdda496b9c801 commit r11-1722-g2635f9e5086318f4560997d9741fdda496b9c801 Author: Ville Voutilainen Date: Tue Jun 30 01:59:34 2020 +0300 Revert "Add a __nonnnull__ attribute to std::string's _CharT* constructor" This reverts commit b26fd416fb0a734d3f3e56629b6dff2e3c25dd40. Diff: --- libstdc++-v3/include/bits/basic_string.h | 1 - .../21_strings/basic_string/cons/char/nonnull.cc | 29 ---------------------- .../basic_string/cons/wchar_t/nonnull.cc | 29 ---------------------- 3 files changed, 59 deletions(-) diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h index d5e5eb06e1b..bc0c256b65e 100644 --- a/libstdc++-v3/include/bits/basic_string.h +++ b/libstdc++-v3/include/bits/basic_string.h @@ -522,7 +522,6 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 // 3076. basic_string CTAD ambiguity template> #endif - __attribute__((__nonnull__)) basic_string(const _CharT* __s, const _Alloc& __a = _Alloc()) : _M_dataplus(_M_local_data(), __a) { _M_construct(__s, __s ? __s + traits_type::length(__s) : __s+npos); } diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/nonnull.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/nonnull.cc deleted file mode 100644 index 1c09a1d2207..00000000000 --- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/nonnull.cc +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright (C) 2020 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-additional-options "-Wnonnull" } -// { dg-do compile { target c++11 } } - -#include - -void -test01() -{ - std::string s((const char*)nullptr); // { dg-warning "null arg" } - std::string t((char*)nullptr); // { dg-warning "null arg" } - std::string u(nullptr); // { dg-warning "null arg" } -} diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/nonnull.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/nonnull.cc deleted file mode 100644 index 456efed6c8c..00000000000 --- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/nonnull.cc +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright (C) 2020 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-additional-options "-Wnonnull" } -// { dg-do compile { target c++11 } } - -#include - -void -test01() -{ - std::wstring s((const wchar_t*)nullptr); // { dg-warning "null arg" } - std::wstring t((wchar_t*)nullptr); // { dg-warning "null arg" } - std::wstring u(nullptr); // { dg-warning "null arg" } -}