Nikita Popov
443374675e
Merge branch 'PHP-5.6'
...
Conflicts:
Zend/zend_object_handlers.c
2014-10-03 21:30:06 +02:00
Nikita Popov
8617f2fa8d
Merge branch 'PHP-5.5' into PHP-5.6
2014-10-03 21:27:07 +02:00
Nikita Popov
93288d0095
Fix bug #68188
2014-10-03 21:26:39 +02:00
Nikita Popov
e7623f470f
Fix bug #68133 and bug #68135
2014-10-03 21:06:26 +02:00
Anatol Belski
647ebe6bf2
remove misprint parentheses
2014-10-03 19:23:33 +02:00
Dmitry Stogov
bd9a234645
Replaced EG(This) and EX(object) with EX(This).
...
Internal functions now recieves zend_execute_data as the first argument.
2014-10-03 19:32:46 +04:00
Xinchen Hui
5e39d0c19c
And this one...
2014-10-03 19:07:02 +08:00
Xinchen Hui
aa5f937958
It should be in extern c
2014-10-03 18:35:57 +08:00
Xinchen Hui
f54f5368e4
Merge branch 'master' of https://git.php.net/repository/php-src
2014-10-03 18:35:18 +08:00
Xinchen Hui
54bad8bf57
Remove useless condition
2014-10-03 18:35:05 +08:00
Dmitry Stogov
5c63a4f72b
Micro optimization for the most frequency case
2014-10-03 12:18:15 +04:00
Nikita Popov
51c90e999f
Fix ZTS build
2014-10-02 21:58:29 +02:00
Anatol Belski
c41fbcfb4c
improved file size computation in stat()
...
On 32 bit it's still overwlowing, so nothing is changed there. But
the usage of LARGE_INTEGER instead of bit shifting is a better way
to go.
2014-10-02 12:18:02 +02:00
Dmitry Stogov
ccb24caa6d
Fixed incorrect compilation
2014-10-02 13:37:44 +04:00
Dmitry Stogov
c4419e7a5b
Expose zend_throw_exception_internal()
2014-10-01 16:37:21 +04:00
Dmitry Stogov
8857af8494
Use inline finction for OBJ_RELEASE() macro
2014-10-01 16:35:56 +04:00
Dmitry Stogov
9f7564b12b
Removed zend_execute_data->prev_nested_call. Reuse prev_execute_data instead.
2014-10-01 10:46:13 +04:00
Dmitry Stogov
63dc9bbc02
Micro optimization
2014-09-30 15:19:51 +04:00
Nikita Popov
67a11b61cd
Drop unused INIT_STRING opcode
...
INIT_STRING has been implemented as an UNUSED op1 to ADD_* for
some time now.
2014-09-29 22:59:57 +02:00
Nikita Popov
290d71de75
Drop unused RAISE_ABSTRACT_ERROR opcode
...
Abstract methods are being prevented from being called in DO_FCALL
etc.
2014-09-29 22:50:56 +02:00
Nikita Popov
ab288b01d5
CT substitute unqualified true/false/null in namespaces
...
Substituation now always happens on the resolved name and
unqualified usages of true/false/null in namespaced code are
substituted as well.
2014-09-29 21:18:12 +02:00
Nikita Popov
142a01db92
Fix a couple compile warnings
2014-09-29 20:57:17 +02:00
Dmitry Stogov
e15be6c8cd
Use more readable inline functions
2014-09-29 19:41:00 +04:00
Xinchen Hui
f248b17e07
Fixed segfault
2014-09-29 12:06:56 +08:00
Timm Friebe
e14b7f629b
Fix segmentation fault in debug_backtrace()
2014-09-28 20:58:55 +02:00
Anatol Belski
4b3e198023
removed *.dsw and *.dsp files
2014-09-28 19:02:09 +02:00
Nikita Popov
877eb02fd6
Update operand types for coalesce operator
2014-09-28 12:20:04 +02:00
Andrea Faulds
2d069f640e
Merge branch 'coalesce_operator'
...
* coalesce_operator:
Extended coalesce operator test case for ordering/short-circuiting
Ensure not evaluated twice
Added test
Initial coalesce operator implementation
2014-09-28 00:07:04 +01:00
Anatol Belski
c1e92d9fed
fix C89 compat
2014-09-25 20:28:34 +02:00
krakjoe
eabad90acb
fix indentation
2014-09-25 16:31:39 +01:00
krakjoe
abdc8c3061
fix zts build
2014-09-25 16:15:02 +01:00
Dmitry Stogov
1833ab0230
Use macro
2014-09-25 17:00:17 +04:00
Dmitry Stogov
8b034ec69a
Optimized (PRE|POST)_(INC|DEC) handlers. Moved proxy object handling into helper function.
2014-09-25 13:42:46 +04:00
Dmitry Stogov
6a09bdff6a
Fixed C++ incompatibility
2014-09-24 20:31:22 +04:00
Dmitry Stogov
8ea2409e44
Fixed immutable arrays support
2014-09-24 15:39:54 +04:00
Nikita Popov
c45924b954
Remove dead code
2014-09-24 12:06:19 +02:00
Nikita Popov
1664e70ade
Test use($this) being an error
2014-09-24 12:06:19 +02:00
Nikita Popov
3e042e1f83
Move list() condition into assign_znode
...
The condition in compile_foreach was using ->attr instead of ->kind
and as such never passed. It only worked because assign_znode already
supported this case by indirecting via zend_compile_assign. Now it
implements it with a direct call.
2014-09-24 12:06:18 +02:00
Dmitry Stogov
73275a55f5
Avoid double checks
2014-09-24 12:20:46 +04:00
Dmitry Stogov
58a41cf795
Make QM_ASSIGN, JMP_SET and CAST return IS_TMP_VAR.
2014-09-24 01:57:40 +04:00
Dmitry Stogov
e8612b72ee
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
Drop unused result argument
Fix ct binding for cuf/cufa functions
Fix detection of write to built-in function for references
Test use of string names with \ prefix
Add zend_add_literal_string
Drop dead code
2014-09-23 23:27:20 +04:00
Dmitry Stogov
d429e87d18
Removed useless helper
2014-09-23 23:26:39 +04:00
Nikita Popov
4a221bd881
Drop unused result argument
2014-09-23 21:04:30 +02:00
Nikita Popov
67a5ca6697
Fix ct binding for cuf/cufa functions
...
It was checking against the wrong AST kind, so the binding was
never actually done.
2014-09-23 21:02:32 +02:00
Nikita Popov
9070eb38e9
Fix detection of write to built-in function for references
2014-09-23 20:42:22 +02:00
Nikita Popov
231dcc94e8
Test use of string names with \ prefix
...
And drop piece of dead code
2014-09-23 20:36:00 +02:00
Nikita Popov
182ddfeaf2
Add zend_add_literal_string
...
And simplify additional of special literals based on it.
2014-09-23 20:21:28 +02:00
Nikita Popov
4571271de1
Drop dead code
2014-09-23 19:32:02 +02:00
Dmitry Stogov
06103d65b1
Use zval_ptr_dtor_nogc() to free IS_TMP_VAR operands.
...
Removed ZEND_SWITCH_FREE opcode (ZEND_FREE used instead).
2014-09-23 17:21:29 +04:00
Dmitry Stogov
7cef08c5d1
Allocate copies of internal functions inherited in user classes at CG(arena), instead of permanent heap (malloc).
2014-09-23 12:35:42 +04:00