Deduplicate zend_constant filename setting in zend_register_constant()

Author: DanielEScherzer

Zend/zend_builtin_functions.c

@@ -549,13 +549,6 @@ ZEND_FUNCTION(define)
 	/* non persistent */
 	ZEND_CONSTANT_SET_FLAGS(&c, 0, PHP_USER_CONSTANT);
 	c.name = zend_string_copy(name);
-
-	zend_string *filename = zend_get_executed_filename_ex();
-	if (filename == NULL) {
-		c.filename = NULL;
-	} else {
-		c.filename = zend_string_copy(filename);
-	}
 	if (zend_register_constant(&c) == SUCCESS) {
 		RETURN_TRUE;
 	} else {

Zend/zend_constants.c

@@ -132,7 +132,6 @@ ZEND_API void zend_register_null_constant(const char *name, size_t name_len, int
 	ZVAL_NULL(&c.value);
 	ZEND_CONSTANT_SET_FLAGS(&c, flags, module_number);
 	c.name = zend_string_init_interned(name, name_len, flags & CONST_PERSISTENT);
-	c.filename = NULL;
 	zend_register_constant(&c);
 }
 
@@ -143,7 +142,6 @@ ZEND_API void zend_register_bool_constant(const char *name, size_t name_len, boo
 	ZVAL_BOOL(&c.value, bval);
 	ZEND_CONSTANT_SET_FLAGS(&c, flags, module_number);
 	c.name = zend_string_init_interned(name, name_len, flags & CONST_PERSISTENT);
-	c.filename = NULL;
 	zend_register_constant(&c);
 }
 
@@ -154,7 +152,6 @@ ZEND_API void zend_register_long_constant(const char *name, size_t name_len, zen
 	ZVAL_LONG(&c.value, lval);
 	ZEND_CONSTANT_SET_FLAGS(&c, flags, module_number);
 	c.name = zend_string_init_interned(name, name_len, flags & CONST_PERSISTENT);
-	c.filename = NULL;
 	zend_register_constant(&c);
 }
 
@@ -166,7 +163,6 @@ ZEND_API void zend_register_double_constant(const char *name, size_t name_len, d
 	ZVAL_DOUBLE(&c.value, dval);
 	ZEND_CONSTANT_SET_FLAGS(&c, flags, module_number);
 	c.name = zend_string_init_interned(name, name_len, flags & CONST_PERSISTENT);
-	c.filename = NULL;
 	zend_register_constant(&c);
 }
 
@@ -178,7 +174,6 @@ ZEND_API void zend_register_stringl_constant(const char *name, size_t name_len,
 	ZVAL_STR(&c.value, zend_string_init_interned(strval, strlen, flags & CONST_PERSISTENT));
 	ZEND_CONSTANT_SET_FLAGS(&c, flags, module_number);
 	c.name = zend_string_init_interned(name, name_len, flags & CONST_PERSISTENT);
-	c.filename = NULL;
 	zend_register_constant(&c);
 }
 
@@ -509,6 +504,13 @@ ZEND_API zend_result zend_register_constant(zend_constant *c)
 		name = c->name;
 	}
 
+	zend_string *filename = zend_get_executed_filename_ex();
+	if (filename == NULL) {
+		c->filename = NULL;
+	} else {
+		c->filename = zend_string_copy(filename);
+	}
+
 	/* Check if the user is trying to define any special constant */
 	if (zend_string_equals_literal(name, "__COMPILER_HALT_OFFSET__")
 		|| (!persistent && zend_get_special_const(ZSTR_VAL(name), ZSTR_LEN(name)))

Zend/zend_vm_def.h

@@ -8232,13 +8232,6 @@ ZEND_VM_HANDLER(143, ZEND_DECLARE_CONST, CONST, CONST)
 	ZEND_CONSTANT_SET_FLAGS(&c, 0, PHP_USER_CONSTANT);
 	c.name = zend_string_copy(Z_STR_P(name));
 
-	zend_string *filename = zend_get_executed_filename_ex();
-	if (filename == NULL) {
-		c.filename = NULL;
-	} else {
-		c.filename = zend_string_copy(filename);
-	}
-
 	if (zend_register_constant(&c) == FAILURE) {
 	}
 

Zend/zend_vm_execute.h

@@ -233,12 +233,6 @@ PHP_COM_DOTNET_API zend_result php_com_import_typelib(ITypeLib *TL, int mode, in
 					} else {
 						c.name = const_name;
 					}
-					zend_string *filename = zend_get_executed_filename_ex();
-					if (filename == NULL) {
-						c.filename = NULL;
-					} else {
-						c.filename = zend_string_copy(filename);
-					}
 					zend_register_constant(&c);
 				}
 				ITypeInfo_ReleaseVarDesc(TypeInfo, pVarDesc);

ext/com_dotnet/com_typeinfo.c

@@ -546,17 +546,14 @@ static void cli_register_file_handles(void)
 
 	Z_CONSTANT_FLAGS(ic.value) = 0;
 	ic.name = zend_string_init_interned("STDIN", sizeof("STDIN")-1, 0);
-	ic.filename = NULL;
 	zend_register_constant(&ic);
 
 	Z_CONSTANT_FLAGS(oc.value) = 0;
 	oc.name = zend_string_init_interned("STDOUT", sizeof("STDOUT")-1, 0);
-	oc.filename = NULL;
 	zend_register_constant(&oc);
 
 	Z_CONSTANT_FLAGS(ec.value) = 0;
 	ec.name = zend_string_init_interned("STDERR", sizeof("STDERR")-1, 0);
-	ec.filename = NULL;
 	zend_register_constant(&ec);
 }
 

sapi/cli/php_cli.c

@@ -914,21 +914,18 @@ void phpdbg_register_file_handles(void) /* {{{ */
 	ic.value = zin;
 	Z_CONSTANT_FLAGS(ic.value) = 0;
 	ic.name = zend_string_init(ZEND_STRL("STDIN"), 0);
-	ic.filename = NULL;
 	zend_hash_del(EG(zend_constants), ic.name);
 	zend_register_constant(&ic);
 
 	oc.value = zout;
 	Z_CONSTANT_FLAGS(oc.value) = 0;
 	oc.name = zend_string_init(ZEND_STRL("STDOUT"), 0);
-	oc.filename = NULL;
 	zend_hash_del(EG(zend_constants), oc.name);
 	zend_register_constant(&oc);
 
 	ec.value = zerr;
 	Z_CONSTANT_FLAGS(ec.value) = 0;
 	ec.name = zend_string_init(ZEND_STRL("STDERR"), 0);
-	ec.filename = NULL;
 	zend_hash_del(EG(zend_constants), ec.name);
 	zend_register_constant(&ec);
 }