From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id C2BD738708B6; Fri, 12 Feb 2021 14:44:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C2BD738708B6 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r11-7215] libstdc++: Make test memory_resource work without exceptions and RTTI X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: e9c310521182c9359cf23fa9b0c5057b35e8b53f X-Git-Newrev: 0bd242ec5aeffd1fb2a3ee16a2c69afae2aff2ce Message-Id: <20210212144410.C2BD738708B6@sourceware.org> Date: Fri, 12 Feb 2021 14:44:10 +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: Fri, 12 Feb 2021 14:44:10 -0000 https://gcc.gnu.org/g:0bd242ec5aeffd1fb2a3ee16a2c69afae2aff2ce commit r11-7215-g0bd242ec5aeffd1fb2a3ee16a2c69afae2aff2ce Author: Jonathan Wakely Date: Fri Feb 12 11:23:28 2021 +0000 libstdc++: Make test memory_resource work without exceptions and RTTI libstdc++-v3/ChangeLog: * testsuite/util/testsuite_allocator.h (memory_resource): Remove requirement for RTTI and exceptions to be enabled. Diff: --- libstdc++-v3/testsuite/util/testsuite_allocator.h | 26 ++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/libstdc++-v3/testsuite/util/testsuite_allocator.h b/libstdc++-v3/testsuite/util/testsuite_allocator.h index 9f80a14beb0..1f7912ea6eb 100644 --- a/libstdc++-v3/testsuite/util/testsuite_allocator.h +++ b/libstdc++-v3/testsuite/util/testsuite_allocator.h @@ -763,7 +763,7 @@ namespace __gnu_test #endif // C++11 #if __cplusplus >= 201703L -#if __cpp_aligned_new && __cpp_rtti && __cpp_exceptions +#if __cpp_aligned_new // A concrete memory_resource, with error checking. class memory_resource : public std::pmr::memory_resource { @@ -842,9 +842,9 @@ namespace __gnu_test if (p == a->p) { if (bytes != a->bytes) - throw bad_size(); + _S_throw(); if (alignment != a->alignment) - throw bad_alignment(); + _S_throw(); #if __cpp_sized_deallocation ::operator delete(p, bytes, std::align_val_t(alignment)); #else @@ -857,19 +857,35 @@ namespace __gnu_test } aptr = &a->next; } - throw bad_address(); + _S_throw(); } bool do_is_equal(const std::pmr::memory_resource& r) const noexcept override { +#if __cpp_rtti // Equality is determined by sharing the same allocation_lists object. if (auto p = dynamic_cast(&r)) return p->lists == lists; +#else + if (this == &r) // Is this the best we can do without RTTI? + return true; +#endif return false; } private: + template + static void + _S_throw() + { +#if __cpp_exceptions + throw E(); +#else + __builtin_abort(); +#endif + } + struct allocation { void* p; @@ -905,7 +921,7 @@ namespace __gnu_test allocation_lists* lists; }; -#endif // aligned-new && rtti +#endif // aligned-new // Set the default resource, and restore the previous one on destruction. struct default_resource_mgr