From: Martin Storsjö <martin@martin.st>
Date: Tue, 23 Mar 2021 16:42:32 +0000 (+0200)
Subject: [libcxx] [test] Add return values after assert(false) in some experimental tests
X-Git-Tag: llvmorg-14-init~11436
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b6c4b280a01f1a16b0b4258a1034bebc13f1f7e3;p=platform%2Fupstream%2Fllvm.git

[libcxx] [test] Add return values after assert(false) in some experimental tests

When building in MSVC mode (in release mode), the assert(false) don't
make the end of the function unreachable, so add return statements to
silence compiler warnings (treated as errors).

Also change 'virtual' into 'override', which was requested in review,
as these files require C++11.

Differential Revision: https://reviews.llvm.org/D99214
---

diff --git a/libcxx/test/std/experimental/memory/memory.resource.global/new_delete_resource.pass.cpp b/libcxx/test/std/experimental/memory/memory.resource.global/new_delete_resource.pass.cpp
index 8c7af9d..91bf1f5 100644
--- a/libcxx/test/std/experimental/memory/memory.resource.global/new_delete_resource.pass.cpp
+++ b/libcxx/test/std/experimental/memory/memory.resource.global/new_delete_resource.pass.cpp
@@ -25,14 +25,14 @@ namespace ex = std::experimental::pmr;
 struct assert_on_compare : public ex::memory_resource
 {
 protected:
-    virtual void * do_allocate(size_t, size_t)
-    { assert(false); }
+    void * do_allocate(size_t, size_t) override
+    { assert(false); return nullptr; }
 
-    virtual void do_deallocate(void *, size_t, size_t)
+    void do_deallocate(void *, size_t, size_t) override
     { assert(false); }
 
-    virtual bool do_is_equal(ex::memory_resource const &) const noexcept
-    { assert(false); }
+    bool do_is_equal(ex::memory_resource const &) const noexcept override
+    { assert(false); return false; }
 };
 
 void test_return()
diff --git a/libcxx/test/std/experimental/memory/memory.resource.global/null_memory_resource.pass.cpp b/libcxx/test/std/experimental/memory/memory.resource.global/null_memory_resource.pass.cpp
index c7efeab..bdd6248 100644
--- a/libcxx/test/std/experimental/memory/memory.resource.global/null_memory_resource.pass.cpp
+++ b/libcxx/test/std/experimental/memory/memory.resource.global/null_memory_resource.pass.cpp
@@ -25,14 +25,14 @@ namespace ex = std::experimental::pmr;
 struct assert_on_compare : public ex::memory_resource
 {
 protected:
-    virtual void * do_allocate(size_t, size_t)
-    { assert(false); }
+    void * do_allocate(size_t, size_t) override
+    { assert(false); return nullptr; }
 
-    virtual void do_deallocate(void *, size_t, size_t)
+    void do_deallocate(void *, size_t, size_t) override
     { assert(false); }
 
-    virtual bool do_is_equal(ex::memory_resource const &) const noexcept
-    { assert(false); }
+    bool do_is_equal(ex::memory_resource const &) const noexcept override
+    { assert(false); return false; }
 };
 
 void test_return()