From 514d9cb9da57bbeffbcd47a3f0bbed6b80b36e33 Mon Sep 17 00:00:00 2001
From: Lee Howes <lwh@fb.com>
Date: Fri, 3 Nov 2017 10:16:04 -0700
Subject: [PATCH] Missing Future/SemiFuture->Value conversion check

Summary: Conversion check was lost in an earlier refactor. This meant that SemiFuture could be accidentally converted to Future through the value constructor. This should be disabled.

Reviewed By: yfeldblum

Differential Revision: D6214526

fbshipit-source-id: 3fc2d026ec6062b38b9500c8adf3eee12c0f2693
---
 folly/futures/Future-pre.h | 5 -----
 folly/futures/Future.h     | 6 ++++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/folly/futures/Future-pre.h b/folly/futures/Future-pre.h
index 26d9c7c6..82a8684c 100644
--- a/folly/futures/Future-pre.h
+++ b/folly/futures/Future-pre.h
@@ -35,11 +35,6 @@ struct isSemiFuture<SemiFuture<T>> : std::true_type {
   typedef T Inner;
 };
 
-template <typename T>
-struct isSemiFuture<Future<T>> : std::true_type {
-  typedef T Inner;
-};
-
 template <typename T>
 struct isFuture : std::false_type {
   using Inner = typename Unit::Lift<T>::type;
diff --git a/folly/futures/Future.h b/folly/futures/Future.h
index 5cd5436d..e6fc8ebe 100644
--- a/folly/futures/Future.h
+++ b/folly/futures/Future.h
@@ -209,7 +209,8 @@ class SemiFuture : private futures::detail::FutureBase<T> {
   template <
       class T2 = T,
       typename = typename std::enable_if<
-          !isFuture<typename std::decay<T2>::type>::value>::type>
+          !isFuture<typename std::decay<T2>::type>::value &&
+          !isSemiFuture<typename std::decay<T2>::type>::value>::type>
   /* implicit */ SemiFuture(T2&& val) : Base(std::forward<T2>(val)) {}
 
   template <class T2 = T>
@@ -343,7 +344,8 @@ class Future : private futures::detail::FutureBase<T> {
   template <
       class T2 = T,
       typename = typename std::enable_if<
-          !isFuture<typename std::decay<T2>::type>::value>::type>
+          !isFuture<typename std::decay<T2>::type>::value &&
+          !isSemiFuture<typename std::decay<T2>::type>::value>::type>
   /* implicit */ Future(T2&& val) : Base(std::forward<T2>(val)) {}
 
   template <class T2 = T>
-- 
2.34.1