Skip to content

Commit 8eda3ea

Browse files
committed
Make zend_enum_fetch_case_(name|value) available to extensions
1 parent 57fb1f5 commit 8eda3ea

File tree

2 files changed

+13
-15
lines changed

2 files changed

+13
-15
lines changed

Zend/zend_enum.c

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -366,16 +366,3 @@ void zend_enum_register_props(zend_class_entry *ce)
366366
zend_declare_typed_property(ce, ZSTR_KNOWN(ZEND_STR_VALUE), &value_default_value, ZEND_ACC_PUBLIC, NULL, value_type);
367367
}
368368
}
369-
370-
zval *zend_enum_fetch_case_name(zend_object *zobj)
371-
{
372-
ZEND_ASSERT(zobj->ce->ce_flags & ZEND_ACC_ENUM);
373-
return OBJ_PROP_NUM(zobj, 0);
374-
}
375-
376-
zval *zend_enum_fetch_case_value(zend_object *zobj)
377-
{
378-
ZEND_ASSERT(zobj->ce->ce_flags & ZEND_ACC_ENUM);
379-
ZEND_ASSERT(zobj->ce->enum_scalar_type != IS_UNDEF);
380-
return OBJ_PROP_NUM(zobj, 1);
381-
}

Zend/zend_enum.h

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,19 @@ zend_object *zend_enum_new(zval *result, zend_class_entry *ce, zend_string *case
3333
void zend_verify_enum(zend_class_entry *ce);
3434
void zend_enum_register_funcs(zend_class_entry *ce);
3535
void zend_enum_register_props(zend_class_entry *ce);
36-
zval *zend_enum_fetch_case_name(zend_object *zobj);
37-
zval *zend_enum_fetch_case_value(zend_object *zobj);
36+
37+
static zend_always_inline zval *zend_enum_fetch_case_name(zend_object *zobj)
38+
{
39+
ZEND_ASSERT(zobj->ce->ce_flags & ZEND_ACC_ENUM);
40+
return OBJ_PROP_NUM(zobj, 0);
41+
}
42+
43+
static zend_always_inline zval *zend_enum_fetch_case_value(zend_object *zobj)
44+
{
45+
ZEND_ASSERT(zobj->ce->ce_flags & ZEND_ACC_ENUM);
46+
ZEND_ASSERT(zobj->ce->enum_scalar_type != IS_UNDEF);
47+
return OBJ_PROP_NUM(zobj, 1);
48+
}
3849

3950
END_EXTERN_C()
4051

0 commit comments

Comments
 (0)