From 412b4deada3335aaa1c37f139562fb98ddced68d Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 16 Jan 2023 09:35:24 +0100 Subject: [PATCH] Zend/zend_execute: re-add `#include zend_dtrace.h` This was removed by commit ecc880f491d66, but that broke builds with DTrace support; zend_execute.c does not actually need that header, but zend_vm_execute.h does. See https://github.com/php/php-src/pull/10220#issuecomment-1383035139 for the build failure report. --- Zend/zend_execute.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index d1ca0ee62ae3..e2918d77a5d1 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -5342,6 +5342,11 @@ ZEND_API void (ZEND_FASTCALL *zend_touch_vm_stack_data)(void *vm_stack_data) = N #include "zend_fibers.h" // needed by zend_vm_execute.h #include "zend_interfaces.h" // needed by zend_vm_execute.h #include "zend_objects.h" // needed by zend_vm_execute.h + +#ifdef HAVE_DTRACE +#include "zend_dtrace.h" // needed by zend_vm_execute.h for DTRACE_EXCEPTION_CAUGHT() +#endif + #include "zend_vm_execute.h" ZEND_API zend_result zend_set_user_opcode_handler(zend_uchar opcode, user_opcode_handler_t handler)