mirror of
https://github.com/php/php-src.git
synced 2026-03-26 09:12:14 +01:00
2a286ad599
SCCP - Sparse Conditional Constant Propagation, DCE - Dead Code Elimination and removing of unused local variablesi. Squashed commit of the following: commitbf5ac05fc0Author: Dmitry Stogov <dmitry@zend.com> Date: Fri Jul 14 14:26:40 2017 +0300 Added news entry commit4cfa6984b1Merge:1cdaaac1f261d7Author: Dmitry Stogov <dmitry@zend.com> Date: Fri Jul 14 13:30:50 2017 +0300 Merge branch 'sccp' into dce * sccp: Bump OCI8 version for recent patch WS Fix test title Ensure that the stream position is kept between reads Turn off EXIF_DEBUG so Travis don't complain at me Don't add a new line to undefined tags in EXIF_DEBUG mode Fix compile error with EXIF_DEBUG update NEWS disable --with-pcre-valgrind on travis fix default args for --with-pcre-valgrind Enable valgrind support for PCRE by default in debug builds add oniguruma.patch to ease future upgrades SIZEOF_SIZE_T doesn't exist on AIX and POWER8 (ppc64le), keep using SIZEOF_LONG commit1f261d77cbMerge:a32a3fbb280ba8Author: Dmitry Stogov <dmitry@zend.com> Date: Fri Jul 14 13:30:39 2017 +0300 Merge branch 'master' into sccp * master: Bump OCI8 version for recent patch WS Fix test title Ensure that the stream position is kept between reads Turn off EXIF_DEBUG so Travis don't complain at me Don't add a new line to undefined tags in EXIF_DEBUG mode Fix compile error with EXIF_DEBUG update NEWS disable --with-pcre-valgrind on travis fix default args for --with-pcre-valgrind Enable valgrind support for PCRE by default in debug builds add oniguruma.patch to ease future upgrades SIZEOF_SIZE_T doesn't exist on AIX and POWER8 (ppc64le), keep using SIZEOF_LONG commit1cdaaac601Author: Dmitry Stogov <dmitry@zend.com> Date: Fri Jul 14 13:27:12 2017 +0300 Use generic evalution mechanism for constant functions commit75bd92a609Author: Dmitry Stogov <dmitry@zend.com> Date: Fri Jul 14 12:39:05 2017 +0300 Fixed use-def chain unlinking for "$a = 1; $a += $a;" commit7d7746814dAuthor: Dmitry Stogov <dmitry@zend.com> Date: Fri Jul 14 12:38:29 2017 +0300 Enable duplicate predecessors verification commit6b1667f206Author: Dmitry Stogov <dmitry@zend.com> Date: Fri Jul 14 11:55:20 2017 +0300 Removed duplicate definitions commit1415b53014Author: Dmitry Stogov <dmitry@zend.com> Date: Fri Jul 14 11:51:29 2017 +0300 Enable evaluation of constant functions with 3 arguments commitab367deef9Author: Dmitry Stogov <dmitry@zend.com> Date: Fri Jul 14 11:45:13 2017 +0300 Removed deprecated check commitc51659ea8cAuthor: Dmitry Stogov <dmitry@zend.com> Date: Fri Jul 14 11:40:42 2017 +0300 Reduce limit commitb1be5a04d7Author: Dmitry Stogov <dmitry@zend.com> Date: Fri Jul 14 11:38:23 2017 +0300 Disable constant array_flip() evaluation commit7a5b0596a1Author: Dmitry Stogov <dmitry@zend.com> Date: Fri Jul 14 11:33:20 2017 +0300 Fixed comments commit377e48b342Author: Dmitry Stogov <dmitry@zend.com> Date: Fri Jul 14 11:28:50 2017 +0300 Cast of string to long/double can not produce exception commit228dd01af3Author: Dmitry Stogov <dmitry@zend.com> Date: Fri Jul 14 11:24:50 2017 +0300 Added missed return commit0972a21636Author: Dmitry Stogov <dmitry@zend.com> Date: Fri Jul 14 11:22:36 2017 +0300 objects may be nested in array operands commitbd346bfa5cAuthor: Dmitry Stogov <dmitry@zend.com> Date: Fri Jul 14 11:19:20 2017 +0300 ~$resource is unsupported. commitc77e45610cAuthor: Dmitry Stogov <dmitry@zend.com> Date: Fri Jul 14 11:15:39 2017 +0300 ws commit0b64d71109Author: Dmitry Stogov <dmitry@zend.com> Date: Fri Jul 14 11:14:40 2017 +0300 Call to zend_ssa_unlink_use_chain() shouldn't be dropped commitcb7059fcf6Author: Dmitry Stogov <dmitry@zend.com> Date: Fri Jul 14 11:11:58 2017 +0300 Safer check for function name. The previous check is incorrect in ZTS build. commit7280aba1e1Author: Dmitry Stogov <dmitry@zend.com> Date: Fri Jul 14 11:02:10 2017 +0300 Missing warning commit54bc7b576cAuthor: Dmitry Stogov <dmitry@zend.com> Date: Fri Jul 14 10:56:42 2017 +0300 Proper check for successors count commitea8c004a15Merge:624f76da32a3fbAuthor: Dmitry Stogov <dmitry@zend.com> Date: Thu Jul 13 15:56:26 2017 +0300 Merge branch 'sccp' into dce * sccp: fix fold Fixed bug #74866 extension_dir = "./ext" now use current directory for base add next vc15 toolset to the list Revert "Enable whole program optimization for builds without PGO, too" extend comment cleanup discontinued target commita32a3fb67cMerge:2722dbf5fb2abdAuthor: Dmitry Stogov <dmitry@zend.com> Date: Thu Jul 13 15:56:14 2017 +0300 Merge branch 'master' into sccp * master: fix fold Fixed bug #74866 extension_dir = "./ext" now use current directory for base add next vc15 toolset to the list Revert "Enable whole program optimization for builds without PGO, too" extend comment cleanup discontinued target commit624f76df48Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Jul 13 12:30:27 2017 +0300 Set RETURN_VALUE_UNUSED instead of additional FREE opcode, if possible. Keep alive dead instructions that have to free two temporary variables. commit94c9b26695Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Jul 13 11:51:14 2017 +0300 More accurate "vararg" handling in DCE commit665ed8491cAuthor: Dmitry Stogov <dmitry@zend.com> Date: Thu Jul 13 09:31:45 2017 +0300 Improved DCE performance, by avoiding redundand checks and repeatable iterations. commit3f42ce18baAuthor: Dmitry Stogov <dmitry@zend.com> Date: Wed Jul 12 23:03:11 2017 +0300 Added few more instructions without side effects and exceptions commitb17178f991Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Jul 12 20:39:02 2017 +0300 Temprary enable SSA validation in DEBUG build commite238a8dc79Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Jul 12 20:37:53 2017 +0300 Inegrate SSA validation developed by Nikita commita247cee80bAuthor: Dmitry Stogov <dmitry@zend.com> Date: Wed Jul 12 20:31:27 2017 +0300 Perform DCE pass before other DFA optimisations, to properly reconstruct "no value" use-def chains. commita651564f29Merge:06f6eb02722dbfAuthor: Dmitry Stogov <dmitry@zend.com> Date: Wed Jul 12 18:55:05 2017 +0300 Merge branch 'sccp' into dce * sccp: Resources should be closed during object destructioin, not during freeing. Guard against AppVeyor losing deps issue increase poll timeout as false positives mitigation Value of EG(user_exception_handler) should't relive request boundary sodium ext: remove function names before exception messages sodium ext: update the crypto_kx_*() API to the libsodium one Revert "fix macro redifinitions" commit2722dbfdf5Merge:6595ea309d3b73Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Jul 12 18:54:48 2017 +0300 Merge branch 'master' into sccp * master: Resources should be closed during object destructioin, not during freeing. Guard against AppVeyor losing deps issue increase poll timeout as false positives mitigation Value of EG(user_exception_handler) should't relive request boundary sodium ext: remove function names before exception messages sodium ext: update the crypto_kx_*() API to the libsodium one Revert "fix macro redifinitions" commit06f6eb0e68Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Jul 12 14:52:28 2017 +0300 Use zend_ssa_is_no_val_use() instead of zend_has_improper_op1_use() commit4b64dbb30dAuthor: Dmitry Stogov <dmitry@zend.com> Date: Wed Jul 12 13:07:14 2017 +0300 Check if instruction may throw exception only for instructions without known side effects. Always disable removing ASSIGN and UNSET_VAR that may throw. commitc5aa1f47cdAuthor: Dmitry Stogov <dmitry@zend.com> Date: Wed Jul 12 11:21:07 2017 +0300 Use existing bit commitc2af153baeAuthor: Dmitry Stogov <dmitry@zend.com> Date: Wed Jul 12 11:10:48 2017 +0300 Updated Windows build commitde5e8fc129Merge:8c0de536595ea3Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Jul 12 11:10:12 2017 +0300 Merge branch 'sccp' into dce * sccp: (29 commits) Use existing bit Updated Windows build Fixed compilation error Remove debug code We need to check for the length here too, or we crash and no one likes that! :( * Implemented #65187 (exif_read_data/thumbnail: add support for stream resource) * ext/exif now uses FAST_ZPP Remove extraneous configure flag Revert "remove excessive checks and fix warnings" parametrize zip names Upgrade bundled PCRE to 8.41 Updated NEWS file with LDAP changes Fixed removing all controls by passing an empty array to ldap_set_option Filled in NEWS file with ext/ldap last modifications change order, allow to build as shared extension restore file deleted by mistake in a merge commit Fix segfault in php_stream_context_get_option call remove excessive checks and fix warnings fix macro redifinitions fix symbol availability and ws Remove this for now, as not found ... commit6595ea3420Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Jul 12 10:27:02 2017 +0300 Use existing bit commitf0bfd36cb8Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Jul 12 10:21:22 2017 +0300 Updated Windows build commita9bd7c89f2Merge:d1eb5ed2b7d3fbAuthor: Dmitry Stogov <dmitry@zend.com> Date: Wed Jul 12 09:51:32 2017 +0300 Merge branch 'master' into sccp * master: (27 commits) Fixed compilation error Remove debug code We need to check for the length here too, or we crash and no one likes that! :( * Implemented #65187 (exif_read_data/thumbnail: add support for stream resource) * ext/exif now uses FAST_ZPP Remove extraneous configure flag Revert "remove excessive checks and fix warnings" parametrize zip names Upgrade bundled PCRE to 8.41 Updated NEWS file with LDAP changes Fixed removing all controls by passing an empty array to ldap_set_option Filled in NEWS file with ext/ldap last modifications change order, allow to build as shared extension restore file deleted by mistake in a merge commit Fix segfault in php_stream_context_get_option call remove excessive checks and fix warnings fix macro redifinitions fix symbol availability and ws Remove this for now, as not found fix authors NEWS for Sodium ... commit8c0de53e5fAuthor: Dmitry Stogov <dmitry@zend.com> Date: Tue Jul 11 21:54:36 2017 +0300 Initial integration of Dead Code Elimination (DCE) and unused variable removing passes, originally developed in https://github.com/nikic/php-src/tree/opt, into DFA optimization pass. commitd1eb5ede3aAuthor: Dmitry Stogov <dmitry@zend.com> Date: Tue Jul 11 12:19:11 2017 +0300 Proper SSA reconstruction for "$a = $a;" commit4872d139b5Author: Dmitry Stogov <dmitry@zend.com> Date: Tue Jul 11 11:57:33 2017 +0300 Replace conditions, that should be always true, by ZEND_ASSERT() commit9915b1f5cdAuthor: Dmitry Stogov <dmitry@zend.com> Date: Tue Jul 11 11:56:51 2017 +0300 Fixed pass name commitd26ff1b88dAuthor: Dmitry Stogov <dmitry@zend.com> Date: Tue Jul 11 11:55:47 2017 +0300 Don't create identical predecessors commit0625fbe32bAuthor: Dmitry Stogov <dmitry@zend.com> Date: Tue Jul 11 09:36:07 2017 +0300 Update unreachable blocks. commit9d7d409e6aAuthor: Dmitry Stogov <dmitry@zend.com> Date: Tue Jul 11 09:28:49 2017 +0300 Keep consistent cfg.map[] commit85a86e58b2Author: Dmitry Stogov <dmitry@zend.com> Date: Tue Jul 11 02:36:14 2017 +0300 Remove unusded phi commitd5e0f2df4cAuthor: Dmitry Stogov <dmitry@zend.com> Date: Tue Jul 11 02:35:00 2017 +0300 Don't clear phi->spources[] too early. commita90ed34295Author: Dmitry Stogov <dmitry@zend.com> Date: Mon Jul 10 21:29:39 2017 +0300 Make SCCP to remove dead live ranges. commit320237f3d8Merge:63bbed57be2637Author: Dmitry Stogov <dmitry@zend.com> Date: Mon Jul 10 17:35:21 2017 +0300 Merge branch 'master' into sccp * master: Fixed memory leak introduced by7cb5bdf64aeliminate casts remove checks for eol dependencies improve test Small fix in ext/ldap, Moved vars definitions to the beginning of the block using them ZipArchive implements countable, added ZipArchive::count() method commit63bbed5e71Author: Dmitry Stogov <dmitry@zend.com> Date: Mon Jul 10 17:01:15 2017 +0300 Evaluation of few more constant functions commit07f45d8a3dAuthor: Dmitry Stogov <dmitry@zend.com> Date: Mon Jul 10 16:22:47 2017 +0300 Properly unlinking dead blocks from predecessors/successors and dominators commit502002aa6eAuthor: Dmitry Stogov <dmitry@zend.com> Date: Mon Jul 10 13:33:14 2017 +0300 Replacel constant JMPZ/NZ/ZNZ by JMP or NOP commit3253e61b66Merge:e7f69f0161c378Author: Dmitry Stogov <dmitry@zend.com> Date: Mon Jul 10 12:22:39 2017 +0300 Merge branch 'master' into sccp * master: Revert "Fixed bug #74878" Upgrading note for #74837 Fixed bug #74837 - NEWS Implement Countable for DomNodeList and DOMNamedNodeMap (Request #74837) Fix #49649 - Handle property visibility changes on unserialization commite7f69f07fcAuthor: Dmitry Stogov <dmitry@zend.com> Date: Mon Jul 10 12:15:08 2017 +0300 Prevent compile-time evaluation of implode() with arguments causing run-time warnings commit0e882f189aAuthor: Dmitry Stogov <dmitry@zend.com> Date: Mon Jul 10 11:54:04 2017 +0300 Constant evaluation of ini_get() for some safe cases commit9e36a748b2Author: Dmitry Stogov <dmitry@zend.com> Date: Mon Jul 10 11:13:37 2017 +0300 Constant evaluation of implode() commite73046e266Author: Dmitry Stogov <dmitry@zend.com> Date: Mon Jul 10 10:51:23 2017 +0300 Fixed uninitialized value commitf5e2e8e68cAuthor: Dmitry Stogov <dmitry@zend.com> Date: Mon Jul 10 10:05:37 2017 +0300 Remove (compact) unused constants after SCCP pass commitf0b7bb86ebMerge:e69d4f6cfacf84Author: Dmitry Stogov <dmitry@zend.com> Date: Mon Jul 10 09:10:00 2017 +0300 Merge branch 'master' into sccp * master: (37 commits) #73594 tests only check the extra params if dns_get_record is successful Fixed bug #74852 (property_exists returns true on unknown DateInterval property) fix uninitialized var fix comparison warning comply with POSIX signature fix warning remove some casts cleanup casts remove useless cast eliminate casts sync vim mode lines in main [ci skip] update NEWS [ci skip] update NEWS [ci skip] update NEWS Fixed bug #74883 SQLite3::__construct() produces "out of memory" exception with invalid flags Silent compiler warning Fix test Deprecated the read_exif_data() alias Add myself as exif maintainer update libs versions ... commite69d4f6140Author: Dmitry Stogov <dmitry@zend.com> Date: Fri Jul 7 12:51:41 2017 +0300 Avoid in-place modification of referenced data commit58f7c17978Author: Dmitry Stogov <dmitry@zend.com> Date: Fri Jul 7 12:33:24 2017 +0300 Use arena for temporary data. commit93d3e7ddc2Author: Dmitry Stogov <dmitry@zend.com> Date: Fri Jul 7 11:54:47 2017 +0300 Made sccp_ctx to be an "extension" of scdf_ctx and remove duplicate data. commitf810c6f7c4Author: Dmitry Stogov <dmitry@zend.com> Date: Fri Jul 7 11:20:48 2017 +0300 Improved SSCP integration commitd17ed887f3Merge:d90805a29653daAuthor: Dmitry Stogov <dmitry@zend.com> Date: Fri Jul 7 10:22:37 2017 +0300 Merge branch 'master' into sccp * master: Fixed bug #74873 (Minor BC break: PCRE_JIT changes output of preg_match()). Fixed bug #72324 (imap_mailboxmsginfo() return wrong size) Fix redefine warnings Expand sb's name and capitalize my own Write the URL on a new line, so that it is easier copyable commitd90805a40bMerge:2e5e03bfc336c7Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Jul 6 23:07:04 2017 +0300 Merge branch 'master' into sccp * master: Added missed dump of "main" script code replace the stack var by a macro [ci skip] sync NEWS minor fix for web announce add missing NEWS entry for #74087 and also fix the formatting move NEWS entry to the correct place, also bump the version commit2e5e03b673Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Jul 6 23:03:41 2017 +0300 Call info should be removed, but at least we should prevent incorrect stack adjustment. commit1ee9110b35Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Jul 6 19:34:43 2017 +0300 Remove NOP instructions, introduced bvy SCCP. This commit discloses unrelated issue caused ext/soap/tests/bug70211.phpt failure. commit9a2f50070dAuthor: Dmitry Stogov <dmitry@zend.com> Date: Thu Jul 6 16:34:02 2017 +0300 Avoid useless iterations for first SSA variablesi, always marked BOT. commitc57dd7c6efAuthor: Dmitry Stogov <dmitry@zend.com> Date: Thu Jul 6 16:33:46 2017 +0300 Use reference-counting commit90f822d68eAuthor: Dmitry Stogov <dmitry@zend.com> Date: Thu Jul 6 14:00:22 2017 +0300 Support for few more opcodes commitcffee2f7e5Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Jul 6 12:35:13 2017 +0300 Combined constants substitutaion and dead instruction removing in single pass. This eleminates substitution in dead instructions. commitf890375c16Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Jul 6 10:34:48 2017 +0300 Use reference-counting instead of duplication commitdb0cd64dfaAuthor: Dmitry Stogov <dmitry@zend.com> Date: Thu Jul 6 03:04:27 2017 +0300 Improved SCDF<->SCCP interface - "get_feasible_successors" callback is changed into "mark_feasible_successors" and should mark necessary edges through scdf_mark_edge_feasible() - SCDF takes care about OP_DATA instruction - SCDF code is re-arranged to avoid repeatable checks commite0ad5dd489Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Jul 6 00:55:40 2017 +0300 Changed representation of "feasible_edges", using one bit per edge. commitafee3138feAuthor: Dmitry Stogov <dmitry@zend.com> Date: Thu Jul 6 00:49:56 2017 +0300 Revert "Don't propagate unused values" This reverts commit84e5bfd430. commit84e5bfd430Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Jul 5 23:39:42 2017 +0300 Don't propagate unused values commitd4f15b9506Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Jul 5 23:39:10 2017 +0300 Don't visit the same Phi twice commit2558311b4dMerge:722a59d7bb4ae5Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Jul 5 21:51:06 2017 +0300 Merge branch 'master' into sccp * master: Fixed final dump "after optimizer" commit722a59ddb1Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Jul 5 21:09:29 2017 +0300 SCCP doesn't support VERIFY_RETURN_TYPE (ext/opcache/tests/bug73789.phpt failure) commit7084fade4dAuthor: Dmitry Stogov <dmitry@zend.com> Date: Wed Jul 5 20:37:21 2017 +0300 Fixed SSA reconstruction commit37ec4e0845Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Jul 5 19:34:46 2017 +0300 Disable constant propagation for variables that can be modified indirectly commit4bb9b6526eMerge:680046073d5097Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Jul 5 19:17:04 2017 +0300 Merge branch 'master' into sccp * master: (43 commits) Keep information about SSA variables, that may be modified indirectly. Added constants for known ldap controls OID and tests for ldap_get/set_option for controls Added support for controls to ldap_get_option [ci skip] sync NEWS NEWS for oniguruma Patch from the upstream git https://github.com/kkos/oniguruma/issues/60 (CVE-2017-9228) Patch from the upstream git https://github.com/kkos/oniguruma/issues/59 (CVE-2017-9229) b690371bbf97794b4a1d3f295d4fb9a8b05d402d Modified for onig 5.9.6 Patch from the upstream git https://github.com/kkos/oniguruma/issues/58 (CVE-2017-9227) Patch from the upstream git https://github.com/kkos/oniguruma/issues/57 (CVE-2017-9224) Patch from the upstream git https://github.com/kkos/oniguruma/issues/55 (CVE-2017-9226) b4bf968ad52afe14e60a2dc8a95d3555c543353a Modified for onig 5.9.6 f015fbdd95f76438cd86366467bb2b39870dd7c6 Modified for onig 5.9.6 valid_symbol_table removed Improve fix for #74145 Fix wddx Fix tests Fixed bug #74111 Fix bug #74603 - use correct buffer size Fix bug #74651 - check EVP_SealInit as it can return -1 Update NEWS Fix bug #74087 Fixed parsing of strange formats with mixed month/day and time strings ... commit680046086cAuthor: Dmitry Stogov <dmitry@zend.com> Date: Wed Jul 5 16:14:38 2017 +0300 Support for few more internal functions evaluation commit74a29468efAuthor: Dmitry Stogov <dmitry@zend.com> Date: Wed Jul 5 13:42:55 2017 +0300 Disabled evaluation of strpos() with empty needle. commite8908946e5Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Jul 5 13:17:30 2017 +0300 Replace calls to in_array() with constant array by IN_ARRAY instruction after SCCP. commit4e8fa2c3ddAuthor: Dmitry Stogov <dmitry@zend.com> Date: Wed Jul 5 00:58:12 2017 +0300 Initial integration of Sparse Conditional Constant Propagation (SCCP), originally developed in https://github.com/nikic/php-src/tree/opt, into DFA optimization pass.