Commit graph

1337 commits

Author SHA1 Message Date
Xinchen Hui
e6b7e6081e Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixed bug #73402 (Opcache segfault when using class constant to call a method)
2016-10-29 23:44:37 +08:00
Xinchen Hui
af873d4788 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Fixed bug #73402 (Opcache segfault when using class constant to call a method)

Conflicts:
	ext/opcache/Optimizer/zend_optimizer.c
2016-10-29 23:43:59 +08:00
Xinchen Hui
ef75ddd4f9 Fixed bug #73402 (Opcache segfault when using class constant to call a method) 2016-10-29 23:41:51 +08:00
Dmitry Stogov
4054d1cb64 Merge branch 'PHP-7.1'
* PHP-7.1:
  Fixed incorrec type usage
  Revert "Update UPGRADING to reflect bug fix" This change was made in 7.0. Sorry for the noise.
  Update UPGRADING to reflect bug fix
  news for next rc
2016-10-25 22:13:46 +03:00
Dmitry Stogov
bdd3fec7f8 Fixed incorrec type usage 2016-10-25 22:12:34 +03:00
Dmitry Stogov
cc973d6bb7 Merge branch 'PHP-7.1'
* PHP-7.1:
  Export zend_analyze_calls() to allow building call trees.
2016-10-25 17:21:12 +03:00
Dmitry Stogov
01bc515b4d Export zend_analyze_calls() to allow building call trees. 2016-10-25 17:20:27 +03:00
Nikita Popov
f636dbfe76 Merge branch 'PHP-7.1' 2016-10-23 22:13:59 +02:00
Nikita Popov
c3232c5903 Fix call graph construction
Travis build for 7.1+ has been failing for the past week...
2016-10-23 22:12:55 +02:00
Dmitry Stogov
03cd0f6b06 Merge branch 'PHP-7.1'
* PHP-7.1:
  Fixed typo
2016-10-20 01:17:55 +03:00
Dmitry Stogov
565ce0d41d Fixed typo 2016-10-20 01:17:40 +03:00
Dmitry Stogov
5551cccc92 Merge branch 'PHP-7.1'
* PHP-7.1:
  Fixed type inference rules.
  Update NEWS
2016-10-18 12:41:10 +03:00
Dmitry Stogov
ac6134fb64 Fixed type inference rules. 2016-10-18 12:39:33 +03:00
Dmitry Stogov
f4578d5a0e Merge branch 'PHP-7.1'
* PHP-7.1:
  Use simple "one-pass" algorithm.
2016-10-18 00:06:50 +03:00
Dmitry Stogov
ed3196ea35 Use simple "one-pass" algorithm. 2016-10-18 00:06:20 +03:00
Kalle Sommer Nielsen
796dd639cb Fix build + warning, decls first 2016-10-16 01:01:09 +02:00
Nikita Popov
f58701fe6f Merge branch 'PHP-7.1' 2016-10-16 00:04:23 +02:00
Nikita Popov
9f472ba5e3 Various function info fixes 2016-10-15 23:58:31 +02:00
Nikita Popov
659cc278e2 Various RC inference fixes 2016-10-15 23:58:29 +02:00
Mitch Hagstrand
01a280a9c7 Fixed bug in zend_accel_error() and cleaned up kill_all_lockers()
1. zend_accel_error was only executing clean up if log_verbosity_level is high enough to log
2. Cleaned up kill_all_lockers function and fixed comments.

(cherry picked from commit bcee2fdbec)
2016-10-14 01:56:01 +02:00
Dmitry Stogov
e92a18dcd5 Fixed referencecounter inference rules
(cherry picked from commit 6046a99b97)
2016-10-14 01:24:46 +02:00
Dmitry Stogov
233992409b Fixed referencecounter inference rules
(cherry picked from commit fae7d6b9bb)
2016-10-14 01:24:23 +02:00
Nikita Popov
1119cdae42 Merge branch 'PHP-7.0' into PHP-7.1 2016-10-12 23:05:10 +02:00
Mitch Hagstrand
bcee2fdbec Fixed bug in zend_accel_error() and cleaned up kill_all_lockers()
1. zend_accel_error was only executing clean up if log_verbosity_level is high enough to log
2. Cleaned up kill_all_lockers function and fixed comments.
2016-10-12 23:03:55 +02:00
Dmitry Stogov
6046a99b97 Fixed referencecounter inference rules 2016-10-11 15:43:23 +03:00
Dmitry Stogov
fae7d6b9bb Fixed referencecounter inference rules 2016-10-11 01:58:30 +03:00
Dmitry Stogov
38e765d710 Merge branch 'PHP-7.1'
* PHP-7.1:
  Removed deprecated flag
  Fixed information about possible return value
2016-10-10 11:49:12 +03:00
Dmitry Stogov
3760bc5407 Removed deprecated flag 2016-10-10 11:48:29 +03:00
Dmitry Stogov
771600ee6b Fixed information about possible return value 2016-10-10 11:46:43 +03:00
Dmitry Stogov
f924893ab9 Merge branch 'PHP-7.1'
* PHP-7.1:
  Updated reference-counting inferece rules. The previous rules refected PHP-5 behavior and were completely wrong for PHP-7. (e.g. scalars don't have reference counters at all). This change shouldn't affect anything, because results of this inference are not used yet.
  Fix NEWS after re-roll of RC3
2016-10-06 11:16:43 +03:00
Dmitry Stogov
b2d53e47ed Updated reference-counting inferece rules.
The previous rules refected PHP-5 behavior and were completely wrong for PHP-7. (e.g. scalars don't have reference counters at all).
This change shouldn't affect anything, because results of this inference are not used yet.
2016-10-06 11:08:01 +03:00
Dmitry Stogov
c218c4f01e Special handling for $php_errormsg and $http_response_header. 2016-09-30 02:41:08 +03:00
Nikita Popov
8c26762baf Merge branch 'PHP-7.1' 2016-09-24 22:46:43 +02:00
Nikita Popov
c7651c2396 Fix a couple of ASSIGN_DIM/OBJ inference bugs
Account for possible null return values better.
2016-09-24 22:43:27 +02:00
Nikita Popov
db801763e4 Add range inference for ZEND_STRLEN
On 32-bit systems we conservatively allow negative lengths.
On 64-bit systems, the range could additionally be restricted to
the canonical 48-bit size.
2016-09-24 22:43:27 +02:00
Dmitry Stogov
a05cdd03ff Merge branch 'PHP-7.1'
* PHP-7.1:
  Prevent optimization of huge functions.
2016-09-16 14:03:56 +03:00
Dmitry Stogov
846441ab4b Prevent optimization of huge functions. 2016-09-16 14:03:05 +03:00
Dmitry Stogov
902e9ad014 Special handling for $php_errormsg and $http_response_header. 2016-09-15 03:07:31 +03:00
Nikita Popov
9a0bb40670 Remove handling for defined() and strlen() in opcache
These are converted by the compiler into DEFINED and STRLEN, no
need to handle the function forms.
2016-09-09 17:11:25 +02:00
Xinchen Hui
9862c8d847 Merge branch 'PHP-7.1'
* PHP-7.1:
  Don't optimize (string) cast on arrays
2016-09-09 22:41:17 +08:00
Xinchen Hui
a90e438af3 Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
* 'PHP-7.1' of git.php.net:/php-src:
  Don't optimize (string) cast on arrays
2016-09-09 22:40:53 +08:00
Xinchen Hui
1ecdca1f3a Merge branch 'PHP-7.1'
* PHP-7.1:
  Fixed function info
2016-09-09 22:40:26 +08:00
Xinchen Hui
2a3b75a0eb Fixed function info 2016-09-09 22:40:08 +08:00
Nikita Popov
1d4b831d63 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-09 16:38:42 +02:00
Nikita Popov
e3c08de08a Don't optimize (string) cast on arrays
Otherwise we throw a notice during pass1_5 optimization.
2016-09-09 16:38:26 +02:00
Nikita Popov
d1535da7e6 Merge branch 'PHP-7.1' 2016-09-09 16:03:21 +02:00
Nikita Popov
766264f8d2 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-09 16:02:59 +02:00
Nikita Popov
bbcf77c309 Fix some block_pass bugs 2016-09-09 15:58:36 +02:00
Dmitry Stogov
8cce8172af Merge branch 'PHP-7.1'
* PHP-7.1:
  Fixed type inference bug
2016-09-07 11:36:44 +03:00
Dmitry Stogov
6aa07c9083 Fixed type inference bug 2016-09-07 11:36:14 +03:00