Skip to content

Commit a0fe09d

Browse files
committed
More JIT handling for observers
Signed-off-by: Bob Weinand <bobwei9@hotmail.com>
1 parent 8126205 commit a0fe09d

File tree

4 files changed

+192
-90
lines changed

4 files changed

+192
-90
lines changed

Zend/zend_observer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ static void ZEND_FASTCALL _zend_observe_fcall_begin(zend_execute_data *execute_d
240240
zend_observer_fcall_begin_specialized(execute_data, true);
241241
}
242242

243-
void ZEND_FASTCALL zend_observer_fcall_begin_prechecked(zend_execute_data *execute_data, zend_observer_fcall_begin_handler *handler)
243+
ZEND_API void ZEND_FASTCALL zend_observer_fcall_begin_prechecked(zend_execute_data *execute_data, zend_observer_fcall_begin_handler *handler)
244244
{
245245
zend_observer_fcall_begin_handler *possible_handlers_end = handler + zend_observers_fcall_list.count;
246246

Zend/zend_observer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ typedef struct _zend_observer_fcall_handlers {
4343
#define ZEND_OBSERVER_DATA(function) \
4444
((zend_observer_fcall_begin_handler *)&ZEND_OP_ARRAY_EXTENSION((&(function)->common), zend_observer_fcall_op_array_extension))
4545

46-
#define ZEND_OBSERVER_NONE_OBSERVED ((void *) 3)
46+
#define ZEND_OBSERVER_NONE_OBSERVED ((void *) 3) // Neither begin nor end handler present
4747

4848
#define ZEND_OBSERVER_ENABLED (zend_observer_fcall_op_array_extension != -1)
4949

@@ -78,7 +78,7 @@ ZEND_API void zend_observer_activate(void);
7878
ZEND_API void zend_observer_shutdown(void);
7979

8080
ZEND_API void ZEND_FASTCALL zend_observer_fcall_begin(zend_execute_data *execute_data);
81-
void ZEND_FASTCALL zend_observer_fcall_begin_prechecked(zend_execute_data *execute_data, zend_observer_fcall_begin_handler *observer_data);
81+
ZEND_API void ZEND_FASTCALL zend_observer_fcall_begin_prechecked(zend_execute_data *execute_data, zend_observer_fcall_begin_handler *observer_data);
8282

8383
static zend_always_inline bool zend_observer_handler_is_unobserved(zend_observer_fcall_begin_handler *handler) {
8484
return *handler == ZEND_OBSERVER_NONE_OBSERVED;

Zend/zend_vm_execute.h

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)