folly: changes to make nvcc happy

Summary:
(1) small_vector.h line 1099: wrap the default return in an else statement to
avoid compiler warning of "unreachable statement".
(2) Constexpr.h: need to treat cudacc similarly to msvc.

(Note: this ignores all push blocking failures!)

Reviewed By: dzhulgakov

Differential Revision: D5387061

fbshipit-source-id: f002ab5ec00d4dcd85d86386f87a0327023afa1b

diff --git a/folly/portability/Constexpr.h b/folly/portability/Constexpr.h
index 4d99b62171ac231099e01945467f831fc5096f94..0b5c5a1a59b80ad7bcd9be3342e5bd885add6fbe 100644 (file)
--- a/folly/portability/Constexpr.h
+++ b/folly/portability/Constexpr.h
@@ -101,7 +101,7 @@ template <>
 constexpr size_t constexpr_strlen(const char* s) {
 #if defined(__clang__)
   return __builtin_strlen(s);
-#elif defined(_MSC_VER)
+#elif defined(_MSC_VER) || defined(__CUDACC__)
   return detail::constexpr_strlen_internal(s, 0);
 #else
   return std::strlen(s);

diff --git a/folly/small_vector.h b/folly/small_vector.h
index 66198ee85df330d0f616df0ba3847f0bff878388..741aaf3a896c30965ca4e085e835b8e6121377fd 100644 (file)
--- a/folly/small_vector.h
+++ b/folly/small_vector.h
@@ -1095,10 +1095,10 @@ private:
     value_type* heap() noexcept {
       if (kHasInlineCapacity || !detail::pointerFlagGet(pdata_.heap_)) {
         return static_cast<value_type*>(pdata_.heap_);
+      } else {
+        return static_cast<value_type*>(detail::shiftPointer(
+            detail::pointerFlagClear(pdata_.heap_), kHeapifyCapacitySize));
       }
-      return static_cast<value_type*>(
-        detail::shiftPointer(
-          detail::pointerFlagClear(pdata_.heap_), kHeapifyCapacitySize));
     }
     value_type const* heap() const noexcept {
       return const_cast<Data*>(this)->heap();