Merge branch 'facebook:main' into main

.buckconfig

@@ -1,21 +1,10 @@
 [cells]
-root = .
-prelude = prelude
-toolchains = shim
-shim = shim
-none = none
+gh_facebook_folly = .
+shim_DISABLED = shim
 
 [cell_aliases]
-config = prelude
-ovr_config = prelude
-fbcode = shim
-fbsource = shim
-fbcode_macros = shim
-buck = none
-bazel_skylib = shim
+root = gh_facebook_folly
 
-[external_cells]
-prelude = bundled
-
-[parser]
-target_platform_detector_spec = target:root//...->prelude//platforms:default
+[oss]
+internal_cell = fbcode
+project_dirs = folly

.buckconfig.d/common.buckconfig

@@ -0,0 +1,20 @@
+[cells]
+prelude = prelude
+none = none
+
+[cell_aliases]
+config = prelude
+ovr_config = prelude
+bazel_skylib = gh_facebook_buck2_shims_meta
+buck = gh_facebook_buck2_shims_meta
+fbcode = gh_facebook_buck2_shims_meta
+fbcode_macros = gh_facebook_buck2_shims_meta
+fbsource = gh_facebook_buck2_shims_meta
+shim = gh_facebook_buck2_shims_meta
+toolchains = gh_facebook_buck2_shims_meta
+
+[external_cells]
+prelude = bundled
+
+[parser]
+target_platform_detector_spec = target:root//...->prelude//platforms:default target:shim//...->prelude//platforms:default

.buckconfig.d/external_cells/facebook/buck2-shims-meta/external_cell.buckconfig

@@ -0,0 +1,9 @@
+[cells]
+gh_facebook_buck2_shims_meta = gh_facebook_buck2_shims_meta
+
+[external_cells]
+gh_facebook_buck2_shims_meta = git
+
+[external_cell_gh_facebook_buck2_shims_meta]
+git_origin = https://github.com/facebook/buck2-shims-meta.git
+commit_hash = b74887e4e5d2042de64f429a348a6eb84c80f977

.github/scripts/bad_targets

@@ -28,13 +28,13 @@ root//folly/docs/examples/folly:synchronized_demo
 root//folly/docs/examples/folly/container:array_demo
 root//folly/docs/examples/folly/dynamic:array_demo
 root//folly/docs/examples/folly/dynamic:object_demo
-root//folly/docs/examples/folly/experimental/coro:async_scope_demo
-root//folly/docs/examples/folly/experimental/coro:cancellable_async_scope_demo
-root//folly/docs/examples/folly/experimental/coro:detach_on_cancel_demo
-root//folly/docs/examples/folly/experimental/coro:promise_demo
-root//folly/docs/examples/folly/experimental/coro:retry_demo
-root//folly/docs/examples/folly/experimental/coro:task_demo
-root//folly/docs/examples/folly/experimental/coro:with_cancellation_demo
+root//folly/docs/examples/folly/coro:async_scope_demo
+root//folly/docs/examples/folly/coro:cancellable_async_scope_demo
+root//folly/docs/examples/folly/coro:detach_on_cancel_demo
+root//folly/docs/examples/folly/coro:promise_demo
+root//folly/docs/examples/folly/coro:retry_demo
+root//folly/docs/examples/folly/coro:task_demo
+root//folly/docs/examples/folly/coro:with_cancellation_demo
 root//folly/docs/examples/folly/hash:hash_demo
 root//folly/docs/examples/folly/io:i_o_buf_demo
 root//folly/experimental/io:async_io

.github/workflows/TagIt.yml

@@ -6,13 +6,18 @@ on:
 
 name: TagIt
 
+permissions:
+  contents: read
+
 jobs:
   build:
+    permissions:
+      contents: write  # for actions/create-release to create a release
     name: Release
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Archive project
         id: archive_project
         run: |

.github/workflows/getdeps_linux.yml

@@ -129,4 +129,5 @@ jobs:
     - name: Test folly
       run: python3 build/fbcode_builder/getdeps.py --allow-system-packages test --src-dir=. folly  --project-install-prefix folly:/usr/local
     - name: Show disk space at end
+      if: always()
       run: df -h

.github/workflows/getdeps_mac.yml

@@ -117,4 +117,5 @@ jobs:
     - name: Test folly
       run: python3 build/fbcode_builder/getdeps.py --allow-system-packages test --src-dir=. folly  --project-install-prefix folly:/usr/local
     - name: Show disk space at end
+      if: always()
       run: df -h

BUCK

@@ -12,6 +12,10 @@ buck_genrule(
     out = "folly-config.h",
     cmd = "cmake . && mv folly/folly-config.h $OUT",
     default_target_platform = "prelude//platforms:default",
-    labels = ["third-party:homebrew:cmake"],
+    labels = [
+        "third-party:fedora:cmake",
+        "third-party:homebrew:cmake",
+        "third-party:ubuntu:cmake",
+    ],
     remote = False,
 )

CMake/FollyCompilerMSVC.cmake

@@ -120,6 +120,7 @@ function(apply_folly_compile_options_to_target THETARGET)
 
       /permissive- # Be mean, don't allow bad non-standard stuff (C++/CLI, __declspec, etc. are all left intact).
       /std:${MSVC_LANGUAGE_VERSION} # Build in the requested version of C++
+      /utf-8 # fmt needs unicode support, which requires compiling with /utf-8
 
     PRIVATE
       /bigobj # Support objects with > 65k sections. Needed due to templates.

CMake/FollyConfigChecks.cmake

@@ -178,30 +178,3 @@ check_cxx_source_runs("
   }"
   HAVE_VSNPRINTF_ERRORS
 )
-
-if (FOLLY_HAVE_LIBGFLAGS)
-  # Older releases of gflags used the namespace "gflags"; newer releases
-  # use "google" but also make symbols available in the deprecated "gflags"
-  # namespace too.  The folly code internally uses "gflags" unless we tell it
-  # otherwise.
-  list(APPEND CMAKE_REQUIRED_LIBRARIES ${FOLLY_LIBGFLAGS_LIBRARY})
-  list(APPEND CMAKE_REQUIRED_INCLUDES ${FOLLY_LIBGFLAGS_INCLUDE})
-  check_cxx_source_compiles("
-    #include <gflags/gflags.h>
-    int main() {
-      gflags::GetArgv();
-      return 0;
-    }
-    "
-    GFLAGS_NAMESPACE_IS_GFLAGS
-  )
-  list(REMOVE_ITEM CMAKE_REQUIRED_LIBRARIES ${FOLLY_LIBGFLAGS_LIBRARY})
-  list(REMOVE_ITEM CMAKE_REQUIRED_INCLUDES ${FOLLY_LIBGFLAGS_INCLUDE})
-  if (GFLAGS_NAMESPACE_IS_GFLAGS)
-    set(FOLLY_UNUSUAL_GFLAGS_NAMESPACE OFF)
-    set(FOLLY_GFLAGS_NAMESPACE gflags)
-  else()
-    set(FOLLY_UNUSUAL_GFLAGS_NAMESPACE ON)
-    set(FOLLY_GFLAGS_NAMESPACE google)
-  endif()
-endif()

CMake/GenPkgConfig.cmake

@@ -103,6 +103,14 @@ function(gen_pkgconfig_vars)
       "<COMPILE_LANG_AND_ID:CUDA,NVIDIA>" "<COMPILE_LANGUAGE:CUDA>"
       cflags "${cflags}"
     )
+
+  endif()
+  # patch for fmt's generator expression
+  if (MSVC)
+    # fmt 11.0.3 and above
+    string(REPLACE "$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CXX_COMPILER_ID:MSVC>>:/utf-8>" "/utf-8" cflags "${cflags}")
+    # fmt 11.0.2 and below
+    string(REPLACE "$<$<COMPILE_LANGUAGE:CXX>:/utf-8>" "/utf-8" cflags "${cflags}")
   endif()
 
   set("${var_prefix}_CFLAGS" "${cflags}" PARENT_SCOPE)

CMake/folly-config.h.cmake

@@ -34,8 +34,6 @@
 #cmakedefine FOLLY_HAVE_PTHREAD_ATFORK 1
 
 #cmakedefine FOLLY_HAVE_LIBGFLAGS 1
-#cmakedefine FOLLY_UNUSUAL_GFLAGS_NAMESPACE 1
-#cmakedefine FOLLY_GFLAGS_NAMESPACE @FOLLY_GFLAGS_NAMESPACE@
 
 #cmakedefine FOLLY_HAVE_LIBGLOG 1
 

CMake/folly-deps.cmake

@@ -187,9 +187,13 @@ message(STATUS "Setting FOLLY_HAVE_DWARF: ${FOLLY_HAVE_DWARF}")
 check_cxx_source_compiles("
   #include <atomic>
   int main(int argc, char** argv) {
+    std::atomic<uint8_t> a1;
+    std::atomic<uint16_t> a2;
+    std::atomic<uint32_t> a4;
+    std::atomic<uint64_t> a8;
     struct Test { bool val; };
     std::atomic<Test> s;
-    return static_cast<int>(s.is_lock_free());
+    return a1++ + a2++ + a4++ + a8++ + unsigned(s.is_lock_free());
   }"
   FOLLY_CPP_ATOMIC_BUILTIN
 )
@@ -200,9 +204,13 @@ if(NOT FOLLY_CPP_ATOMIC_BUILTIN)
   check_cxx_source_compiles("
     #include <atomic>
     int main(int argc, char** argv) {
+      std::atomic<uint8_t> a1;
+      std::atomic<uint16_t> a2;
+      std::atomic<uint32_t> a4;
+      std::atomic<uint64_t> a8;
       struct Test { bool val; };
-      std::atomic<Test> s2;
-      return static_cast<int>(s2.is_lock_free());
+      std::atomic<Test> s;
+      return a1++ + a2++ + a4++ + a8++ + unsigned(s.is_lock_free());
     }"
     FOLLY_CPP_ATOMIC_WITH_LIBATOMIC
   )