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,29 @@ 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:
+    timeout-minutes: 660 # 12 hours
+    runs-on: hhvm-builder
     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: 20
+        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/HHVMExtensionConfig.cmake

@@ -442,15 +442,7 @@ function (HHVM_EXTENSION_INTERNAL_SORT_OUT_SOURCES rootDir)
     elseif (${fileExtension} STREQUAL ".h" OR ${fileExtension} STREQUAL ".hpp")
       list(APPEND HEADER_SOURCES "${rootDir}/${fileName}")
     elseif (${fileExtension} STREQUAL ".s")
-      # AT&T syntax, MSVC doesn't like.
-      if (NOT MSVC)
-        list(APPEND ASM_SOURCES "${rootDir}/${fileName}")
-      endif()
-    elseif (${fileExtension} STREQUAL ".asm")
-      # MASM syntax. MSVC only.
-      if (MSVC)
-        list(APPEND ASM_SOURCES "${rootDir}/${fileName}")
-      endif()
+      list(APPEND ASM_SOURCES "${rootDir}/${fileName}")
     elseif (${fileExtension} STREQUAL ".php")
       list(APPEND PHP_SOURCES "${rootDir}/${fileName}")
     elseif (${fileExtension} STREQUAL ".hack")
@@ -530,10 +522,6 @@ function(HHVM_EXTENSION_INTERNAL_RESOLVE_DEPENDENCIES_OF_EXTENSION resolvedDestV
         if (${listIDX} EQUAL 0)
           # OS Dependency
           if (${currentDependency} STREQUAL "osPosix")
-            if (MSVC)
-              HHVM_EXTENSION_INTERNAL_SET_FAILED_DEPENDENCY(${extensionID} ${currentDependency} ON)
-              break()
-            endif()
           else()
             message(FATAL_ERROR "The only OS restriction that is currently valid is 'osPosix', got '${currentDependency}'!")
           endif()
@@ -781,15 +769,13 @@ function (HHVM_EXTENSION_INTERNAL_HANDLE_LIBRARY_DEPENDENCY extensionID dependen
       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()
+    find_package(libheif 1.19.8 CONFIG)
 
-    if (${addPaths})
-      HHVM_EXTENSION_INTERNAL_ADD_INCLUDE_DIRS(${LIBHEIF_INCLUDE_DIR})
-      HHVM_EXTENSION_INTERNAL_ADD_LINK_LIBRARIES(${LIBHEIF_LIBRARY})
+    if (libheif_FOUND AND ${addPaths})
+      get_target_property(DEPENDENCY_TARGET_INCLUDE_DIR heif INTERFACE_INCLUDE_DIRECTORIES)
+      HHVM_EXTENSION_INTERNAL_ADD_INCLUDE_DIRS("${DEPENDENCY_TARGET_INCLUDE_DIR}")
+      HHVM_EXTENSION_INTERNAL_ADD_LINK_LIBRARIES(heif)
+      HHVM_EXTENSION_INTERNAL_ADD_DEFINES("-DHAVE_LIBHEIF")
     endif()
   elseif (${libraryName} STREQUAL "iconv")
     find_package(Libiconv ${requiredVersion})

CMake/HHVMGenerateConfig.cmake

@@ -66,16 +66,6 @@ function(HHVM_GENERATE_CONFIG_FUNCTIONS_FOUND_DEFINE_STRING destVarName)
     "utimes"
   )
 
-  # This is a list of functions that are known to be present under MSVC
-  # because they are implemented via Folly's portability headers. For an
-  # item in this list to have any effect, it must first fail to be found
-  # when checking the item in the main list.
-  set(HHVM_FUNCTIONS_KNOWN_TO_BE_PRESENT_MSVC)
-  list(APPEND HHVM_FUNCTIONS_KNOWN_TO_BE_PRESENT_MSVC
-    "mkstemp"
-    "mmap"
-  )
-
   set(builtString "")
   list(LENGTH HHVM_FUNCTIONS_TO_CHECK functionCount)
   set(i 0)
@@ -86,12 +76,7 @@ function(HHVM_GENERATE_CONFIG_FUNCTIONS_FOUND_DEFINE_STRING destVarName)
     if (${HAVE_${curFuncUpper}})
       set(builtString "${builtString}\n#define HAVE_${curFuncUpper} 1")
     else()
-      list(FIND HHVM_FUNCTIONS_KNOWN_TO_BE_PRESENT_MSVC "${curFunc}" curFuncIdx)
-      if (curFuncIdx EQUAL -1 OR NOT MSVC)
-        set(builtString "${builtString}\n/* #undef HAVE_${curFuncUpper} */")
-      else()
-        set(builtString "${builtString}\n#define HAVE_${curFuncUpper} 1 /* Implemented via Folly Portability header */")
-      endif()
+      set(builtString "${builtString}\n/* #undef HAVE_${curFuncUpper} */")
     endif()
     math(EXPR i "${i} + 1")
   endwhile()