[libcxx-commits] [PATCH] D99928: [libcxx] [test] Use dedicated types for the invocable concept tests for multiple overloads

[Martin Storsjö via Phabricator via libcxx-commits]

mstorsjo created this revision.
mstorsjo added reviewers: cjdb, Quuxplusone.
mstorsjo requested review of this revision.
Herald added a project: libc++.
Herald added a reviewer: libc++.

This should be clearer, instead of relying on rules for implicit
conversions regarding built in float/integer types.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D99928

Files:
  libcxx/test/std/concepts/concepts.callable/concept.invocable/invocable.compile.pass.cpp
  libcxx/test/std/concepts/concepts.callable/concept.regularinvocable/regular_invocable.pass.cpp


Index: libcxx/test/std/concepts/concepts.callable/concept.regularinvocable/regular_invocable.pass.cpp
===================================================================
--- libcxx/test/std/concepts/concepts.callable/concept.regularinvocable/regular_invocable.pass.cpp
+++ libcxx/test/std/concepts/concepts.callable/concept.regularinvocable/regular_invocable.pass.cpp
@@ -248,21 +248,24 @@
     !std::regular_invocable<rvalue_cv_function_object const volatile&, int*>);
 
 struct multiple_overloads {
-  bool operator()();
-  void operator()(int);
-  int operator()(double);
+  struct A {};
+  struct B { B(int); };
+  struct AB : A, B {};
+  struct O {};
+  void operator()(A) {};
+  void operator()(B) {};
 };
-static_assert(std::regular_invocable<multiple_overloads&>);
-static_assert(std::regular_invocable<multiple_overloads&, short>);
+static_assert(std::regular_invocable<multiple_overloads&, multiple_overloads::A>);
+static_assert(std::regular_invocable<multiple_overloads&, multiple_overloads::B>);
 static_assert(std::regular_invocable<multiple_overloads&, int>);
-static_assert(!std::regular_invocable<multiple_overloads&, long long>);
-static_assert(std::regular_invocable<multiple_overloads&, double>);
-static_assert(std::regular_invocable<multiple_overloads&, float>);
-static_assert(std::regular_invocable<multiple_overloads&, short&>);
+static_assert(!std::regular_invocable<multiple_overloads&, multiple_overloads::AB>);
+static_assert(!std::regular_invocable<multiple_overloads&, multiple_overloads::O>);
+
+static_assert(std::regular_invocable<multiple_overloads&, multiple_overloads::A&>);
+static_assert(std::regular_invocable<multiple_overloads&, multiple_overloads::B&>);
 static_assert(std::regular_invocable<multiple_overloads&, int&>);
-static_assert(!std::regular_invocable<multiple_overloads&, long long&>);
-static_assert(std::regular_invocable<multiple_overloads&, float&>);
-static_assert(std::regular_invocable<multiple_overloads&, double&>);
+static_assert(!std::regular_invocable<multiple_overloads&, multiple_overloads::AB&>);
+static_assert(!std::regular_invocable<multiple_overloads&, multiple_overloads::O&>);
 } // namespace function_objects
 
 namespace pointer_to_member_functions {
Index: libcxx/test/std/concepts/concepts.callable/concept.invocable/invocable.compile.pass.cpp
===================================================================
--- libcxx/test/std/concepts/concepts.callable/concept.invocable/invocable.compile.pass.cpp
+++ libcxx/test/std/concepts/concepts.callable/concept.invocable/invocable.compile.pass.cpp
@@ -222,21 +222,24 @@
 static_assert(!std::invocable<rvalue_cv_function_object const volatile&, int*>);
 
 struct multiple_overloads {
-  bool operator()();
-  void operator()(int);
-  int operator()(double);
+  struct A {};
+  struct B { B(int); };
+  struct AB : A, B {};
+  struct O {};
+  void operator()(A) {};
+  void operator()(B) {};
 };
-static_assert(std::invocable<multiple_overloads&>);
-static_assert(std::invocable<multiple_overloads&, short>);
+static_assert(std::invocable<multiple_overloads&, multiple_overloads::A>);
+static_assert(std::invocable<multiple_overloads&, multiple_overloads::B>);
 static_assert(std::invocable<multiple_overloads&, int>);
-static_assert(!std::invocable<multiple_overloads&, long long>);
-static_assert(std::invocable<multiple_overloads&, double>);
-static_assert(std::invocable<multiple_overloads&, float>);
-static_assert(std::invocable<multiple_overloads&, short&>);
+static_assert(!std::invocable<multiple_overloads&, multiple_overloads::AB>);
+static_assert(!std::invocable<multiple_overloads&, multiple_overloads::O>);
+
+static_assert(std::invocable<multiple_overloads&, multiple_overloads::A&>);
+static_assert(std::invocable<multiple_overloads&, multiple_overloads::B&>);
 static_assert(std::invocable<multiple_overloads&, int&>);
-static_assert(!std::invocable<multiple_overloads&, long long>);
-static_assert(std::invocable<multiple_overloads&, float&>);
-static_assert(std::invocable<multiple_overloads&, double&>);
+static_assert(!std::invocable<multiple_overloads&, multiple_overloads::AB&>);
+static_assert(!std::invocable<multiple_overloads&, multiple_overloads::O&>);
 } // namespace function_objects
 
 namespace pointer_to_member_functions {


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D99928.335417.patch
Type: text/x-patch
Size: 4280 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20210406/8ea240ca/attachment-0001.bin>