fix(cpp1): emit correct UFCS in function signature

Author: JohelEGP

regression-tests/mixed-bugfix-for-ufcs-non-local.cpp2

@@ -0,0 +1,25 @@
+template<bool> struct t { };
+constexpr bool f(const t<true>&) { return true; }
+constexpr t<true> o{};
+
+// Variables.
+
+// _: <V: t<o.f()>> bool = (); // Blocked on #389, [GCC109781][].
+
+_: t<o.f()> = ();
+
+_: bool = o.f();
+
+// Functions.
+
+// g: <V: t<o.f()>> () = { } // Blocked on [GCC109781][].
+
+g: (x: t<o.f()>) = { }
+
+g: () [[pre: o.f()]] = { }
+
+h: () -> t<o.f()> = o;
+
+main: () = { }
+
+// [GCC109781]: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109781

regression-tests/mixed-bugfix-for-ufcs-sfinae.cpp2

@@ -0,0 +1,5 @@
+f: <T> () -> std::type_identity_t<decltype(T().a())> = { }
+B: type                                              = { }
+main: ()                                             = {
+  static_assert(!std::invocable<decltype(:<T> (x: T) -> std::void_t<decltype(f<T>())> = {}), B>);
+}

regression-tests/pure2-bugfix-for-ufcs-sfinae.cpp2

@@ -0,0 +1,59 @@
+
+
+//=== Cpp2 type declarations ====================================================
+
+
+#include "cpp2util.h"
+
+
+
+//=== Cpp2 type definitions and function declarations ===========================
+
+template<bool> struct t { };
+constexpr bool f(const t<true>&) { return true; }
+constexpr t<true> o{};
+
+// Variables.
+
+// _: <V: t<o.f()>> bool = (); // Blocked on #389, [GCC109781][].
+
+#line 9 "mixed-bugfix-for-ufcs-non-local.cpp2"
+extern t<CPP2_UFCS(,,(f),(o),())> auto_9_1;
+
+extern bool auto_11_1;
+
+// Functions.
+
+// g: <V: t<o.f()>> () = { } // Blocked on [GCC109781][].
+
+auto g(cpp2::in<t<CPP2_UFCS(,,(f),(o),())>> x) -> void;
+
+auto g() -> void;
+
+[[nodiscard]] auto h() -> t<CPP2_UFCS(,,(f),(o),())>;
+
+auto main() -> int;
+
+// [GCC109781]: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109781
+
+
+//=== Cpp2 function definitions =================================================
+
+
+#line 9 "mixed-bugfix-for-ufcs-non-local.cpp2"
+t<CPP2_UFCS(,,(f),(o),())> auto_9_1 {}; 
+
+bool auto_11_1 {CPP2_UFCS(,,(f),(o),())}; 
+
+#line 17 "mixed-bugfix-for-ufcs-non-local.cpp2"
+auto g(cpp2::in<t<CPP2_UFCS(,,(f),(o),())>> x) -> void{}
+
+auto g() -> void{
+                         cpp2::Default.expects(CPP2_UFCS(&,,(f),(o),()), "");
+#line 19 "mixed-bugfix-for-ufcs-non-local.cpp2"
+}
+
+[[nodiscard]] auto h() -> t<CPP2_UFCS(,,(f),(o),())> { return o;  }
+
+auto main() -> int{}
+

…xed-bugfix-for-ufcs-sfinae.cpp.execution …-bugfix-for-ufcs-non-local.cpp.executionregression-tests/test-results/gcc-13/mixed-bugfix-for-ufcs-sfinae.cpp.execution renamed to regression-tests/test-results/gcc-13/mixed-bugfix-for-ufcs-non-local.cpp.execution regression-tests/test-results/gcc-13/mixed-bugfix-for-ufcs-sfinae.cpp.execution renamed to regression-tests/test-results/gcc-13/mixed-bugfix-for-ufcs-non-local.cpp.execution

@@ -0,0 +1,2 @@
+mixed-bugfix-for-ufcs-non-local.cpp2... ok (mixed Cpp1/Cpp2, Cpp2 code passes safety checks)
+