update FB submodules (#8670)

Summary:
Pull Request resolved: #8670

Reland of D20260698, attempting to fix hhvm-mac build issue.

Reviewed By: fredemmott

Differential Revision: D20291279

fbshipit-source-id: f5e4f89dc5f108005f005b984218bb4fe2e6ca63

Author: jjergus

hphp/runtime/server/fastcgi/fastcgi-session.cpp

@@ -217,11 +217,7 @@ void FastCGISession::closeWhenIdle() {
   m_keepConn = false; // will shutdown when request completes
 }
 
-#ifdef FACEBOOK
 void FastCGISession::dropConnection(const std::string& /* errorMsg */) {
-#else
-void FastCGISession::dropConnection() {
-#endif
   // Nothing else needs to be placed here. Calling closeWithReset() will cause
   // readEOF to be called immediately which will call shutdown().
   //

hphp/runtime/server/fastcgi/fastcgi-session.h

@@ -200,11 +200,7 @@ struct FastCGISession
   bool isBusy() const override;
   void notifyPendingShutdown() override;
   void closeWhenIdle() override;
-#ifdef FACEBOOK
   void dropConnection(const std::string& errorMsg = "") override;
-#else
-  void dropConnection() override;
-#endif
   void dumpConnectionState(uint8_t loglevel) override;
 
 private:

patches/mcrouter-disable-deadlineMs-when-if_constexpr-is-unavailable.patch

@@ -0,0 +1,87 @@
+From a6ad725247cc87d1e7fe7ac1cb60ec67ada72a37 Mon Sep 17 00:00:00 2001
+From: jjergus <jjergus@fb.com>
+Date: Tue, 3 Mar 2020 14:13:46 -0800
+Subject: [PATCH] disable deadlineMs when if_constexpr is unavailable
+
+---
+ mcrouter/McReqUtil.h | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/third-party/mcrouter/src/mcrouter/McReqUtil.h b/third-party/mcrouter/src/mcrouter/McReqUtil.h
+index 2acfac5c..60dd6f6d 100644
+--- a/third-party/mcrouter/src/mcrouter/McReqUtil.h
++++ b/third-party/mcrouter/src/mcrouter/McReqUtil.h
+@@ -7,6 +7,7 @@
+ 
+ #pragma once
+ 
++#if __cpp_if_constexpr
+ #include "mcrouter/config.h"
+ 
+ // Request deadline related helper functions
+@@ -24,6 +25,7 @@ constexpr auto hasNonConstDeadlineMs<
+     T,
+     std::void_t<decltype(std::declval<std::decay_t<T>&>().deadlineMs())>> =
+     true;
++#endif
+ 
+ /**
+  * setRequestDeadline - sets request deadline time to current time + deadlineMs
+@@ -34,10 +36,12 @@ constexpr auto hasNonConstDeadlineMs<
+  */
+ template <class Request>
+ void setRequestDeadline(Request& req, uint64_t deadlineMs) {
++#if __cpp_if_constexpr
+   if constexpr (hasNonConstDeadlineMs<Request>) {
+     req.deadlineMs() =
+         facebook::memcache::mcrouter::getCurrentTimeInMs() + deadlineMs;
+   }
++#endif
+ }
+ 
+ /**
+@@ -52,12 +56,14 @@ void setRequestDeadline(Request& req, uint64_t deadlineMs) {
+  */
+ template <class Request>
+ bool isRequestDeadlineExceeded(const Request& req) {
++#if __cpp_if_constexpr
+   if constexpr (hasConstDeadlineMs<Request>) {
+     if (req.deadlineMs() > 0) {
+       return facebook::memcache::mcrouter::getCurrentTimeInMs() >
+           req.deadlineMs();
+     }
+   }
++#endif
+   return false;
+ }
+ 
+@@ -69,9 +75,11 @@ bool isRequestDeadlineExceeded(const Request& req) {
+  */
+ template <class Request>
+ std::pair<bool, uint64_t> getDeadline(const Request& req) {
++#if __cpp_if_constexpr
+   if constexpr (hasConstDeadlineMs<Request>) {
+     return {true, req.deadlineMs()};
+   }
++#endif
+   return {false, 0};
+ }
+ 
+@@ -82,6 +90,7 @@ std::pair<bool, uint64_t> getDeadline(const Request& req) {
+  */
+ template <class Request>
+ std::pair<bool, uint64_t> getRemainingTime(const Request& req) {
++#if __cpp_if_constexpr
+   if constexpr (hasConstDeadlineMs<Request>) {
+     auto deadlineMs = req.deadlineMs();
+     auto currentTime = facebook::memcache::mcrouter::getCurrentTimeInMs();
+@@ -90,5 +99,6 @@ std::pair<bool, uint64_t> getRemainingTime(const Request& req) {
+     }
+     return {true, 0};
+   }
++#endif
+   return {false, 0};
+ }
+-- 
+2.17.1
+

patches/shipit-folly-D20196749.patch

@@ -0,0 +1,25 @@
+From D20196749-99303732 Mon Sep 17 00:00:00 2001
+From: Ján . <jjergus@fb.com>
+Date: Mon, 02 Mar 2020 11:16:19 -0800
+Subject: [PATCH] add missing #include
+
+Summary: `type_traits` needed for `std::enable_if_t`
+
+Reviewed By: Orvid
+
+Differential Revision: D20196749
+---
+
+diff --git a/third-party/folly/src/folly/memory/ReentrantAllocator.h b/third-party/folly/src/folly/memory/ReentrantAllocator.h
+--- a/third-party/folly/src/folly/memory/ReentrantAllocator.h
++++ b/third-party/folly/src/folly/memory/ReentrantAllocator.h
+@@ -18,6 +18,7 @@
+
+ #include <atomic>
+ #include <cstddef>
++#include <type_traits>
+
+ namespace folly {
+
+--
+1.7.9.5

patches/shipit-folly-D20205181.patch

@@ -0,0 +1,29 @@
+diff --git a/third-party/folly/src/folly/memory/ReentrantAllocator.h b/third-party/folly/src/folly/memory/ReentrantAllocator.h
+--- a/third-party/folly/src/folly/memory/ReentrantAllocator.h
++++ b/third-party/folly/src/folly/memory/ReentrantAllocator.h
+@@ -158,6 +158,23 @@
+
+   using base::base;
+
++#if defined(_GLIBCXX_USE_CXX11_ABI) && _GLIBCXX_USE_CXX11_ABI == 0
++  template <class Type>
++  struct rebind {
++    typedef reentrant_allocator<Type> other;
++  };
++
++  using pointer = value_type*;
++  using const_pointer = value_type const*;
++  using reference = typename std::add_lvalue_reference<value_type>::type;
++  using const_reference = typename std::add_lvalue_reference<value_type const>::type;
++  using difference_type = std::ptrdiff_t;
++  using size_type = std::size_t;
++
++  explicit reentrant_allocator() noexcept
++      : reentrant_allocator(reentrant_allocator_options()){};
++#endif
++
+   template <typename U, std::enable_if_t<!std::is_same<U, T>::value, int> = 0>
+   /* implicit */ reentrant_allocator(
+       reentrant_allocator<U> const& that) noexcept
+--
+1.7.9.5

patches/shipit-mcrouter-D19279530.patch

@@ -82,6 +82,7 @@ list(REMOVE_ITEM files
   # io/Compression requires snappy library
   # Don't add dep until we need it
   ${FOLLY_DIR}/io/Compression.cpp
+  ${FOLLY_DIR}/logging/BridgeFromGoogleLogging.cpp
   ${FOLLY_DIR}/python/GILAwareManualExecutor.cpp
 )
 list(REMOVE_ITEM hfiles
@@ -108,6 +109,7 @@ list(REMOVE_ITEM hfiles
   # io/Compression requires snappy library
   # Don't add dep until we need it
   ${FOLLY_DIR}/io/Compression.h
+  ${FOLLY_DIR}/logging/BridgeFromGoogleLogging.h
   ${FOLLY_DIR}/python/AsyncioExecutor.h
   ${FOLLY_DIR}/python/GILAwareManualExecutor.h
 )