Skip to content

Commit 3228d68

Browse files
dstogovdstogov
committed
Renumber ZEND_ACC_... constants
1 parent 824a2bf commit 3228d68

File tree

1 file changed

+25
-25
lines changed

1 file changed

+25
-25
lines changed

‎Zend/zend_compile.h

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ typedef struct _zend_oparray_context {
238238
/* op_array or class is preloaded | | | */
239239
#define ZEND_ACC_PRELOADED (1 << 10) /* X | X | | */
240240
/* | | | */
241-
/* Class Flags (unused: 14, 15, 24...) | | | */
241+
/* Class Flags (unused: 22...) | | | */
242242
/* =========== | | | */
243243
/* | | | */
244244
/* Special class types | | | */
@@ -264,30 +264,30 @@ typedef struct _zend_oparray_context {
264264
#define ZEND_ACC_NO_DYNAMIC_PROPERTIES (1 << 13) /* X | | | */
265265
/* | | | */
266266
/* User class has methods with static variables | | | */
267-
#define ZEND_HAS_STATIC_IN_METHODS (1 << 16) /* X | | | */
267+
#define ZEND_HAS_STATIC_IN_METHODS (1 << 14) /* X | | | */
268268
/* | | | */
269269
/* Whether all property types are resolved to CEs | | | */
270-
#define ZEND_ACC_PROPERTY_TYPES_RESOLVED (1 << 17) /* X | | | */
270+
#define ZEND_ACC_PROPERTY_TYPES_RESOLVED (1 << 15) /* X | | | */
271271
/* | | | */
272272
/* Children must reuse parent get_iterator() | | | */
273-
#define ZEND_ACC_REUSE_GET_ITERATOR (1 << 18) /* X | | | */
273+
#define ZEND_ACC_REUSE_GET_ITERATOR (1 << 16) /* X | | | */
274274
/* | | | */
275275
/* Parent class is resolved (CE). | | | */
276-
#define ZEND_ACC_RESOLVED_PARENT (1 << 19) /* X | | | */
276+
#define ZEND_ACC_RESOLVED_PARENT (1 << 17) /* X | | | */
277277
/* | | | */
278278
/* Interfaces are resolved (CEs). | | | */
279-
#define ZEND_ACC_RESOLVED_INTERFACES (1 << 20) /* X | | | */
279+
#define ZEND_ACC_RESOLVED_INTERFACES (1 << 18) /* X | | | */
280280
/* | | | */
281281
/* Class has unresolved variance obligations. | | | */
282-
#define ZEND_ACC_UNRESOLVED_VARIANCE (1 << 21) /* X | | | */
282+
#define ZEND_ACC_UNRESOLVED_VARIANCE (1 << 19) /* X | | | */
283283
/* | | | */
284284
/* Class is linked apart from variance obligations. | | | */
285-
#define ZEND_ACC_NEARLY_LINKED (1 << 22) /* X | | | */
285+
#define ZEND_ACC_NEARLY_LINKED (1 << 20) /* X | | | */
286286
/* | | | */
287287
/* Whether this class was used in its unlinked state. | | | */
288-
#define ZEND_ACC_HAS_UNLINKED_USES (1 << 23) /* X | | | */
288+
#define ZEND_ACC_HAS_UNLINKED_USES (1 << 21) /* X | | | */
289289
/* | | | */
290-
/* Function Flags (unused: 17, 23, 26, 29) | | | */
290+
/* Function Flags (unused: 27-30) | | | */
291291
/* ============== | | | */
292292
/* | | | */
293293
/* deprecation flag | | | */
@@ -309,22 +309,25 @@ typedef struct _zend_oparray_context {
309309
/* ZEND_DECLARE_CLASS_DELAYED opcodes | | | */
310310
#define ZEND_ACC_EARLY_BINDING (1 << 16) /* | X | | */
311311
/* | | | */
312+
/* closure uses $this | | | */
313+
#define ZEND_ACC_USES_THIS (1 << 17) /* | X | | */
314+
/* | | | */
312315
/* call through user function trampoline. e.g. | | | */
313316
/* __call, __callstatic | | | */
314317
#define ZEND_ACC_CALL_VIA_TRAMPOLINE (1 << 18) /* | X | | */
315318
/* | | | */
316319
/* disable inline caching | | | */
317320
#define ZEND_ACC_NEVER_CACHE (1 << 19) /* | X | | */
318321
/* | | | */
319-
/* Closure related | | | */
320-
#define ZEND_ACC_CLOSURE (1 << 20) /* | X | | */
321-
#define ZEND_ACC_FAKE_CLOSURE (1 << 21) /* | X | | */
322+
/* op_array is a clone of trait method | | | */
323+
#define ZEND_ACC_TRAIT_CLONE (1 << 20) /* | X | | */
322324
/* | | | */
323-
/* run_time_cache allocated on heap (user only) | | | */
324-
#define ZEND_ACC_HEAP_RT_CACHE (1 << 22) /* | X | | */
325+
/* functions is a constructor | | | */
326+
#define ZEND_ACC_CTOR (1 << 21) /* | X | | */
325327
/* | | | */
326-
/* method flag used by Closure::__invoke() (int only) | | | */
327-
#define ZEND_ACC_USER_ARG_INFO (1 << 22) /* | X | | */
328+
/* Closure related | | | */
329+
#define ZEND_ACC_CLOSURE (1 << 22) /* | X | | */
330+
#define ZEND_ACC_FAKE_CLOSURE (1 << 23) /* | X | | */ /* Same as ZEND_CALL_FAKE_CLOSURE */
328331
/* | | | */
329332
#define ZEND_ACC_GENERATOR (1 << 24) /* | X | | */
330333
/* | | | */
@@ -334,14 +337,11 @@ typedef struct _zend_oparray_context {
334337
/* internal function is allocated at arena (int only) | | | */
335338
#define ZEND_ACC_ARENA_ALLOCATED (1 << 25) /* | X | | */
336339
/* | | | */
337-
/* op_array is a clone of trait method | | | */
338-
#define ZEND_ACC_TRAIT_CLONE (1 << 27) /* | X | | */
339-
/* | | | */
340-
/* functions is a constructor | | | */
341-
#define ZEND_ACC_CTOR (1 << 28) /* | X | | */
340+
/* run_time_cache allocated on heap (user only) | | | */
341+
#define ZEND_ACC_HEAP_RT_CACHE (1 << 26) /* | X | | */
342342
/* | | | */
343-
/* closure uses $this | | | */
344-
#define ZEND_ACC_USES_THIS (1 << 30) /* | X | | */
343+
/* method flag used by Closure::__invoke() (int only) | | | */
344+
#define ZEND_ACC_USER_ARG_INFO (1 << 26) /* | X | | */
345345
/* | | | */
346346
/* op_array uses strict mode types | | | */
347347
#define ZEND_ACC_STRICT_TYPES (1U << 31) /* | X | | */
@@ -526,7 +526,7 @@ struct _zend_execute_data {
526526
#define ZEND_CALL_HAS_SYMBOL_TABLE (1 << 20)
527527
#define ZEND_CALL_RELEASE_THIS (1 << 21)
528528
#define ZEND_CALL_CLOSURE (1 << 22)
529-
#define ZEND_CALL_FAKE_CLOSURE (1 << 23)
529+
#define ZEND_CALL_FAKE_CLOSURE (1 << 23) /* Same as ZEND_ACC_FAKE_CLOSURE */
530530
#define ZEND_CALL_GENERATOR (1 << 24)
531531
#define ZEND_CALL_DYNAMIC (1 << 25)
532532
#define ZEND_CALL_MAY_HAVE_UNDEF (1 << 26)

0 commit comments

Comments
 (0)