wip

Author: jhdxr

Zend/zend_compile.c

@@ -7683,12 +7683,9 @@ void zend_compile_array(znode *result, zend_ast *ast) /* {{{ */
 			zend_compile_expr(&value_node, value_ast);
 			if (i == 0) {
 				opline = zend_emit_op_tmp(result, ZEND_INIT_ARRAY, &value_node, NULL);
-				opline->extended_value = list->children << ZEND_ARRAY_SIZE_SHIFT; //fixme
-				opline->extended_value |= ZEND_ARRAY_DISPATCH_TO_UNPACK;
-			} else {
-				opline = zend_emit_op(NULL, ZEND_ADD_ARRAY_UNPACK, &value_node, NULL);
-				SET_NODE(opline->result, result);
 			}
+			opline = zend_emit_op(NULL, ZEND_ADD_ARRAY_UNPACK, &value_node, NULL);
+			SET_NODE(opline->result, result);
 			continue;
 		}
 

Zend/zend_compile.h

@@ -995,8 +995,7 @@ static zend_always_inline int zend_check_arg_send_type(const zend_function *zf,
 
 #define ZEND_ARRAY_ELEMENT_REF		(1<<0)
 #define ZEND_ARRAY_NOT_PACKED		(1<<1)
-#define ZEND_ARRAY_DISPATCH_TO_UNPACK	(1<<2)
-#define ZEND_ARRAY_SIZE_SHIFT		3
+#define ZEND_ARRAY_SIZE_SHIFT		2
 
 /* For "use" AST nodes and the seen symbol table */
 #define ZEND_SYMBOL_CLASS    (1<<0)

Zend/zend_vm_def.h

@@ -5592,6 +5592,7 @@ ZEND_VM_HANDLER(208, ZEND_ADD_ARRAY_UNPACK, ANY, ANY)
 	SAVE_OPLINE();
 	op1 = GET_OP1_ZVAL_PTR(BP_VAR_R);
 
+	SEPARATE_ARRAY(EX_VAR(opline->result.var));
 ZEND_VM_C_LABEL(add_again):
 	if (EXPECTED(Z_TYPE_P(op1) == IS_ARRAY)) {
 		HashTable *ht = Z_ARRVAL_P(op1);
@@ -5687,7 +5688,7 @@ ZEND_VM_C_LABEL(add_again):
 	ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 }
 
-ZEND_VM_HANDLER(71, ZEND_INIT_ARRAY, CONST|TMP|VAR|CV, CONST|TMPVAR|UNUSED|NEXT|CV, ARRAY_INIT|REF)
+ZEND_VM_HANDLER(71, ZEND_INIT_ARRAY, CONST|TMP|VAR|CV|UNUSED, CONST|TMPVAR|UNUSED|NEXT|CV, ARRAY_INIT|REF)
 {
 	zval *array;
 	uint32_t size;
@@ -5701,11 +5702,7 @@ ZEND_VM_HANDLER(71, ZEND_INIT_ARRAY, CONST|TMP|VAR|CV, CONST|TMPVAR|UNUSED|NEXT|
 		if (opline->extended_value & ZEND_ARRAY_NOT_PACKED) {
 			zend_hash_real_init_mixed(Z_ARRVAL_P(array));
 		}
-		if (opline->extended_value & ZEND_ARRAY_DISPATCH_TO_UNPACK) {
-			ZEND_VM_DISPATCH_TO_HANDLER(ZEND_ADD_ARRAY_UNPACK);
-		} else {
-			ZEND_VM_DISPATCH_TO_HANDLER(ZEND_ADD_ARRAY_ELEMENT);
-		}
+		ZEND_VM_DISPATCH_TO_HANDLER(ZEND_ADD_ARRAY_ELEMENT);
 	} else {
 		ZVAL_EMPTY_ARRAY(array);
 		ZEND_VM_NEXT_OPCODE();