diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2016-06-16 02:30:23 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2016-06-16 02:30:23 +0300 |
| commit | a9512af8109e889eb2c6042c57797184930667cd (patch) | |
| tree | 4f4f8bbcbddd3798d50d35c555a5a7620e77735f /Zend/zend_vm_opcodes.c | |
| parent | fba6f90ae3d9d15b2fab7a0ec06be5767e2ab148 (diff) | |
| download | php-git-a9512af8109e889eb2c6042c57797184930667cd.tar.gz | |
Implemented RFC: Fix inconsistent behavior of $this variable
Squashed commit of the following:
commit bdd3b6895c3ce3eacfcf7d4bf4feb8dfa61801fd
Author: Dmitry Stogov <dmitry@zend.com>
Date: Thu Jun 16 00:19:42 2016 +0300
Fixed GOTO VM
commit 2f1d7c8b89ce821086d357cf65f629f040a85c03
Author: Dmitry Stogov <dmitry@zend.com>
Date: Wed Jun 15 21:01:57 2016 +0300
Removed unused variable
commit cf749c42b0b1919f70b1e7d6dcbfff76899506af
Author: Dmitry Stogov <dmitry@zend.com>
Date: Wed Jun 15 19:06:16 2016 +0300
Protection from $this reassign through mb_parse_str()
commit 59a9a6c83c66b666971e57f1173b33a422166efd
Author: Dmitry Stogov <dmitry@zend.com>
Date: Wed Jun 15 18:14:50 2016 +0300
Added type inference rule for FETCH_THIS opcode
commit 73f8d14a856f14a461430b3c7534ab2ce870cbf6
Author: Dmitry Stogov <dmitry@zend.com>
Date: Wed Jun 15 18:11:18 2016 +0300
Restored PHP-7 behavior of isset($this->foo).
It throws exception if not in object context.
Removed useless opcode handlers.
commit fa0881381e8ae97e022ae5d1ec0851c952f33c82
Author: Dmitry Stogov <dmitry@zend.com>
Date: Tue May 31 12:25:47 2016 +0300
Changed "Notice: Undefined variable: this" into "Exception: Using $this when not in object context".
commit e32cc528c0f2c97963d8ec83eff0269f1f45af18
Author: Dmitry Stogov <dmitry@zend.com>
Date: Tue May 24 02:02:43 2016 +0300
Throw exception on attempt to re-assign $this through extract() and parse_str().
commit 41f1531b52113ec8a4c208aa6b9ef50f1386bb3f
Author: Dmitry Stogov <dmitry@zend.com>
Date: Mon May 23 22:18:36 2016 +0300
Fixed inconsistent $this behavior
Diffstat (limited to 'Zend/zend_vm_opcodes.c')
| -rw-r--r-- | Zend/zend_vm_opcodes.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/Zend/zend_vm_opcodes.c b/Zend/zend_vm_opcodes.c index 100106cdc5..7e159d4100 100644 --- a/Zend/zend_vm_opcodes.c +++ b/Zend/zend_vm_opcodes.c @@ -21,7 +21,7 @@ #include <stdio.h> #include <zend.h> -static const char *zend_vm_opcodes_names[184] = { +static const char *zend_vm_opcodes_names[187] = { "ZEND_NOP", "ZEND_ADD", "ZEND_SUB", @@ -206,9 +206,12 @@ static const char *zend_vm_opcodes_names[184] = { "ZEND_FETCH_CLASS_CONSTANT", "ZEND_BIND_LEXICAL", "ZEND_BIND_STATIC", + "ZEND_FETCH_THIS", + NULL, + "ZEND_ISSET_ISEMPTY_THIS", }; -static uint32_t zend_vm_opcodes_flags[184] = { +static uint32_t zend_vm_opcodes_flags[187] = { 0x00000000, 0x00000707, 0x00000707, @@ -284,7 +287,7 @@ static uint32_t zend_vm_opcodes_flags[184] = { 0x00106703, 0x08000007, 0x00030107, - 0x00000751, + 0x00000701, 0x00000751, 0x00002003, 0x03000001, @@ -324,7 +327,7 @@ static uint32_t zend_vm_opcodes_flags[184] = { 0x01000757, 0x01008773, 0x00030107, - 0x00020757, + 0x00020707, 0x00001003, 0x00001001, 0x01000703, @@ -393,6 +396,9 @@ static uint32_t zend_vm_opcodes_flags[184] = { 0x00000373, 0x00100101, 0x00100301, + 0x00000101, + 0x00000000, + 0x00000101, }; ZEND_API const char* zend_get_opcode_name(zend_uchar opcode) { |