Skip to content

Commit a3a2536

Browse files
iluuu1994DanielEScherzer
authored andcommitted
Revert some more unnecessary changes
1 parent 3826e60 commit a3a2536

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

Zend/zend_compile.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7373,7 +7373,7 @@ static bool zend_is_valid_default_value(zend_type type, zval *value)
73737373
return 0;
73747374
}
73757375

7376-
void zend_compile_attributes(
7376+
static void zend_compile_attributes(
73777377
HashTable **attributes, zend_ast *ast, uint32_t offset, uint32_t target, uint32_t promoted
73787378
) /* {{{ */ {
73797379
zend_attribute *attr;
@@ -7415,10 +7415,8 @@ void zend_compile_attributes(
74157415
}
74167416
}
74177417

7418-
uint32_t flags = 0;
7419-
if (CG(active_op_array) && (CG(active_op_array)->fn_flags & ZEND_ACC_STRICT_TYPES)) {
7420-
flags = ZEND_ATTRIBUTE_STRICT_TYPES;
7421-
}
7418+
uint32_t flags = (CG(active_op_array)->fn_flags & ZEND_ACC_STRICT_TYPES)
7419+
? ZEND_ATTRIBUTE_STRICT_TYPES : 0;
74227420
attr = zend_add_attribute(
74237421
attributes, name, args ? args->children : 0, flags, offset, el->lineno);
74247422
zend_string_release(name);

Zend/zend_compile.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1009,10 +1009,6 @@ void zend_assert_valid_class_name(const zend_string *const_name, const char *typ
10091009
zend_string *zend_type_to_string_resolved(zend_type type, zend_class_entry *scope);
10101010
ZEND_API zend_string *zend_type_to_string(zend_type type);
10111011

1012-
void zend_compile_attributes(
1013-
HashTable **attributes, zend_ast *ast, uint32_t offset, uint32_t target, uint32_t promoted
1014-
);
1015-
10161012
/* BEGIN: OPCODES */
10171013

10181014
#include "zend_vm_opcodes.h"

0 commit comments

Comments
 (0)