Fix OSS build

.github/workflows/ubuntu.yml

@@ -1,11 +1,6 @@
 name: Ubuntu CI
 
 on:
-  push:
-    branches-ignore:
-      # Exclude the push event for exported diffs, because the CI for export
-      # should have been covered by GitHub Actions triggered by pull requests.
-      - 'export-D+'
   pull_request:
 
 concurrency:
@@ -25,47 +20,28 @@ env:
   DEBIAN_FRONTEND: "noninteractive"
 
 jobs:
-  build_ubuntu_focal_nightly:
-    runs-on: 16-core
-    container:
-      image: ubuntu:focal
-      env:
-        DISTRO: ubuntu-20.04-focal
-        IS_NIGHTLY: 1
-        CLANG_VERSION: 12
+  build_ubuntu_noble_nightly:
+    runs-on: ubuntu-latest
     steps:
-    - name: Installing dependencies to bootstrap env
-      run: apt update -y && apt install -y git wget lsb-release software-properties-common gpg
-    - name: Installing llvm
-      run: |
-        wget https://apt.llvm.org/llvm.sh
-        chmod +x llvm.sh
-        # Note: Keep this version in sync with the one in the Debian control file.
-        ./llvm.sh ${CLANG_VERSION}
-    - name: Making LLVM the default compiler
-      run: |
-        if [ -f /etc/alternatives/cc ]
-        then
-          update-alternatives --remove-all cc
-        fi
-
-        if [ -f /etc/alternatives/c++ ]
-        then
-          update-alternatives --remove-all c++
-        fi
-
-        update-alternatives --install /usr/bin/cc cc /usr/bin/clang++-${CLANG_VERSION} 500
-        update-alternatives --set cc /usr/bin/clang++-${CLANG_VERSION}
-        update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-${CLANG_VERSION} 500
-        update-alternatives --set c++ /usr/bin/clang++-${CLANG_VERSION}
-    - name: Fetching HHVM and its submodules
-      uses: actions/checkout@v3
-      with:
-        submodules: 'recursive'
-    - name: Installing HHVM deps and building HHVM
-      run: ci/bin/make-debianish-package
-    - name: Uploading artifacts
-      uses: actions/upload-artifact@v3
-      with:
-        name: out-directory
-        path: ${{ env.OUT }}
+      # The HHVM build requires more disk space than what is available
+      # on a default Actions runner, so remove some cruft.
+      - name: Free up disk space
+        uses: jlumbroso/[email protected]
+      - name: Fetching HHVM and its submodules
+        uses: actions/checkout@v4
+        with:
+          submodules: "recursive"
+      - name: Installing HHVM deps and building HHVM
+        uses: docker://ubuntu:noble
+        env:
+          DISTRO: ubuntu-24.04-noble
+          IS_NIGHTLY: 1
+          CLANG_VERSION: 18
+        with:
+          entrypoint: /bin/bash
+          args: ci/bin/make-debianish-package
+      - name: Uploading artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: out-directory
+          path: ${{ env.OUT }}

.gitignore

@@ -86,6 +86,9 @@ install_manifest.txt
 /hphp/hack/test/.mypy_cache
 /hphp/util/generated-hhjs-babel-transform.txt
 
+# Generated core systemlib
+/hphp/runtime/ext/core/ext_core.php
+
 # CPack
 CPackConfig.cmake
 CPackSourceConfig.cmake

.gitmodules

@@ -19,3 +19,6 @@
 [submodule "xed-xed"]
 	path = third-party/xed/xed
 	url = https://github.com/intelxed/xed.git
+[submodule "third-party/mvfst/src"]
+	path = third-party/mvfst/src
+	url = https://github.com/facebook/mvfst.git

CMake/FindBpf.cmake

@@ -0,0 +1,15 @@
+find_path(BPF_INCLUDE_DIR bpf/bpf.h)
+find_library(BPF_LIBRARY NAMES bpf)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(BPF DEFAULT_MSG BPF_LIBRARY BPF_INCLUDE_DIR)
+
+if(BPF_FOUND)
+  set(BPF_LIBRARIES ${BPF_LIBRARY})
+  set(BPF_INCLUDE_DIRS ${BPF_INCLUDE_DIR})
+else()
+  set(BPF_LIBRARIES)
+  set(BPF_INCLUDE_DIRS)
+endif()
+
+mark_as_advanced(BPF_LIBRARIES BPF_INCLUDE_DIRS)

CMake/FindLibDwarf.cmake

@@ -25,36 +25,72 @@ endif (LIBDWARF_LIBRARIES AND LIBDWARF_INCLUDE_DIRS)
 find_package(PkgConfig)
 pkg_check_modules(PkgConfig_LibDwarf QUIET libdwarf)
 
+set(
+  LIBDWARF_INCLUDE_PATHS
+  ${PkgConfig_LibDwarf_INCLUDE_DIRS}
+  /usr/include
+  /usr/include/libdwarf
+  /usr/local/include
+  /usr/local/include/libdwarf
+  /opt/local/include
+  /sw/include
+)
+
 find_path (DWARF_INCLUDE_DIR
   NAMES
     libdwarf.h dwarf.h
   PATHS
-    ${PkgConfig_LibDwarf_INCLUDE_DIRS}
-    /usr/include
-    /usr/include/libdwarf
-    /usr/local/include
-    /usr/local/include/libdwarf
-    /opt/local/include
-    /sw/include
+    ${LIBDWARF_INCLUDE_PATHS}
     ENV CPATH) # PATH and INCLUDE will also work
 
 if (DWARF_INCLUDE_DIR)
   set (LIBDWARF_INCLUDE_DIRS  ${DWARF_INCLUDE_DIR})
 endif ()
 
+set(LIBDWARF_LIBRARY_NAMES dwarf libdwarf)
+
+find_path (LIBDWARF_PRODUCER_PATHS
+  NAMES
+    libdwarfp.h
+  PATHS
+    ${LIBDWARF_INCLUDE_PATHS}
+  ENV CPATH
+)
+
+set(
+  LIBDWARF_LIBRARY_PATHS
+  /usr/lib
+  /usr/local/lib
+  /opt/local/lib
+  /sw/lib
+  ${PkgConfig_LibDwarf_LIBRARY_DIRS}
+  ENV LIBRARY_PATH   # PATH and LIB will also work
+  ENV LD_LIBRARY_PATH
+)
+
+if (LIBDWARF_PRODUCER_PATHS)
+  set(LIBDWARF_USE_NEW_PRODUCER_API 1)
+else()
+  set(LIBDWARF_USE_NEW_PRODUCER_API 0)
+endif()
+
 find_library (LIBDWARF_LIBRARIES
   NAMES
     dwarf libdwarf
   PATHS
-    /usr/lib
-    /usr/local/lib
-    /opt/local/lib
-    /sw/lib
-    ${PkgConfig_LibDwarf_LIBRARY_DIRS}
-    ENV LIBRARY_PATH   # PATH and LIB will also work
-    ENV LD_LIBRARY_PATH)
-include (FindPackageHandleStandardArgs)
+    ${LIBDWARF_LIBRARY_PATHS})
+
+if (LIBDWARF_USE_NEW_PRODUCER_API)
+  find_library (LIBDWARFP_LIBRARIES
+    NAMES
+      dwarfp libdwarfp
+    PATHS
+      ${LIBDWARF_LIBRARY_PATHS})
 
+  list(APPEND LIBDWARF_LIBRARIES ${LIBDWARFP_LIBRARIES})
+endif()
+
+include (FindPackageHandleStandardArgs)
 
 # handle the QUIETLY and REQUIRED arguments and set LIBDWARF_FOUND to TRUE
 # if all listed variables are TRUE
@@ -106,7 +142,7 @@ if (LIBDWARF_LIBRARIES AND LIBDWARF_INCLUDE_DIRS)
 
   # Order is important, last one is used.
   CHECK_LIBDWARF_INIT("dwarf_producer_init"
-	"0, dwarfCallback, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr" 0)
+ "0, dwarfCallback, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr" 0)
   CHECK_LIBDWARF_INIT("dwarf_producer_init_c" "0, dwarfCallback, nullptr, nullptr, nullptr, nullptr" 1)
 
   set(CMAKE_REQUIRED_INCLUDES)
@@ -127,3 +163,4 @@ endif()
 mark_as_advanced(LIBDW_INCLUDE_DIR DWARF_INCLUDE_DIR)
 mark_as_advanced(LIBDWARF_INCLUDE_DIRS LIBDWARF_LIBRARIES)
 mark_as_advanced(LIBDWARF_CONST_NAME LIBDWARF_USE_INIT_C)
+mark_as_advanced(LIBDWARF_USE_NEW_PRODUCER_API)

CMake/FindLibheif.cmake

@@ -0,0 +1,23 @@
+if(LIBHEIF_FOUND)
+  set(LIBHEIF_FIND_QUIETLY TRUE)
+endif()
+
+find_path(LIBHEIF_INCLUDE_DIR
+  NAMES heif.h
+  PATH_SUFFIXES libheif
+  PATHS /usr/include /usr/local/include /usr/pkg/include
+)
+
+find_library(LIBHEIF_LIBRARY
+  NAMES heif
+  PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
+)
+
+if(LIBHEIF_INCLUDE_DIR AND LIBHEIF_LIBRARY)
+  set(LIBHEIF_FOUND TRUE)
+endif()
+
+mark_as_advanced(
+  LIBHEIF_INCLUDE_DIR
+  LIBHEIF_LIBRARY
+)

CMake/FindLmdb.cmake

@@ -0,0 +1,17 @@
+if(LMDB_FOUND)
+  set(LMDB_FIND_QUIETLY TRUE)
+endif()
+
+find_path(LMDB_INCLUDE_DIR
+  NAMES lmdb.h
+  PATHS /usr/include /usr/local/include /usr/pkg/include
+)
+
+find_library(LMDB_LIBRARY
+  NAMES lmdb
+  PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
+)
+
+if(LMDB_INCLUDE_DIR AND LMDB_LIBRARY)
+  set(LMDB_FOUND TRUE)
+endif()

CMake/HHVMExtensionConfig.cmake

@@ -780,6 +780,17 @@ function (HHVM_EXTENSION_INTERNAL_HANDLE_LIBRARY_DEPENDENCY extensionID dependen
       HHVM_EXTENSION_INTERNAL_ADD_LINK_LIBRARIES(${GMP_LIBRARY})
       HHVM_EXTENSION_INTERNAL_ADD_DEFINES("-DHAVE_LIBGMP")
     endif()
+  elseif (${libraryName} STREQUAL "heif")
+    find_package(Libheif ${requiredVersion} REQUIRED)
+    if (NOT LIBHEIF_INCLUDE_DIR OR NOT LIBHEIF_LIBRARY)
+      HHVM_EXTENSION_INTERNAL_SET_FAILED_DEPENDENCY(${extensionID} ${dependencyName})
+      return()
+    endif()
+
+    if (${addPaths})
+      HHVM_EXTENSION_INTERNAL_ADD_INCLUDE_DIRS(${LIBHEIF_INCLUDE_DIR})
+      HHVM_EXTENSION_INTERNAL_ADD_LINK_LIBRARIES(${LIBHEIF_LIBRARY})
+    endif()
   elseif (${libraryName} STREQUAL "iconv")
     find_package(Libiconv ${requiredVersion})
     if (NOT LIBICONV_INCLUDE_DIR)
@@ -863,6 +874,17 @@ function (HHVM_EXTENSION_INTERNAL_HANDLE_LIBRARY_DEPENDENCY extensionID dependen
       HHVM_EXTENSION_INTERNAL_ADD_LINK_LIBRARIES(${LDAP_LIBRARIES})
       HHVM_EXTENSION_INTERNAL_ADD_DEFINES("-DHAVE_LIBLDAP")
     endif()
+  elseif (${libraryName} STREQUAL "lmdb")
+    find_package(Lmdb ${requiredVersion} REQUIRED)
+    if (NOT LMDB_INCLUDE_DIR OR NOT LMDB_LIBRARY)
+      HHVM_EXTENSION_INTERNAL_SET_FAILED_DEPENDENCY(${extensionID} ${dependencyName})
+      return()
+    endif()
+
+    if (${addPaths})
+      HHVM_EXTENSION_INTERNAL_ADD_INCLUDE_DIRS(${LMDB_INCLUDE_DIR})
+      HHVM_EXTENSION_INTERNAL_ADD_LINK_LIBRARIES(${LMDB_LIBRARY})
+    endif()
   elseif (${libraryName} STREQUAL "magickwand")
     find_package(LibMagickWand ${requiredVersion})
     if (NOT LIBMAGICKWAND_INCLUDE_DIRS OR NOT LIBMAGICKWAND_LIBRARIES OR NOT LIBMAGICKCORE_LIBRARIES)

CMake/HPHPCompiler.cmake

@@ -93,19 +93,8 @@ if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" OR ${CMAKE_CXX_COMPILER_ID} STREQU
   endif()
 
   if (IS_X64)
-    # For unclear reasons, our detection for what crc32 intrinsics you have
-    # will cause Apple clang to ICE. Specifying a baseline here works around
-    # the issue. (SSE4.2 has been available on processors for quite some time now.)
-    if(ENABLE_SSE4_2 OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "AppleClang")
-      list(APPEND GENERAL_CXX_OPTIONS
-        # SSE4.2 has been available on processors for quite some time now. This
-        # allows enabling CRC hash function code
-        "msse4.2"
-      )
-      # Also pass the right option to ASM files to avoid inconsistencies
-      # in CRC hash function handling
-      set(CMAKE_ASM_FLAGS  "${CMAKE_ASM_FLAGS} -msse4.2")
-    endif()
+    list(APPEND GENERAL_CXX_OPTIONS "march=x86-64-v3")
+    set(CMAKE_ASM_FLAGS  "${CMAKE_ASM_FLAGS} -march=x86-64-v3")
   endif()
 
   if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "AppleClang") # using Clang
@@ -134,6 +123,10 @@ if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" OR ${CMAKE_CXX_COMPILER_ID} STREQU
     if(CLANG_FORCE_LIBCPP)
       list(APPEND GENERAL_CXX_OPTIONS "stdlib=libc++")
     endif()
+
+    if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 20)
+      list(APPEND GENERAL_OPTIONS "Wno-nontrivial-memcall")
+    endif()
   else() # using GCC
     list(APPEND DISABLED_NAMED_WARNINGS
       "deprecated-declarations"
@@ -285,13 +278,6 @@ if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" OR ${CMAKE_CXX_COMPILER_ID} STREQU
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -${opt}")
   endforeach()
 
-  # The ASM part of this makes it more effort than it's worth
-  # to add these to the general flags system.
-  if(ENABLE_AVX2)
-    set(CMAKE_C_FLAGS    "${CMAKE_C_FLAGS} -mavx2 -march=core-avx2")
-    set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -mavx2 -march=core-avx2")
-    set(CMAKE_ASM_FLAGS  "${CMAKE_ASM_FLAGS} -mavx2 -march=core-avx2")
-  endif()
   # using Intel C++
 elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")
   set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -no-ipo -fp-model precise -wd584 -wd1418 -wd1918 -wd383 -wd869 -wd981 -wd424 -wd1419 -wd444 -wd271 -wd2259 -wd1572 -wd1599 -wd82 -wd177 -wd593 -w")
@@ -349,11 +335,6 @@ elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
     list(APPEND MSVC_GENERAL_OPTIONS "MP")
   endif()
 
-  # Enable AVX2 codegen if available and requested.
-  if (ENABLE_AVX2)
-    list(APPEND MSVC_GENERAL_OPTIONS "arch:AVX2")
-  endif()
-
   # Validate, and then add the favored architecture.
   if (NOT MSVC_FAVORED_ARCHITECTURE STREQUAL "blend" AND NOT MSVC_FAVORED_ARCHITECTURE STREQUAL "AMD64" AND NOT MSVC_FAVORED_ARCHITECTURE STREQUAL "INTEL64" AND NOT MSVC_FAVORED_ARCHITECTURE STREQUAL "ATOM")
     message(FATAL_ERROR "MSVC_FAVORED_ARCHITECTURE must be set to one of exactly, 'blend', 'AMD64', 'INTEL64', or 'ATOM'! Got '${MSVC_FAVORED_ARCHITECTURE}' instead!")