Commit 53cb896

authored

Generated arginfo header files: remove empty zend_function_entry arrays (#15705)

When a class (or enum) has no methods, rather than using an array that only contains `ZEND_FE_END`, use `NULL` for the functions. The implementation of class registration for internal classes, `do_register_internal_class()` in zend_API.c, already skips classes where the functions are `NULL`. By removing these unneeded arrays, we can reduce the size of the header files, while also removing an unneeded call to zend_register_functions() for each internal class with no extra methods.

1 parent 7dfbf4d commit 53cb896Copy full SHA for 53cb896

File tree

48 files changed

+127

-591

lines changed

Zend
build
- gen_stub.php
ext
- com_dotnet
  - com_extension_arginfo.h
- curl
  - curl_arginfo.h
- date
  - php_date_arginfo.h
- dba
  - dba_arginfo.h
- dom
  - php_dom_arginfo.h
- enchant
  - enchant_arginfo.h
- ffi
  - ffi_arginfo.h
- ftp
  - ftp_arginfo.h
- gd
  - gd_arginfo.h
- intl
  - php_intl_arginfo.h
- json
  - json_arginfo.h
- ldap
  - ldap_arginfo.h
- libxml
  - libxml_arginfo.h
- mysqli
  - mysqli_arginfo.h
- odbc
  - odbc_arginfo.h
- openssl
  - openssl_arginfo.h
- pcntl
  - pcntl_arginfo.h
- pdo_dblib
  - pdo_dblib_arginfo.h
- pdo_odbc
  - pdo_odbc_arginfo.h
- pdo
  - pdo_arginfo.h
  - pdo_stmt_arginfo.h
- pgsql
  - pgsql_arginfo.h
- phar
  - phar_object_arginfo.h
- random
  - random_arginfo.h
- reflection
  - php_reflection_arginfo.h
- shmop
  - shmop_arginfo.h
- simplexml
  - simplexml_arginfo.h
- snmp
  - snmp_arginfo.h
- soap
  - soap_arginfo.h
- sockets
  - sockets_arginfo.h
- sodium
  - libsodium_arginfo.h
- spl
  - spl_dllist_arginfo.h
  - spl_exceptions_arginfo.h
- sqlite3
  - sqlite3_arginfo.h
- standard
  - basic_functions_arginfo.h
  - user_filters_arginfo.h
- sysvmsg
  - sysvmsg_arginfo.h
- sysvsem
  - sysvsem_arginfo.h
- sysvshm
  - sysvshm_arginfo.h
- xml
  - xml_arginfo.h
- zend_test
  - object_handlers_arginfo.h
  - test_arginfo.h
- zlib
  - zlib_arginfo.h

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+127

-591

lines changed

Original file line number	Diff line number	Diff line change
`@@ -3285,11 +3285,12 @@ public function getRegistration(array $allConstInfos): string`
`3285`	`3285`	`$flagCodes = generateVersionDependentFlagCode("%s", $this->getFlagsByPhpVersion(), $this->phpVersionIdMinimumCompatibility);`
`3286`	`3286`	`$flags = implode("", $flagCodes);`
`3287`	`3287`
	`3288`	`+ $classMethods = ($this->funcInfos === []) ? 'NULL' : "class_{$escapedName}_methods";`
`3288`	`3289`	`if ($this->type === "enum") {`
`3289`	`3290`	`$name = addslashes((string) $this->name);`
`3290`	`3291`	`$backingType = $this->enumBackingType`
`3291`	`3292`	`? $this->enumBackingType->toTypeCode() : "IS_UNDEF";`
`3292`		`- $code .= "\tzend_class_entry *class_entry = zend_register_internal_enum(\"$name\", $backingType, class_{$escapedName}_methods);\n";`
	`3293`	`+ $code .= "\tzend_class_entry *class_entry = zend_register_internal_enum(\"$name\", $backingType, $classMethods);\n";`
`3293`	`3294`	`if ($flags !== "") {`
`3294`	`3295`	`$code .= "\tclass_entry->ce_flags \|= $flags\n";`
`3295`	`3296`	`}`
`@@ -3299,9 +3300,9 @@ public function getRegistration(array $allConstInfos): string`
`3299`	`3300`	`$className = $this->name->getLast();`
`3300`	`3301`	`$namespace = addslashes((string) $this->name->slice(0, -1));`
`3301`	`3302`
`3302`		`- $code .= "\tINIT_NS_CLASS_ENTRY(ce, \"$namespace\", \"$className\", class_{$escapedName}_methods);\n";`
	`3303`	`+ $code .= "\tINIT_NS_CLASS_ENTRY(ce, \"$namespace\", \"$className\", $classMethods);\n";`
`3303`	`3304`	`} else {`
`3304`		`- $code .= "\tINIT_CLASS_ENTRY(ce, \"$this->name\", class_{$escapedName}_methods);\n";`
	`3305`	`+ $code .= "\tINIT_CLASS_ENTRY(ce, \"$this->name\", $classMethods);\n";`
`3305`	`3306`	`}`
`3306`	`3307`
`3307`	`3308`	`if ($this->type === "class" \|\| $this->type === "trait") {`
`@@ -5103,9 +5104,7 @@ static function (FuncInfo $funcInfo) use ($fileInfo, &$generatedFunctionDeclarat`
`5103`	`5104`	`}`
`5104`	`5105`	`);`
`5105`	`5106`
`5106`		`- if (!empty($fileInfo->funcInfos)) {`
`5107`		`- $code .= generateFunctionEntries(null, $fileInfo->funcInfos);`
`5108`		`- }`
	`5107`	`+ $code .= generateFunctionEntries(null, $fileInfo->funcInfos);`
`5109`	`5108`
`5110`	`5109`	`foreach ($fileInfo->classInfos as $classInfo) {`
`5111`	`5110`	`$code .= generateFunctionEntries($classInfo->name, $classInfo->funcInfos, $classInfo->cond);`
`@@ -5156,6 +5155,11 @@ function generateClassEntryCode(FileInfo $fileInfo, array $allConstInfos): strin`
`5156`	`5155`
`5157`	`5156`	`/** @param FuncInfo[] $funcInfos */`
`5158`	`5157`	`function generateFunctionEntries(?Name $className, array $funcInfos, ?string $cond = null): string {`
	`5158`	`+ // No need to add anything if there are no function entries`
	`5159`	`+ if ($funcInfos === []) {`
	`5160`	`+ return '';`
	`5161`	`+ }`
	`5162`	`+`
`5159`	`5163`	`$code = "\n";`
`5160`	`5164`
`5161`	`5165`	`if ($cond) {`

`‎ext/com_dotnet/com_extension_arginfo.h‎`

Lines changed: 2 additions & 10 deletions

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

`‎ext/curl/curl_arginfo.h‎`

Lines changed: 3 additions & 15 deletions

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 53cb896

File tree

48 files changed

Some content is hidden

48 files changed

`‎Zend/zend_builtin_functions_arginfo.h‎`

`‎Zend/zend_exceptions_arginfo.h‎`

`‎Zend/zend_generators_arginfo.h‎`

`‎Zend/zend_interfaces_arginfo.h‎`

`‎build/gen_stub.php‎`

`‎ext/com_dotnet/com_extension_arginfo.h‎`

`‎ext/curl/curl_arginfo.h‎`

0 commit comments