mirrors/php-src
0
0 Fork 0
mirror of https://github.com/php/php-src.git synced 2026-10-28 09:46:46 +08:00
Code Activity

Merge branch 'PHP-8.5' into PHP-8.6

Browse Source 
* PHP-8.5:
  Fix -Wint-to-pointer-cast warnings in the CALL VM on 32-bit (#24360)
This commit is contained in:
Arnaud Le Blanc committed 2026-10-19 11:43:42 +02:00
2 parents 73d2da79a1 4bb88e0367
commit 5089b1c4e8
4 files changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Zend/zend_vm_execute.h
Generated
+1 -1
View File
@@ -440,7 +440,7 @@ static zend_vm_opcode_handler_func_t zend_vm_get_opcode_handler_func(uint8_t opc
# define ZEND_VM_ENTER() opline = EG(current_execute_data)->opline; ZEND_VM_ENTER_EX()
# define ZEND_VM_LEAVE() return 2
#else
# define ZEND_VM_ENTER_BIT 1ULL
# define ZEND_VM_ENTER_BIT ((uintptr_t)1)
# define ZEND_VM_ENTER_EX() return (zend_op*)((uintptr_t)opline | ZEND_VM_ENTER_BIT)
# define ZEND_VM_ENTER() execute_data = EG(current_execute_data); LOAD_OPLINE(); ZEND_VM_ENTER_EX()
# define ZEND_VM_LEAVE() return (zend_op*)((uintptr_t)opline | ZEND_VM_ENTER_BIT)
Zend/zend_vm_gen.php
+1 -1
View File
@@ -2035,7 +2035,7 @@ function gen_executor($f, $skl, $spec, $kind, $executor_name, $initializer_name)
out($f,"# define ZEND_VM_ENTER() opline = EG(current_execute_data)->opline; ZEND_VM_ENTER_EX()\n");
out($f,"# define ZEND_VM_LEAVE() return 2\n");
out($f,"#else\n");
out($f,"# define ZEND_VM_ENTER_BIT 1ULL\n");
out($f,"# define ZEND_VM_ENTER_BIT ((uintptr_t)1)\n");
out($f,"# define ZEND_VM_ENTER_EX() return (zend_op*)((uintptr_t)opline | ZEND_VM_ENTER_BIT)\n");
out($f,"# define ZEND_VM_ENTER() execute_data = EG(current_execute_data); LOAD_OPLINE(); ZEND_VM_ENTER_EX()\n");
out($f,"# define ZEND_VM_LEAVE() return (zend_op*)((uintptr_t)opline | ZEND_VM_ENTER_BIT)\n");
ext/opcache/jit/zend_jit_internal.h
+1 -1
View File
@@ -222,7 +222,7 @@ extern const zend_op *zend_jit_interrupt_op;
# define ZEND_OPCODE_HANDLER_ARGS_PASSTHRU EXECUTE_DATA_C OPLINE_CC
# define ZEND_OPCODE_HANDLER_ARGS_EX EXECUTE_DATA_D OPLINE_DC,
# define ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_EX EXECUTE_DATA_C OPLINE_CC,
# define ZEND_VM_ENTER_BIT 1ULL
# define ZEND_VM_ENTER_BIT ((uintptr_t)1)
#endif
/* VM helpers */
sapi/fuzzer/fuzzer-execute-common.h
+1 -1
View File
@@ -26,7 +26,7 @@
#define FILE_NAME "/tmp/fuzzer.php"
#define MAX_STEPS 1000
#define MAX_SIZE (8 * 1024)
#define ZEND_VM_ENTER_BIT 1ULL
#define ZEND_VM_ENTER_BIT ((uintptr_t)1)
static uint32_t steps_left;
static bool bailed_out = false;