Skip to content

Commit 6b160e7

Browse files
authored
Change fetch_type from int to uint32_t (#9152)
This is because it is derived from the opcode num which is an uint32_t
1 parent ba9debb commit 6b160e7

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

Zend/zend_execute.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -349,9 +349,9 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_cannot_pass_by_reference(uint32_t arg
349349
ZEND_API void zend_set_timeout(zend_long seconds, bool reset_signals);
350350
ZEND_API void zend_unset_timeout(void);
351351
ZEND_API ZEND_NORETURN void ZEND_FASTCALL zend_timeout(void);
352-
ZEND_API zend_class_entry *zend_fetch_class(zend_string *class_name, int fetch_type);
353-
ZEND_API zend_class_entry *zend_fetch_class_with_scope(zend_string *class_name, int fetch_type, zend_class_entry *scope);
354-
ZEND_API zend_class_entry *zend_fetch_class_by_name(zend_string *class_name, zend_string *lcname, int fetch_type);
352+
ZEND_API zend_class_entry *zend_fetch_class(zend_string *class_name, uint32_t fetch_type);
353+
ZEND_API zend_class_entry *zend_fetch_class_with_scope(zend_string *class_name, uint32_t fetch_type, zend_class_entry *scope);
354+
ZEND_API zend_class_entry *zend_fetch_class_by_name(zend_string *class_name, zend_string *lcname, uint32_t fetch_type);
355355

356356
ZEND_API zend_function * ZEND_FASTCALL zend_fetch_function(zend_string *name);
357357
ZEND_API zend_function * ZEND_FASTCALL zend_fetch_function_str(const char *name, size_t len);

Zend/zend_execute_API.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1534,7 +1534,7 @@ void zend_unset_timeout(void) /* {{{ */
15341534
}
15351535
/* }}} */
15361536

1537-
static ZEND_COLD void report_class_fetch_error(zend_string *class_name, int fetch_type)
1537+
static ZEND_COLD void report_class_fetch_error(zend_string *class_name, uint32_t fetch_type)
15381538
{
15391539
if (fetch_type & ZEND_FETCH_CLASS_SILENT) {
15401540
return;
@@ -1556,10 +1556,10 @@ static ZEND_COLD void report_class_fetch_error(zend_string *class_name, int fetc
15561556
}
15571557
}
15581558

1559-
zend_class_entry *zend_fetch_class(zend_string *class_name, int fetch_type) /* {{{ */
1559+
zend_class_entry *zend_fetch_class(zend_string *class_name, uint32_t fetch_type) /* {{{ */
15601560
{
15611561
zend_class_entry *ce, *scope;
1562-
int fetch_sub_type = fetch_type & ZEND_FETCH_CLASS_MASK;
1562+
uint32_t fetch_sub_type = fetch_type & ZEND_FETCH_CLASS_MASK;
15631563

15641564
check_fetch_type:
15651565
switch (fetch_sub_type) {
@@ -1605,7 +1605,7 @@ zend_class_entry *zend_fetch_class(zend_string *class_name, int fetch_type) /* {
16051605
/* }}} */
16061606

16071607
zend_class_entry *zend_fetch_class_with_scope(
1608-
zend_string *class_name, int fetch_type, zend_class_entry *scope)
1608+
zend_string *class_name, uint32_t fetch_type, zend_class_entry *scope)
16091609
{
16101610
zend_class_entry *ce;
16111611
switch (fetch_type & ZEND_FETCH_CLASS_MASK) {
@@ -1637,7 +1637,7 @@ zend_class_entry *zend_fetch_class_with_scope(
16371637
return ce;
16381638
}
16391639

1640-
zend_class_entry *zend_fetch_class_by_name(zend_string *class_name, zend_string *key, int fetch_type) /* {{{ */
1640+
zend_class_entry *zend_fetch_class_by_name(zend_string *class_name, zend_string *key, uint32_t fetch_type) /* {{{ */
16411641
{
16421642
zend_class_entry *ce = zend_lookup_class_ex(class_name, key, fetch_type);
16431643
if (!ce) {

0 commit comments

Comments
 (0)