[PATCH] D52332: [ADT] restrict bit_cast to trivially-constructible To

[JF Bastien via Phabricator via llvm-commits]

jfb created this revision.
jfb added reviewers: dblaikie, rsmith.
Herald added subscribers: llvm-commits, kristina, dexonsmith.

As discussed in r341853 by blaikie, the reinterpret_cast was technically an aliasing violation. Restrict our bit_cast implementation to To which are trivially-constructible (and note the existing restriction to constexpr). Once we move to C++17 we can use a version of bit_cast without these restrictions, or if we care we can SFINAE a different implementation when To isn't trivially-constructible.


Repository:
  rL LLVM

https://reviews.llvm.org/D52332

Files:
  include/llvm/ADT/bit.h


Index: include/llvm/ADT/bit.h
===================================================================
--- include/llvm/ADT/bit.h
+++ include/llvm/ADT/bit.h
@@ -20,8 +20,12 @@
 
 namespace llvm {
 
+// This implementation of bit_cast is different from the C++17 one in two ways:
+//  - It isn't constexpr because that requires compiler support.
+//  - It requires trivially-constructible To, to avoid UB in the implementation.
 template <typename To, typename From
           , typename = typename std::enable_if<sizeof(To) == sizeof(From)>::type
+          , typename = typename std::is_trivially_constructible<To>::type
 #if (__has_feature(is_trivially_copyable) && defined(_LIBCPP_VERSION)) || \
     (defined(__GNUC__) && __GNUC__ >= 5)
           , typename = typename std::enable_if<std::is_trivially_copyable<To>::value>::type
@@ -38,17 +42,9 @@
 #endif
 >
 inline To bit_cast(const From &from) noexcept {
-  alignas(To) unsigned char storage[sizeof(To)];
-  std::memcpy(&storage, &from, sizeof(To));
-#if defined(__GNUC__)
-  // Before GCC 7.2, GCC thought that this violated strict aliasing.
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif
-  return reinterpret_cast<To &>(storage);
-#if defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
+  To to;
+  std::memcpy(&to, &from, sizeof(To));
+  return to;
 }
 
 } // namespace llvm


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D52332.166384.patch
Type: text/x-patch
Size: 1377 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180920/d97d9db5/attachment.bin>