diff --git a/CMakeLists.txt b/CMakeLists.txt
index ff07e362..1f8d9ca1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -444,28 +444,27 @@ endif()
 add_library(dwarfs_folly_lite
   ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/concurrency/CacheLocality.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/container/detail/F14Table.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/debugging/symbolizer/Dwarf.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/debugging/symbolizer/DwarfImpl.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/debugging/symbolizer/DwarfLineNumberVM.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/debugging/symbolizer/DwarfSection.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/debugging/symbolizer/DwarfUtil.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/debugging/symbolizer/Elf.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/debugging/symbolizer/ElfCache.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/debugging/symbolizer/LineReader.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/debugging/symbolizer/SignalHandler.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/debugging/symbolizer/StackTrace.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/debugging/symbolizer/SymbolizePrinter.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/debugging/symbolizer/SymbolizedFrame.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/debugging/symbolizer/Symbolizer.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/detail/Futex.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/detail/RangeCommon.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/detail/FileUtilDetail.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/detail/RangeSse42.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/detail/SimpleSimdStringUtils.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/detail/SplitStringSimd.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/experimental/io/FsUtil.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/experimental/symbolizer/DwarfSection.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/experimental/symbolizer/LineReader.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/experimental/symbolizer/Dwarf.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/experimental/symbolizer/DwarfImpl.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/experimental/symbolizer/DwarfLineNumberVM.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/experimental/symbolizer/DwarfUtil.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/experimental/symbolizer/Elf.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/experimental/symbolizer/ElfCache.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/experimental/symbolizer/SignalHandler.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/experimental/symbolizer/StackTrace.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/experimental/symbolizer/SymbolizePrinter.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/experimental/symbolizer/SymbolizedFrame.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/experimental/symbolizer/Symbolizer.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/experimental/TestUtil.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/hash/SpookyHashV2.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/io/FsUtil.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/io/IOBuf.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/io/IOBufQueue.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/lang/ToAscii.cpp
@@ -494,6 +493,7 @@ add_library(dwarfs_folly_lite
   ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/system/AtFork.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/system/ThreadId.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/system/ThreadName.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/testing/TestUtil.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/tracing/AsyncStack.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/ExceptionString.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/Conv.cpp
@@ -1228,8 +1228,8 @@ endif(NOT STATIC_BUILD_DO_NOT_USE)
 if(DWARFS_USE_EXCEPTION_TRACER)
   add_library(
     dwarfs_folly_exception_tracer_base_lite
-    ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/experimental/exception_tracer/ExceptionTracer.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/experimental/exception_tracer/StackTrace.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/debugging/exception_tracer/ExceptionTracer.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/debugging/exception_tracer/StackTrace.cpp
   )
   set_property(TARGET dwarfs_folly_exception_tracer_base_lite PROPERTY CXX_STANDARD 20)
   apply_folly_compile_options_to_target(dwarfs_folly_exception_tracer_base_lite)
diff --git a/fbthrift b/fbthrift
index 6afdae43..f14942e2 160000
--- a/fbthrift
+++ b/fbthrift
@@ -1 +1 @@
-Subproject commit 6afdae43adb1ac893b289a40642572ac74e72880
+Subproject commit f14942e214bf66fee985e7adf26d7ce3c7b69829
diff --git a/folly b/folly
index 895a7fcf..70efc234 160000
--- a/folly
+++ b/folly
@@ -1 +1 @@
-Subproject commit 895a7fcfb42d018f411ca57b164dfb2b975fd893
+Subproject commit 70efc234c21526f928028850e9205f16f7dce3cc