From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 114544 invoked by alias); 16 Jun 2017 08:14:28 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 114519 invoked by uid 89); 16 Jun 2017 08:14:28 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_HELO_PASS,T_RP_MATCHES_RCVD,UNSUBSCRIBE_BODY autolearn=ham version=3.3.2 spammy= 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; Fri, 16 Jun 2017 08:14:26 +0000 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 133E4C0587D2; Fri, 16 Jun 2017 08:14:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 133E4C0587D2 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=jwakely@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 133E4C0587D2 Received: from localhost (unknown [10.33.36.93]) by smtp.corp.redhat.com (Postfix) with ESMTP id B908C8046E; Fri, 16 Jun 2017 08:14:29 +0000 (UTC) Date: Fri, 16 Jun 2017 08:14:00 -0000 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [PATCH] Fix missing returns in libstdc++ header and tests Message-ID: <20170616081428.GA25598@redhat.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="a8Wt8u1KmwUX3Y2C" Content-Disposition: inline X-Clacks-Overhead: GNU Terry Pratchett User-Agent: Mutt/1.8.0 (2017-02-23) X-SW-Source: 2017-06/txt/msg01170.txt.bz2 --a8Wt8u1KmwUX3Y2C Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline Content-length: 663 Some missing returns found by ubsan. * include/bits/locale_conv.h (wbuffer_convert::_M_put): Add missing return statement. * testsuite/21_strings/basic_string_view/operations/copy/char/1.cc: Return void. * testsuite/21_strings/basic_string_view/operations/copy/wchar_t/1.cc: Likewise. * testsuite/23_containers/map/modifiers/insert_or_assign/1.cc: Add missing return statements. * testsuite/23_containers/unordered_map/modifiers/insert_or_assign.cc: Likewise. * testsuite/27_io/basic_istream/extractors_arithmetic/char/12.cc: Return void. * testsuite/special_functions/14_expint/pr68397.cc: Likewise. Tested powerpc64le-linux, committed to trunk. --a8Wt8u1KmwUX3Y2C Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" Content-length: 4409 commit 9e3a856a6ac1d10c4fdb92d99a6db2e9e9f13a44 Author: Jonathan Wakely Date: Thu Jun 15 18:11:03 2017 +0100 Fix missing returns in libstdc++ header and tests * include/bits/locale_conv.h (wbuffer_convert::_M_put): Add missing return statement. * testsuite/21_strings/basic_string_view/operations/copy/char/1.cc: Return void. * testsuite/21_strings/basic_string_view/operations/copy/wchar_t/1.cc: Likewise. * testsuite/23_containers/map/modifiers/insert_or_assign/1.cc: Add missing return statements. * testsuite/23_containers/unordered_map/modifiers/insert_or_assign.cc: Likewise. * testsuite/27_io/basic_istream/extractors_arithmetic/char/12.cc: Return void. * testsuite/special_functions/14_expint/pr68397.cc: Likewise. diff --git a/libstdc++-v3/include/bits/locale_conv.h b/libstdc++-v3/include/bits/locale_conv.h index 9b952d4..74beaec 100644 --- a/libstdc++-v3/include/bits/locale_conv.h +++ b/libstdc++-v3/include/bits/locale_conv.h @@ -482,6 +482,7 @@ _GLIBCXX_END_NAMESPACE_CXX11 { if (_M_buf->sputn(__p, __n) < __n) return false; + return true; } // convert the put area and write to the byte stream buffer diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/copy/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/copy/char/1.cc index 88a74f6..c2d1951 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/copy/char/1.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/copy/char/1.cc @@ -22,7 +22,7 @@ #include #include -bool +void test01() { typedef std::string_view::size_type csize_type; diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/copy/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/copy/wchar_t/1.cc index 0e625d6..957c80c 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/copy/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/copy/wchar_t/1.cc @@ -22,7 +22,7 @@ #include #include -bool +void test01() { typedef std::wstring_view::size_type csize_type; diff --git a/libstdc++-v3/testsuite/23_containers/map/modifiers/insert_or_assign/1.cc b/libstdc++-v3/testsuite/23_containers/map/modifiers/insert_or_assign/1.cc index 48c17eb..aaf5d8a 100644 --- a/libstdc++-v3/testsuite/23_containers/map/modifiers/insert_or_assign/1.cc +++ b/libstdc++-v3/testsuite/23_containers/map/modifiers/insert_or_assign/1.cc @@ -39,10 +39,12 @@ struct Val { val = other.val; other.moved_from_assign = true; + return *this; } Val& operator=(const Val& other) { val = other.val; + return *this; } }; diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/insert_or_assign.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/insert_or_assign.cc index 67fd164..d4b9601 100644 --- a/libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/insert_or_assign.cc +++ b/libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/insert_or_assign.cc @@ -38,10 +38,12 @@ struct Val { val = other.val; other.moved_from_assign = true; + return *this; } Val& operator=(const Val& other) { val = other.val; + return *this; } }; diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/12.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/12.cc index 24cd2f5..7e3b773 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/12.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/12.cc @@ -50,7 +50,7 @@ void test12_aux(bool integer_type) VERIFY(is.fail()); } -bool test12() +void test12() { test12_aux(true); test12_aux(true); diff --git a/libstdc++-v3/testsuite/special_functions/14_expint/pr68397.cc b/libstdc++-v3/testsuite/special_functions/14_expint/pr68397.cc index 8da16d1..9527f40 100644 --- a/libstdc++-v3/testsuite/special_functions/14_expint/pr68397.cc +++ b/libstdc++-v3/testsuite/special_functions/14_expint/pr68397.cc @@ -23,7 +23,7 @@ #include #include -int +void test01() { // Answers from Wolfram Alpha. --a8Wt8u1KmwUX3Y2C--