clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
95,911 Commits 491 Branches 1,363 Tags 838 MiB
e9c3f9fcde
Commit Graph

95911 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry Stogov
e9c3f9fcde Fixed bug #72177 (Scope issue in __destruct after ReflectionProperty::setValue()) 2016-05-13 11:55:09 +03:00
Joe Watkins
ee8f402af8 fix 1f52a03082 2016-05-13 09:21:28 +01:00
Joe Watkins
1f52a03082 fix #72180 (Env variables incorrectly pretty printed in config.nice, phpinfo) 2016-05-13 07:43:49 +01:00
Dmitry Stogov
ccf18da450 Eliminated checks for (func->op_array.fn_flags & ZEND_ACC_GENERATOR) in fast path of DO_FCALL* handlers. 
This slightly improves calls to regular function and method calls in cost of a bit slower generator initialization.
Separate call frame for generators, allocated on heap, now created by ZEND_GENERATOR_CREATE instruction.
 2016-05-13 01:40:15 +03:00
Nikita Popov
b5bdb40cb5 Fix phi placement for pi targets 
If the pi target has multiple predecessors, we need to place a
phi there. However it's not possible to express this in terms of
dominance frontiers, so we need to explicitly add it to the phi
set.

This does not yet solve the problem of non-minimal SSA for the
case where the target has multiple predecessors, but dominates
all predecessors (apart from the one creating the pi) -- but
that's an existing issue.
 2016-05-12 22:08:28 +02:00
Nikita Popov
b1c3c9a525 Explicitly construct phi set during def propagation 
Previously the phi set was first computed during def propagation
and then computed again (per-block) during actual phi placement.
This commit changes this to store the phi set computed during
def propagation.

This makes SSA construction slightly faster (5%), but the main
purpose here is to pave the way for the next commit.

This also fixes a potential issue with the handling of irreducible
loops -- they generated additional phis, but these were not
accounted for in def propagation. (Though I'm not sure if we can
even have any irreducible loops right now.)
 2016-05-12 22:08:28 +02:00
Anatol Belski
aea0d577f9 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix dir separator in test
 2016-05-12 20:38:02 +02:00
Anatol Belski
f751b1ceaf fix dir separator in test 2016-05-12 20:37:04 +02:00
Dmitry Stogov
4652fe18c7 Removed useless code 2016-05-12 16:46:37 +03:00
Anatol Belski
468b2e673f Merge branch 'PHP-7.0' 
* PHP-7.0:
  update NEWS
 2016-05-12 13:39:39 +02:00
Anatol Belski
d33f258495 update NEWS 2016-05-12 13:39:15 +02:00
Anatol Belski
ed2ec7be80 Merge branch 'PHP-7.0' 
* PHP-7.0:
  workaround the extra new line in the test out on another env
 2016-05-12 12:49:31 +02:00
Dmitry Stogov
7b94b958cc Intern some known (and offten used) strings. 2016-05-12 13:47:22 +03:00
Anatol Belski
9f50bb5bfa workaround the extra new line in the test out on another env 2016-05-12 12:45:04 +02:00
Anatol Belski
00390449c6 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #72197 pg_lo_create arbitrary read
 2016-05-12 11:41:18 +02:00
Anatol Belski
7f6e285430 Fixed bug #72197 pg_lo_create arbitrary read 2016-05-12 11:40:28 +02:00
Xinchen Hui
5ddb01ce42 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Added NEWS entry missed while doing merge
 2016-05-12 13:48:52 +08:00
Xinchen Hui
3797e570b2 Added NEWS entry missed while doing merge 2016-05-12 13:48:24 +08:00
Xinchen Hui
28f35c1799 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Committed by accident
 2016-05-12 13:40:32 +08:00
Xinchen Hui
92828ae204 Committed by accident 2016-05-12 13:40:22 +08:00
Xinchen Hui
d1926742aa Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 
* 'PHP-7.0' of git.php.net:/php-src:
  Fix serializing ZEND_AST_SHELL_EXEC
  add missing NEWS entry
  prepare for 5.6.22RC1
  add missing NEWS entry
 2016-05-12 13:16:07 +08:00
Xinchen Hui
8fd92e0518 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #72195 (pg_pconnect/pg_connect cause use-after-free)
 2016-05-12 13:15:57 +08:00
Xinchen Hui
3c0341e6f9 Fixed bug #72195 (pg_pconnect/pg_connect cause use-after-free) 2016-05-12 13:15:33 +08:00
Sara Golemon
8523b1f8ed Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fix serializing ZEND_AST_SHELL_EXEC
 2016-05-12 02:51:14 +00:00
Sara Golemon
a73b03edea Fix serializing ZEND_AST_SHELL_EXEC 
Currently, `foo` is reserialized as `'foo'` due to misuse of zend_ast_export().
ZEND_AST_SHELL_EXEC can only contain ZEND_AST_ZVAL(string) or ZEND_AST_ENCAPS_LIST,
so just handle the ZEND_AST_ZVAL(string) case directly.
 2016-05-12 02:47:56 +00:00
Dmitry Stogov
8a7a913a7a Use main VM stack for generators. Only single call frame for generator itself is allocated on heap, call frames for nested functions are allocated on main VM stack. In case "yield" used in context of another function call, call stack has to be frozen and then restored. 2016-05-12 00:44:18 +03:00
Ferenc Kovacs
9ffbd644c4 Merge branch 'PHP-7.0' 
* PHP-7.0:
  add missing NEWS entry
  prepare for 5.6.22RC1
  add missing NEWS entry
 2016-05-11 23:32:27 +02:00
Ferenc Kovacs
414eb83460 add missing NEWS entry 2016-05-11 23:31:52 +02:00
Ferenc Kovacs
edcc97df39 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  prepare for 5.6.22RC1
  add missing NEWS entry
 2016-05-11 23:31:09 +02:00
Ferenc Kovacs
0815f7f755 prepare for 5.6.22RC1 2016-05-11 23:30:04 +02:00
Ferenc Kovacs
89e4862e5f add missing NEWS entry 2016-05-11 23:29:23 +02:00
Dmitry Stogov
515a61069a Added test 2016-05-11 12:55:33 +03:00
Xinchen Hui
904ea128ee Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed Bug #72193 (dns_get_record returns array containing elements of type 'unknown')
 2016-05-11 17:32:06 +08:00
Xinchen Hui
df404e2e0e Fixed Bug #72193 (dns_get_record returns array containing elements of type 'unknown') 2016-05-11 17:31:46 +08:00
Xinchen Hui
233562c2da Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #71573 (Segfault (core dumped) if paramno beyond bound)
 2016-05-11 11:12:46 +08:00
Xinchen Hui
66ad4fc393 Fixed bug #71573 (Segfault (core dumped) if paramno beyond bound) 2016-05-11 11:12:27 +08:00
Derick Rethans
1c49a9fa71 Merge branch 'PHP-7.0' 2016-05-10 15:40:09 -04:00
Derick Rethans
c35bd4861d Allow for special case for the opcache zend extension 2016-05-10 15:40:03 -04:00
Anatol Belski
208c28f152 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix handle leak
 2016-05-10 20:03:27 +02:00
Anatol Belski
0718aa5833 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix handle leak
 2016-05-10 20:02:17 +02:00
Anatol Belski
6b63d80a7a fix handle leak 2016-05-10 19:59:48 +02:00
Dmitry Stogov
13ea086945 Merge branch 'PHP-7.0' 
* PHP-7.0:
  The "flock" structure has to be writable on AIX.
 2016-05-10 17:53:43 +03:00
Dmitry Stogov
f7372f648f Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  The "flock" structure has to be writable on AIX.
 2016-05-10 17:53:33 +03:00
Dmitry Stogov
90f43caf5b The "flock" structure has to be writable on AIX. 2016-05-10 17:50:14 +03:00
Anatol Belski
fd0731f09c Merge branch 'PHP-7.0' 
* PHP-7.0:
  prepare next 7.0.8
 2016-05-10 13:10:35 +02:00
Anatol Belski
09dae4dc85 prepare next 7.0.8 2016-05-10 13:06:55 +02:00
Nikita Popov
20560da118 Merge branch 'PHP-7.0' 
Conflicts:
	ext/reflection/php_reflection.c
 2016-05-10 12:17:54 +02:00
Nikita Popov
e6d4a9e2d2 Don't HT_ASSERT rc=1 in zend_hash_apply functions 
These are not necessarily used to modify the hash. Move the assert
into the APPLY_REMOVE branch only.
 2016-05-10 12:14:08 +02:00
Nikita Popov
a1ed4ab3ca Fixed bug #72174 
Also fixes a memory leak if ::getValue() is used with __get().
 2016-05-10 12:13:10 +02:00
Anatol Belski
f9bead7a59 Merge branch 'PHP-7.0' 
* PHP-7.0:
  update NEWS
  update NEWS
 2016-05-09 18:52:21 +02:00