diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-09-23 10:04:32 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-09-23 10:04:32 +0200 |
| commit | 7fedee873f0ae977aac1008daa87713a80fc9267 (patch) | |
| tree | fc4496fc100b5e76070835e668cfcec17a1199ed | |
| parent | dafc72cb33ea677cd0b3caffc8fe7bf510a4bf7c (diff) | |
| download | php-git-7fedee873f0ae977aac1008daa87713a80fc9267.tar.gz | |
Fix shift ub
And typo in macro name
| -rw-r--r-- | ext/opcache/jit/zend_jit_internal.h | 4 | ||||
| -rw-r--r-- | ext/opcache/jit/zend_jit_trace.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/opcache/jit/zend_jit_internal.h b/ext/opcache/jit/zend_jit_internal.h index 5983cc3d06..d17d2451d3 100644 --- a/ext/opcache/jit/zend_jit_internal.h +++ b/ext/opcache/jit/zend_jit_internal.h @@ -427,8 +427,8 @@ struct _zend_jit_trace_stack_frame { #define TRACE_FRAME_NO_NEED_REKEASE_THIS(frame) \ ((frame)->_info & TRACE_FRAME_MASK_NO_NEED_RELEASE_THIS) -#define TRACE_FRAME_SET_UNKNOWM_NUM_ARGS(frame) do { \ - (frame)->_info |= (0xffff << TRACE_FRAME_SHIFT_NUM_ARGS); \ +#define TRACE_FRAME_SET_UNKNOWN_NUM_ARGS(frame) do { \ + (frame)->_info |= (0xffffu << TRACE_FRAME_SHIFT_NUM_ARGS); \ } while (0) #define TRACE_FRAME_SET_RETURN_SSA_VAR(frame, var) do { \ (frame)->_info = var; \ diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c index 3fbea0918b..2b40736499 100644 --- a/ext/opcache/jit/zend_jit_trace.c +++ b/ext/opcache/jit/zend_jit_trace.c @@ -5095,7 +5095,7 @@ generic_dynamic_call: case ZEND_SEND_UNPACK: if (JIT_G(current_frame) && JIT_G(current_frame)->call) { - TRACE_FRAME_SET_UNKNOWM_NUM_ARGS(JIT_G(current_frame)->call); + TRACE_FRAME_SET_UNKNOWN_NUM_ARGS(JIT_G(current_frame)->call); } break; default: |