From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1851) id 6C9193892479; Mon, 29 Jun 2020 08:18:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6C9193892479 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1593418729; bh=vnFHmqMSeX/FLJAPbCofXVpWVFp0xDKYbLXXfmTFcKU=; h=From:To:Subject:Date:From; b=YGbcnwXxoY60bEHnsP7wdj/yfMqPA3g2sG12cr0ePkHIx2y7y3LvWc0Y9/XxEv8sA 0sBRSLRaUDYPhHFvciABgUGTy6c+/5hiAG7PzcSoaEA3w50vo6ywgJ6R65F416cPX5 HrvcnzQFKSBluz/Yy4VlUQR5aTcF/rF0zO+E2h/o= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Martin Liska To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc(refs/users/marxin/heads/slp-function-v7)] Add a __nonnnull__ attribute to std::string's _CharT* constructor X-Act-Checkin: gcc X-Git-Author: Ville Voutilainen X-Git-Refname: refs/users/marxin/heads/slp-function-v7 X-Git-Oldrev: 24b54628cfa95194a8de4071c28cb56e6e81c08e X-Git-Newrev: b26fd416fb0a734d3f3e56629b6dff2e3c25dd40 Message-Id: <20200629081849.6C9193892479@sourceware.org> Date: Mon, 29 Jun 2020 08:18: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 08:18:49 -0000 https://gcc.gnu.org/g:b26fd416fb0a734d3f3e56629b6dff2e3c25dd40 commit b26fd416fb0a734d3f3e56629b6dff2e3c25dd40 Author: Ville Voutilainen Date: Mon Jun 29 00:47:05 2020 +0300 Add a __nonnnull__ attribute to std::string's _CharT* constructor Add a __nonnnull__ attribute to std::string's _CharT* constructor * include/bits/basic_string.h (string(_CharT*, const _Alloc&)): Add a __nonnull__ attribute. * testsuite/21_strings/basic_string/cons/char/nonnull.cc: New. * testsuite/21_strings/basic_string/cons/wchar_t/nonnull.cc: Likewise. 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 insertions(+) diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h index bc0c256b65e..d5e5eb06e1b 100644 --- a/libstdc++-v3/include/bits/basic_string.h +++ b/libstdc++-v3/include/bits/basic_string.h @@ -522,6 +522,7 @@ _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 new file mode 100644 index 00000000000..1c09a1d2207 --- /dev/null +++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/nonnull.cc @@ -0,0 +1,29 @@ +// 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 new file mode 100644 index 00000000000..456efed6c8c --- /dev/null +++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/nonnull.cc @@ -0,0 +1,29 @@ +// 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" } +}