From: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
Date: Thu, 3 Apr 2025 15:27:46 +0000 (+0200)
Subject: gccrs: Revert part of 44ffe1193269
X-Git-Tag: basepoints/gcc-16~264
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d307dddfc1a7dd406e488b08a390ae5908542b1a;p=thirdparty%2Fgcc.git

gccrs: Revert part of 44ffe1193269

This commit got rid of msvc specific code and remove the else clause,
this triggered warning with tl::expected::value function.

gcc/rust/ChangeLog:

	* util/expected.h: Use gcc_unreachable within gcc context.

Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
---

diff --git a/gcc/rust/util/expected.h b/gcc/rust/util/expected.h
index a9e3bc2b233..07ba8776214 100644
--- a/gcc/rust/util/expected.h
+++ b/gcc/rust/util/expected.h
@@ -212,10 +212,8 @@ template <typename E>
   throw std::forward<E>(e);
 #else
   (void)e;
-#ifdef _MSC_VER
   gcc_unreachable();
 #endif
-#endif
 }
 
 #ifndef TL_TRAITS_MUTEX
@@ -2437,4 +2435,4 @@ void swap(expected<T, E> &lhs,
 }
 } // namespace tl
 
-#endif
\ No newline at end of file
+#endif