Skip to content

Commit 86bdff5

Browse files
committed
Move FFI related JIT code generation into zend_jit_ir_ffi.c
1 parent 78dfcd0 commit 86bdff5

File tree

5 files changed

+1895
-1882
lines changed

5 files changed

+1895
-1882
lines changed

ext/opcache/jit/Makefile.frag

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ $(builddir)/jit/ir/ir.lo: \
1818

1919
$(builddir)/jit/zend_jit.lo: \
2020
$(srcdir)/jit/zend_jit_helpers.c \
21-
$(srcdir)/jit/zend_jit_ir.c
21+
$(srcdir)/jit/zend_jit_ir.c \
22+
$(srcdir)/jit/zend_jit_ir_ffi.c
2223

2324
# For non-GNU make, jit/zend_jit.lo and ./jit/zend_jit.lo are considered distinct targets.
2425
# Use this workaround to allow building from inside ext/opcache.

ext/opcache/jit/Makefile.frag.w32

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ $(BUILD_DIR)\ext\opcache\jit\ir\ir.obj: \
3333

3434
$(BUILD_DIR)\ext\opcache\jit\zend_jit.obj: \
3535
ext\opcache\jit\zend_jit_ir.c \
36+
ext\opcache\jit\zend_jit_ir_ffi.c \
3637
ext\opcache\jit\zend_jit_helpers.c \
3738
ext\opcache\jit\ir\ir.h \
3839
ext\opcache\jit\ir\ir_builder.h

ext/opcache/jit/zend_jit.c

+4
Original file line numberDiff line numberDiff line change
@@ -806,6 +806,10 @@ static bool zend_may_be_dynamic_property(zend_class_entry *ce, zend_string *memb
806806

807807
#include "jit/zend_jit_ir.c"
808808

809+
#if HAVE_FFI
810+
# include "jit/zend_jit_ir_ffi.c"
811+
#endif
812+
809813
#if defined(__clang__)
810814
# pragma clang diagnostic pop
811815
#endif

0 commit comments

Comments
 (0)