Commit Graph

93864 Commits

Author SHA1 Message Date
Remi Collet
5d2e287982 Merge branch 'PHP-7.0'
* PHP-7.0:
  NEWS
  NEWS
  Fix Bug #71089 No check to duplicate zend_extension
2015-12-11 13:23:36 +01:00
Remi Collet
7a5c7e00cd NEWS 2015-12-11 13:23:21 +01:00
Remi Collet
66398757fc Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  NEWS
  Fix Bug #71089 No check to duplicate zend_extension
2015-12-11 13:22:55 +01:00
Remi Collet
d403a91c6f NEWS 2015-12-11 13:22:13 +01:00
Remi Collet
410eacc1a9 Fix Bug #71089 No check to duplicate zend_extension 2015-12-11 13:21:24 +01:00
Xinchen Hui
18b97c94b2 Merge branch 'PHP-7.0' 2015-12-11 17:26:48 +08:00
Xinchen Hui
b5adfee320 Fixed bug memleak in header_register_callback 2015-12-11 17:26:31 +08:00
Dmitry Stogov
061a90f8d1 Describe special meaning of IS_UNUSED oprerand 2015-12-11 02:31:28 +03:00
Dmitry Stogov
dc36810993 Use more compact description encoding schema to free some bits 2015-12-11 01:45:26 +03:00
Nikita Popov
fc2cedfb1d Make 2nd arg of xml_set_object by value
The argument is not being modified. Probably holdover from PHP 4
days.
2015-12-10 23:35:25 +01:00
Dmitry Stogov
047c84521c Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Make duplicate class constant error for internal class
  Make ZEND_CLONE return a TMP_VAR
2015-12-11 00:48:20 +03:00
Dmitry Stogov
cba1a8498c Improve Optimizer debugging facility (print the meaning of extended_value) 2015-12-11 00:47:02 +03:00
Nikita Popov
04e3d82b55 Make duplicate class constant error for internal class
And drop two duplicate constant declarations from intl. These
were leaking previously.
2015-12-10 22:22:49 +01:00
Nikita Popov
8e5e3301a1 Make ZEND_CLONE return a TMP_VAR
As the return value can't be reference and it's unlikely to be
unused.

Also remove some unnecessary checks for ce==NULL. A ce is required
nowadays.
2015-12-10 22:16:25 +01:00
Dmitry Stogov
f30381ec22 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Add missed tests for FETCH_GLOBAL_LOCK change
  Fix cleanup in bug70748.phpt
2015-12-10 21:20:30 +03:00
Dmitry Stogov
4c9e4caab4 Fixed typo 2015-12-10 21:17:24 +03:00
Nikita Popov
288cc6e192 Add missed tests for FETCH_GLOBAL_LOCK change 2015-12-10 19:17:17 +01:00
Nikita Popov
11f2a393f8 Merge branch 'PHP-7.0' 2015-12-10 19:15:21 +01:00
Nikita Popov
5c5209d676 Fix cleanup in bug70748.phpt
git add Zend/tests usable again...
2015-12-10 19:14:49 +01:00
Nikita Popov
f1278edefc Drop two compiler TODOs
Call-time pass by reference is now a parse error.
There is no benefit in dropping implementing_class currently.
2015-12-10 19:04:59 +01:00
Nikita Popov
c8a64e289c Reintroduce use of FETCH_GLOBAL_LOCK
Just found this old AST todo...

It no longer makes sense as an optimization due to the introduction
of BIND_GLOBAL, however it ensures that the global variable name is
not evaluated twice, which is presumably something we wish to
guarantee.
2015-12-10 19:04:59 +01:00
Bob Weinand
7ea1cf2e57 Improved specializer:
- Allow dispatching from specialized handler to unspecialized one
2015-12-10 20:46:14 +03:00
Nikita Popov
3fa86105f7 Remove FETCH_STATIC_MEMBER flag 2015-12-10 18:25:29 +01:00
Nikita Popov
3d4a2d2002 Merge branch 'PHP-7.0'
Conflicts:
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
2015-12-10 18:24:29 +01:00
Nikita Popov
798d168d73 Make update_opN_const implementation symmetric
So the main structure is the same...
2015-12-10 18:18:10 +01:00
Nikita Popov
37f3425263 Fix Foo::${42} and similar
Fixes segfault on direct use, segfault on opcache evaluated use,
leak on temporary use.

Fixes analogeous segfault for ${42} on opcache eval as well.
2015-12-10 18:14:40 +01:00
Dmitry Stogov
6f966fad0d Improved specializer (Bob)
- All helpers now may be declatred and called without ZEND_VM_HELPER_EX() and ZEND_VM_DISPATCH_TO_HELPER_EX() macros
- ZEND_VM_HELPER() may declare few arguments
- ZEND_VM_DISPATCH_TO_HELPER() may pass few parameters
- ZEND_VM_INLINE_HELPER() may be used to declare inline helpers (it won't be inlined in SWITH/GOTO executors)
2015-12-10 17:17:59 +03:00
Xinchen Hui
412b7ace8f Merge branch 'master' of git.php.net:/php-src 2015-12-10 21:47:36 +08:00
Xinchen Hui
f43baba1f9 Fixed test by disable opcache 2015-12-10 21:46:37 +08:00
Lior Kaplan
a19f511345 Align NEWS entry format for bug #71024 2015-12-10 15:31:06 +02:00
Dmitry Stogov
cedb518ea1 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  The first arg is optional
  Return -1 seems bug here
2015-12-10 15:34:15 +03:00
Xinchen Hui
ec0ac5dafb Merge branch 'PHP-7.0' 2015-12-10 19:37:44 +08:00
Xinchen Hui
c096a281be The first arg is optional 2015-12-10 19:36:41 +08:00
Xinchen Hui
c0ff9b07cf Merge branch 'PHP-7.0' 2015-12-10 17:35:55 +08:00
Xinchen Hui
e4ad9ed8ad Return -1 seems bug here 2015-12-10 17:35:35 +08:00
Dmitry Stogov
3b5c844757 Initialize bitset before processing the seconf BB (we skip the first one) 2015-12-10 11:29:53 +03:00
Anatol Belski
770ba81071 Merge branch 'PHP-7.0'
* PHP-7.0:
  set release date
2015-12-10 08:12:07 +01:00
Anatol Belski
e2e39f3bfc set release date 2015-12-10 08:11:23 +01:00
Anatol Belski
ae41a74738 Merge branch 'PHP-7.0'
* PHP-7.0:
  set release date
2015-12-10 08:10:25 +01:00
Anatol Belski
204dd7195b set release date 2015-12-10 08:09:39 +01:00
Xinchen Hui
ae537994a6 Merge branch 'PHP-7.0' 2015-12-10 15:02:33 +08:00
Xinchen Hui
29b615cfcf iFixed key leak with invalid resource 2015-12-10 15:02:01 +08:00
Xinchen Hui
c13fcc21c3 Merge branch 'PHP-7.0' 2015-12-10 08:58:37 +08:00
Xinchen Hui
7c1ddcc67f Fixed bug #71077 (ReflectionMethod for ArrayObject constructor returns wrong number of parameters) 2015-12-10 08:58:28 +08:00
Ferenc Kovacs
d8123a57f8 Merge branch 'PHP-7.0'
* PHP-7.0:
  5.6.18 will be next
2015-12-10 01:32:56 +01:00
Ferenc Kovacs
91adffb4d1 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  5.6.18 will be next
2015-12-10 01:31:51 +01:00
Ferenc Kovacs
7d5dbaed76 5.6.18 will be next 2015-12-10 01:30:27 +01:00
Dmitry Stogov
fd20e6cee6 Apply local optimizatons to extended bacic block (this allows some optimizarions across few following BBs). 2015-12-10 01:17:35 +03:00
Dmitry Stogov
7fd7734e58 Explain the disabled optimization pattern 2015-12-09 22:22:07 +03:00
Xinchen Hui
e80791e161 Fixed test (opcache denpends) 2015-12-09 07:52:03 -08:00