Skip to content

Commit 2be9462

Browse files
committed
DEREF early, Remove many VAR specs
1 parent ada7400 commit 2be9462

30 files changed

+2299
-9371
lines changed

Zend/tests/list/bug73663.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
Bug #73663 ("Invalid opcode 65/16/8" occurs with a variable created with list())
3+
--XFAIL--
4+
list() assign resulting in a ref only when there's a single by-ref fetch is kinda weird.
35
--FILE--
46
<?php
57
function change(&$ref) {

Zend/tests/operator_unsupported_types.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ Unsupported operand types: stdClass * stdClass
287287
Unsupported operand types: stdClass * resource
288288
Unsupported operand types: stdClass * string
289289
Unsupported operand types: resource * array
290-
Unsupported operand types: stdClass * resource
290+
Unsupported operand types: resource * stdClass
291291
Unsupported operand types: resource * resource
292292
Unsupported operand types: resource * string
293293
Unsupported operand types: string * array
@@ -753,7 +753,7 @@ Unsupported operand types: stdClass & stdClass
753753
Unsupported operand types: stdClass & resource
754754
Unsupported operand types: stdClass & string
755755
Unsupported operand types: resource & array
756-
Unsupported operand types: stdClass & resource
756+
Unsupported operand types: resource & stdClass
757757
Unsupported operand types: resource & resource
758758
Unsupported operand types: resource & string
759759
Unsupported operand types: string & array
@@ -828,7 +828,7 @@ Unsupported operand types: stdClass | stdClass
828828
Unsupported operand types: stdClass | resource
829829
Unsupported operand types: stdClass | string
830830
Unsupported operand types: resource | array
831-
Unsupported operand types: stdClass | resource
831+
Unsupported operand types: resource | stdClass
832832
Unsupported operand types: resource | resource
833833
Unsupported operand types: resource | string
834834
Unsupported operand types: string | array
@@ -903,7 +903,7 @@ Unsupported operand types: stdClass ^ stdClass
903903
Unsupported operand types: stdClass ^ resource
904904
Unsupported operand types: stdClass ^ string
905905
Unsupported operand types: resource ^ array
906-
Unsupported operand types: stdClass ^ resource
906+
Unsupported operand types: resource ^ stdClass
907907
Unsupported operand types: resource ^ resource
908908
Unsupported operand types: resource ^ string
909909
Unsupported operand types: string ^ array

Zend/zend_closures.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ static ZEND_NAMED_FUNCTION(zend_closure_call_magic) /* {{{ */ {
339339
fcc.called_scope = zend_get_called_scope(EG(current_execute_data));
340340

341341
zend_call_function(&fci, &fcc);
342-
342+
zend_return_unwrap_ref(EG(current_execute_data), return_value);
343343
zval_ptr_dtor(&fci.params[1]);
344344
}
345345
/* }}} */

0 commit comments

Comments
 (0)