Merge remote-tracking branch 'origin/master' into test_repeat

Author: danog

.github/workflows/push.yml

@@ -73,13 +73,17 @@ jobs:
             asan: true
     name: "LINUX_X64_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}${{ matrix.asan && '_ASAN' || '' }}"
     runs-on: ubuntu-22.04
-    container:
-      image: ${{ matrix.asan && 'ubuntu:23.04' || null }}
     steps:
       - name: git checkout
         uses: actions/checkout@v4
       - name: apt
         uses: ./.github/actions/apt-x64
+      - name: LLVM 16 (ASAN-only)
+        if: ${{ matrix.asan }}
+        run: |
+          wget https://apt.llvm.org/llvm.sh
+          chmod u+x llvm.sh
+          sudo ./llvm.sh 16
       - name: System info
         run: |
           echo "::group::Show host CPU info"
@@ -110,7 +114,7 @@ jobs:
           configurationParameters: >-
             --${{ matrix.debug && 'enable' || 'disable' }}-debug
             --${{ matrix.zts && 'enable' || 'disable' }}-zts
-            ${{ matrix.asan && 'CFLAGS="-fsanitize=undefined,address -DZEND_TRACK_ARENA_ALLOC" LDFLAGS="-fsanitize=undefined,address" CC=clang CXX=clang++ --disable-opcache-jit' || '' }}
+            ${{ matrix.asan && 'CFLAGS="-fsanitize=undefined,address -DZEND_TRACK_ARENA_ALLOC" LDFLAGS="-fsanitize=undefined,address" CC=clang-16 CXX=clang++-16 --disable-opcache-jit' || '' }}
           skipSlow: ${{ matrix.asan }}
       - name: make
         run: make -j$(/usr/bin/nproc) >/dev/null

NEWS

@@ -38,6 +38,9 @@ Standard:
   . Fix GH-12252 (round(): Validate the rounding mode). (timwolla)
   . Increase the default BCrypt cost to 12. (timwolla)
 
+XML:
+  . Added XML_OPTION_PARSE_HUGE parser option. (nielsdos)
+
 XSL:
   . Implement request #64137 (XSLTProcessor::setParameter() should allow both
     quotes to be used). (nielsdos)

Zend/tests/match/046.phpt

@@ -0,0 +1,41 @@
+--TEST--
+Nested match expressions
+--FILE--
+<?php
+
+// Nested in return expression:
+$b = 'b';
+echo match($b) {
+    'a' => 1,
+    'b' => match (1) {
+        strpos('ab', $b) => 100,
+        default => 15
+    },
+    default => 4
+};
+
+echo "\n";
+
+// Nested in condition expression:
+$c = 'c';
+echo match($c) {
+    'foo' => 'bar',
+    match ($c) { default => 'c' } => 300
+};
+
+echo "\n";
+
+// Nested in one of many condition expressions:
+$d = 'd';
+echo match($d) {
+    'foo' => 'bar',
+    match ($d) { default => 'd' },
+    match ($d) { default => 'e' } => 500
+};
+
+
+?>
+--EXPECT--
+100
+300
+500

Zend/tests/match/047.phpt

@@ -0,0 +1,14 @@
+--TEST--
+Match expression inside subject expression
+--FILE--
+<?php
+
+echo match (match ('b') { default => 'b' }) {
+    'a' => 100,
+    'b' => 200,
+    'c' => 300
+};
+
+?>
+--EXPECT--
+200

Zend/zend_vm_execute.h

@@ -13,6 +13,16 @@ ZEND_API void {%EXECUTOR_NAME%}_ex(zend_execute_data *ex)
 
 	{%INTERNAL_LABELS%}
 
+#if (ZEND_VM_KIND == ZEND_VM_KIND_HYBRID)
+	/* Force C compiler to store preserved registers to allow JIT using them */
+# if defined(__GNUC__) && defined(__i386__)
+	__asm__ __volatile__ (""::: "ebx");
+# elif defined(__GNUC__) && defined(__x86_64__)
+	__asm__ __volatile__ (""::: "rbx","r12","r13");
+# elif defined(__GNUC__) && defined(__aarch64__)
+	__asm__ __volatile__ (""::: "x19","x20","x21","x22","x23","x24","x25","x26");
+# endif
+#endif
 	LOAD_OPLINE();
 	ZEND_VM_LOOP_INTERRUPT_CHECK();
 

Zend/zend_vm_execute.skl

@@ -2046,14 +2046,14 @@ function gen_executor($f, $skl, $spec, $kind, $executor_name, $initializer_name)
                     } else {
                         out($f,"#if defined(ZEND_VM_IP_GLOBAL_REG) || defined(ZEND_VM_FP_GLOBAL_REG)\n");
                         out($f,$m[1]."struct {\n");
+                        out($f,"#ifdef ZEND_VM_HYBRID_JIT_RED_ZONE_SIZE\n");
+                        out($f,$m[1]."\tchar hybrid_jit_red_zone[ZEND_VM_HYBRID_JIT_RED_ZONE_SIZE];\n");
+                        out($f,"#endif\n");
                         out($f,"#ifdef ZEND_VM_IP_GLOBAL_REG\n");
                         out($f,$m[1]."\tconst zend_op *orig_opline;\n");
                         out($f,"#endif\n");
                         out($f,"#ifdef ZEND_VM_FP_GLOBAL_REG\n");
                         out($f,$m[1]."\tzend_execute_data *orig_execute_data;\n");
-                        out($f,"#ifdef ZEND_VM_HYBRID_JIT_RED_ZONE_SIZE\n");
-                        out($f,$m[1]."\tchar hybrid_jit_red_zone[ZEND_VM_HYBRID_JIT_RED_ZONE_SIZE];\n");
-                        out($f,"#endif\n");
                         out($f,"#endif\n");
                         out($f,$m[1]."} vm_stack_data;\n");
                         out($f,"#endif\n");
@@ -2339,7 +2339,7 @@ function gen_vm_opcodes_header(
     $str .= "\n";
     $str .= "#if (ZEND_VM_KIND == ZEND_VM_KIND_HYBRID) && !defined(__SANITIZE_ADDRESS__)\n";
     $str .= "# if ((defined(i386) && !defined(__PIC__)) || defined(__x86_64__) || defined(_M_X64))\n";
-    $str .= "#  define ZEND_VM_HYBRID_JIT_RED_ZONE_SIZE 16\n";
+    $str .= "#  define ZEND_VM_HYBRID_JIT_RED_ZONE_SIZE 48\n";
     $str .= "# endif\n";
     $str .= "#endif\n";
     $str .= "\n";

Zend/zend_vm_gen.php

@@ -122,6 +122,11 @@ clean:
 	rm -f ext/opcache/jit/zend_jit_x86.c
 	rm -f ext/opcache/jit/zend_jit_arm64.c
 	rm -f ext/opcache/minilua
+	rm -f ext/opcache/jit/ir/gen_ir_fold_hash
+	rm -f ext/opcache/jit/ir/minilua
+	rm -f ext/opcache/jit/ir/ir_fold_hash.h
+	rm -f ext/opcache/jit/ir/ir_emit_x86.h
+	rm -f ext/opcache/jit/ir/ir_emit_aarch64.h
 
 distclean: clean
 	rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h

Zend/zend_vm_opcodes.h

@@ -24,6 +24,13 @@ PHP_ARG_WITH([capstone],,
   [no],
   [no])
 
+PHP_ARG_ENABLE([opcache-jit-ir],
+  [whether to enable JIT based on IR framework],
+  [AS_HELP_STRING([--disable-opcache-jit-ir],
+    [Disable JIT based on IR framework (use old JIT)])],
+  [yes],
+  [no])
+
 if test "$PHP_OPCACHE" != "no"; then
 
   dnl Always build as shared extension
@@ -44,7 +51,7 @@ if test "$PHP_OPCACHE" != "no"; then
     esac
   fi
 
-  if test "$PHP_OPCACHE_JIT" = "yes"; then
+  if test "$PHP_OPCACHE_JIT" = "yes" -a "$PHP_OPCACHE_JIT_IR" = "no" ; then
     AC_DEFINE(HAVE_JIT, 1, [Define to enable JIT])
     ZEND_JIT_SRC="jit/zend_jit.c jit/zend_jit_gdb.c jit/zend_jit_vm_helpers.c"
 
@@ -86,6 +93,62 @@ if test "$PHP_OPCACHE" != "no"; then
 
     PHP_SUBST(DASM_FLAGS)
     PHP_SUBST(DASM_ARCH)
+
+    JIT_CFLAGS=
+
+  elif test "$PHP_OPCACHE_JIT" = "yes" -a "$PHP_OPCACHE_JIT_IR" = "yes"; then
+    AC_DEFINE(HAVE_JIT, 1, [Define to enable JIT])
+    AC_DEFINE(ZEND_JIT_IR, 1, [Use JIT IR framework])
+    ZEND_JIT_SRC="jit/zend_jit.c jit/zend_jit_vm_helpers.c jit/ir/ir.c jit/ir/ir_strtab.c \
+		jit/ir/ir_cfg.c	jit/ir/ir_sccp.c jit/ir/ir_gcm.c jit/ir/ir_ra.c jit/ir/ir_save.c \
+		jit/ir/ir_dump.c jit/ir/ir_gdb.c jit/ir/ir_perf.c jit/ir/ir_check.c \
+		jit/ir/ir_patch.c jit/ir/ir_emit.c"
+
+    dnl Find out which ABI we are using.
+    case $host_alias in
+      x86_64-*-darwin*)
+        IR_TARGET=IR_TARGET_X64
+        DASM_FLAGS="-D X64APPLE=1 -D X64=1"
+        DASM_ARCH="x86"
+        ;;
+      x86_64*)
+        IR_TARGET=IR_TARGET_X64
+        DASM_FLAGS="-D X64=1"
+        DASM_ARCH="x86"
+        ;;
+      i[[34567]]86*)
+        IR_TARGET=IR_TARGET_X86
+        DASM_ARCH="x86"
+        ;;
+      x86*)
+        IR_TARGET=IR_TARGET_X86
+        DASM_ARCH="x86"
+        ;;
+      aarch64*)
+        IR_TARGET=IR_TARGET_AARCH64
+        DASM_ARCH="aarch64"
+        ;;
+     esac
+
+    AS_IF([test x"$with_capstone" = "xyes"],[
+      PKG_CHECK_MODULES([CAPSTONE],[capstone >= 3.0.0],[
+        AC_DEFINE([HAVE_CAPSTONE], [1], [Capstone is available])
+        PHP_EVAL_LIBLINE($CAPSTONE_LIBS, OPCACHE_SHARED_LIBADD)
+        PHP_EVAL_INCLINE($CAPSTONE_CFLAGS)
+        ZEND_JIT_SRC+=" jit/ir/ir_disasm.c"
+      ],[
+        AC_MSG_ERROR([capstone >= 3.0 required but not found])
+      ])
+    ])
+
+    PHP_SUBST(IR_TARGET)
+    PHP_SUBST(DASM_FLAGS)
+    PHP_SUBST(DASM_ARCH)
+
+    JIT_CFLAGS="-I@ext_builddir@/jit/ir -D${IR_TARGET} -DIR_PHP"
+    if test "$ZEND_DEBUG" = "yes"; then
+      JIT_CFLAGS="${JIT_CFLAGS} -DIR_DEBUG"
+    fi
   fi
 
   AC_CHECK_FUNCS([mprotect memfd_create shm_create_largepage])
@@ -310,7 +373,7 @@ int main(void) {
 	shared_alloc_mmap.c \
 	shared_alloc_posix.c \
 	$ZEND_JIT_SRC,
-	shared,,"-Wno-implicit-fallthrough -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1",,yes)
+	shared,,"-Wno-implicit-fallthrough -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 ${JIT_CFLAGS}",,yes)
 
   PHP_ADD_EXTENSION_DEP(opcache, pcre)
 
@@ -320,6 +383,9 @@ int main(void) {
 
   if test "$PHP_OPCACHE_JIT" = "yes"; then
     PHP_ADD_BUILD_DIR([$ext_builddir/jit], 1)
+    if test "$PHP_OPCACHE_JIT_IR" = "yes"; then
+      PHP_ADD_BUILD_DIR([$ext_builddir/jit/ir], 1)
+    fi
     PHP_ADD_MAKEFILE_FRAGMENT($ext_srcdir/jit/Makefile.frag)
   fi
   PHP_SUBST(OPCACHE_SHARED_LIBADD)