Merge branch 'master' of https://github.com/php/php-src into typed-properties

krakjoe · krakjoe · commit 449ca5d526c5 · 2016-03-20T06:26:03.000Z
diff --git a/UPGRADING b/UPGRADING
@@ -71,7 +71,7 @@ PHP 7.1 UPGRADE NOTES
   the $offset argument.
 - strpos(), stripos(), substr_count(), grapheme_strpos(), grapheme_stripos(),
   grapheme_extract(), iconv_strpos(), mb_strimwidth(), mb_ereg_search_setpos(),
-  mb_strpos() and mb_stripos() now accept negative string offstes.
+  mb_strpos() and mb_stripos() now accept negative string offsets.
 - substr_count() and mb_strimwidth() additionally also accept negative length.
 - file_get_contents() accepts a negative seek offset if the stream is seekable.
 
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
@@ -200,6 +200,10 @@ typedef struct  _zend_mm_huge_list zend_mm_huge_list;
 # define PTR_FMT "0x%0.8lx"
 #endif
 
+#ifdef MAP_HUGETLB
+int zend_mm_use_huge_pages = 1;
+#endif
+
 /*
  * Memory is retrived from OS by chunks of fixed size 2MB.
  * Inside chunk it's managed by pages of fixed size 4096B.
@@ -462,7 +466,7 @@ static void *zend_mm_mmap(size_t size)
 	void *ptr;
 
 #ifdef MAP_HUGETLB
-	if (size == ZEND_MM_CHUNK_SIZE) {
+	if (zend_mm_use_huge_pages && size == ZEND_MM_CHUNK_SIZE) {
 		ptr = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON | MAP_HUGETLB, -1, 0);
 		if (ptr != MAP_FAILED) {
 			return ptr;
@@ -2647,6 +2651,12 @@ static void alloc_globals_ctor(zend_alloc_globals *alloc_globals)
 		alloc_globals->mm_heap->custom_heap.std._realloc = realloc;
 		return;
 	}
+#endif
+#ifdef MAP_HUGETLB
+	tmp = getenv("USE_ZEND_ALLOC_HUGE_PAGES");
+	if (tmp && !zend_atoi(tmp, 0)) {
+		zend_mm_use_huge_pages = 0;
+	}
 #endif
 	ZEND_TSRMLS_CACHE_UPDATE();
 	alloc_globals->mm_heap = zend_mm_init();
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -737,11 +737,7 @@ void zend_do_free(znode *op1) /* {{{ */
 			}
 		}
 
-		opline = get_next_op(CG(active_op_array));
-
-		opline->opcode = ZEND_FREE;
-		SET_NODE(opline->op1, op1);
-		SET_UNUSED(opline->op2);
+		zend_emit_op(NULL, ZEND_FREE, op1, NULL);
 	} else if (op1->op_type == IS_VAR) {
 		zend_op *opline = &CG(active_op_array)->opcodes[CG(active_op_array)->last-1];
 		while (opline->opcode == ZEND_END_SILENCE ||
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
@@ -834,26 +834,13 @@ ZEND_API void zend_assert_valid_class_name(const zend_string *const_name);
 #define ZEND_FETCH_CLASS_SILENT      0x0100
 #define ZEND_FETCH_CLASS_EXCEPTION   0x0200
 
-/* variable parsing type (compile-time) */
-#define ZEND_PARSED_MEMBER				(1<<0)
-#define ZEND_PARSED_METHOD_CALL			(1<<1)
-#define ZEND_PARSED_STATIC_MEMBER		(1<<2)
-#define ZEND_PARSED_FUNCTION_CALL		(1<<3)
-#define ZEND_PARSED_VARIABLE			(1<<4)
-#define ZEND_PARSED_REFERENCE_VARIABLE	(1<<5)
-#define ZEND_PARSED_NEW					(1<<6)
-#define ZEND_PARSED_LIST_EXPR			(1<<7)
-
 #define ZEND_PARAM_REF      (1<<0)
 #define ZEND_PARAM_VARIADIC (1<<1)
 
 #define ZEND_NAME_FQ       0
 #define ZEND_NAME_NOT_FQ   1
 #define ZEND_NAME_RELATIVE 2
 
-/* unset types */
-#define ZEND_UNSET_REG 0
-
 /* var status for backpatching */
 #define BP_VAR_R			0
 #define BP_VAR_W			1
@@ -906,8 +893,6 @@ ZEND_API void zend_assert_valid_class_name(const zend_string *const_name);
 
 #define ZEND_FREE_ON_RETURN     (1<<0)
 
-#define ZEND_MEMBER_FUNC_CALL   (1<<0)
-
 #define ZEND_ARG_SEND_BY_REF (1<<0)
 #define ZEND_ARG_COMPILE_TIME_BOUND (1<<1)
 #define ZEND_ARG_SEND_FUNCTION (1<<2)
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
@@ -117,21 +117,8 @@ static const zend_internal_function zend_pass_function = {
 		zval_ptr_dtor_nogc(should_free); \
 	}
 
-/* End of zend_execute_locks.h */
-
 #define CV_DEF_OF(i) (EX(func)->op_array.vars[i])
 
-#define CTOR_CALL_BIT    0x1
-#define CTOR_USED_BIT    0x2
-
-#define IS_CTOR_CALL(ce) (((zend_uintptr_t)(ce)) & CTOR_CALL_BIT)
-#define IS_CTOR_USED(ce) (((zend_uintptr_t)(ce)) & CTOR_USED_BIT)
-
-#define ENCODE_CTOR(ce, used) \
-	((zend_class_entry*)(((zend_uintptr_t)(ce)) | CTOR_CALL_BIT | ((used) ? CTOR_USED_BIT : 0)))
-#define DECODE_CTOR(ce) \
-	((zend_class_entry*)(((zend_uintptr_t)(ce)) & ~(CTOR_CALL_BIT|CTOR_USED_BIT)))
-
 #define ZEND_VM_MAIN_STACK_PAGE_SLOTS (16 * 1024) /* should be a power of 2 */
 #define ZEND_VM_GENERATOR_STACK_PAGE_SLOTS (256)
 
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
@@ -397,7 +397,7 @@ void shutdown_executor(void) /* {{{ */
 
 	zend_shutdown_fpu();
 
-#ifdef ZEND_DEBUG
+#if ZEND_DEBUG
 	if (EG(ht_iterators_used) && !CG(unclean_shutdown)) {
 		zend_error(E_WARNING, "Leaked %" PRIu32 " hashtable iterators", EG(ht_iterators_used));
 	}
diff --git a/ext/opcache/Optimizer/dfa_pass.c b/ext/opcache/Optimizer/dfa_pass.c
@@ -412,7 +412,7 @@ void zend_dfa_optimize_op_array(zend_op_array *op_array, zend_optimizer_ctx *ctx
 
 	if (ssa->var_info) {
 		int i;
-		zend_op *opline, *end;
+		zend_op *opline;
 		zval tmp;
 
 		/* Convert LONG constants to DOUBLE */
diff --git a/ext/opcache/Optimizer/zend_optimizer.c b/ext/opcache/Optimizer/zend_optimizer.c
@@ -33,7 +33,7 @@
 #include "zend_dump.h"
 
 #ifndef HAVE_DFA_PASS
-# define HAVE_DFA_PASS 0
+# define HAVE_DFA_PASS 1
 #endif
 
 static void zend_optimizer_zval_dtor_wrapper(zval *zvalue)
diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
@@ -1541,16 +1541,16 @@ static int register_bound_param(INTERNAL_FUNCTION_PARAMETERS, pdo_stmt_t *stmt,
 {
 	struct pdo_bound_param_data param = {{{0}}};
 	zend_long param_type = PDO_PARAM_STR;
-	zval *parameter;
+	zval *parameter, *driver_params = NULL;
 
 	param.paramno = -1;
 
 	if (FAILURE == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(),
 			"lz|llz!", &param.paramno, &parameter, &param_type, &param.max_value_len,
-			&param.driver_params)) {
+			&driver_params)) {
 		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "Sz|llz!", &param.name,
 				&parameter, &param_type, &param.max_value_len,
-				&param.driver_params)) {
+				&driver_params)) {
 			return 0;
 		}
 	}
@@ -1564,6 +1564,10 @@ static int register_bound_param(INTERNAL_FUNCTION_PARAMETERS, pdo_stmt_t *stmt,
 		return 0;
 	}
 
+	if (driver_params) {
+		ZVAL_COPY(&param.driver_params, driver_params);
+	}
+
 	ZVAL_COPY(&param.parameter, parameter);
 	if (!really_register_bound_param(&param, stmt, is_param)) {
 		if (!Z_ISUNDEF(param.parameter)) {
diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c
@@ -307,7 +307,7 @@ static int spl_autoload(zend_string *class_name, zend_string *lc_name, const cha
  Default implementation for __autoload() */
 PHP_FUNCTION(spl_autoload)
 {
-	int found = 0, pos_len, pos1_len;
+	int pos_len, pos1_len;
 	char *pos, *pos1;
 	zend_string *class_name, *lc_name, *file_exts = SPL_G(autoload_extensions);
 
@@ -333,32 +333,12 @@ PHP_FUNCTION(spl_autoload)
 			pos1_len = pos_len;
 		}
 		if (spl_autoload(class_name, lc_name, pos, pos1_len)) {
-			found = 1;
 			break; /* loaded */
 		}
 		pos = pos1 ? pos1 + 1 : NULL;
 		pos_len = pos1? pos_len - pos1_len - 1 : 0;
 	}
 	zend_string_free(lc_name);
-
-	if (!found && !SPL_G(autoload_running)) {
-		/* For internal errors, we generate E_ERROR, for direct calls an exception is thrown.
-		 * The "scope" is determined by an opcode, if it is ZEND_FETCH_CLASS we know function was called indirectly by
-		 * the Zend engine.
-		 */
-		zend_execute_data *ex = EX(prev_execute_data);
-
-		while (ex && (!ex->func || !ZEND_USER_CODE(ex->func->type))) {
-			ex = ex->prev_execute_data;
-		}
-		if (ex &&
-		    ex->opline->opcode != ZEND_FETCH_CLASS &&
-		    ex->opline->opcode != ZEND_NEW) {
-			zend_throw_exception_ex(spl_ce_LogicException, 0, "Class %s could not be loaded", ZSTR_VAL(class_name));
-		} else {
-			php_error_docref(NULL, E_ERROR, "Class %s could not be loaded", ZSTR_VAL(class_name));
-		}
-	}
 } /* }}} */
 
 /* {{{ proto string spl_autoload_extensions([string file_extensions])
diff --git a/ext/spl/spl_observer.c b/ext/spl/spl_observer.c
@@ -858,10 +858,7 @@ SPL_METHOD(SplObjectStorage, unserialize)
 	}
 
 	/* copy members */
-	if (!intern->std.properties) {
-		rebuild_object_properties(&intern->std);
-	}
-	zend_hash_copy(intern->std.properties, Z_ARRVAL_P(pmembers), (copy_ctor_func_t) zval_add_ref);
+	object_properties_load(&intern->std, Z_ARRVAL_P(pmembers));
 
 	PHP_VAR_UNSERIALIZE_DESTROY(var_hash);
 	return;
diff --git a/ext/spl/tests/ArrayObject_sort_different_backing_storage.phpt b/ext/spl/tests/ArrayObject_sort_different_backing_storage.phpt
@@ -0,0 +1,72 @@
+--TEST--
+Test sorting of various ArrayObject backing storage
+--FILE--
+<?php
+
+$obj = (object)['a' => 2, 'b' => 1];
+$ao = new ArrayObject($obj);
+$ao->uasort(function($a, $b) { return $a <=> $b; });
+var_dump($ao);
+
+$ao2 = new ArrayObject($ao);
+$ao2->uasort(function($a, $b) { return $b <=> $a; });
+var_dump($ao2);
+
+$ao3 = new ArrayObject();
+$ao3->exchangeArray($ao3);
+$ao3->a = 2;
+$ao3->b = 1;
+$ao3->uasort(function($a, $b) { return $a <=> $b; });
+var_dump($ao3);
+
+$ao4 = new ArrayObject([]);
+$ao4->uasort(function($a, $b) { return $a <=> $b; });
+var_dump($ao4);
+
+$ao5 = new ArrayObject(['a' => 2, 'b' => 1]);
+$ao5->uasort(function($a, $b) { return $a <=> $b; });
+var_dump($ao5);
+
+?>
+--EXPECT--
+object(ArrayObject)#2 (1) {
+  ["storage":"ArrayObject":private]=>
+  object(stdClass)#1 (2) {
+    ["b"]=>
+    int(1)
+    ["a"]=>
+    int(2)
+  }
+}
+object(ArrayObject)#3 (1) {
+  ["storage":"ArrayObject":private]=>
+  object(ArrayObject)#2 (1) {
+    ["storage":"ArrayObject":private]=>
+    object(stdClass)#1 (2) {
+      ["a"]=>
+      int(2)
+      ["b"]=>
+      int(1)
+    }
+  }
+}
+object(ArrayObject)#4 (2) {
+  ["b"]=>
+  int(1)
+  ["a"]=>
+  int(2)
+}
+object(ArrayObject)#5 (1) {
+  ["storage":"ArrayObject":private]=>
+  array(0) {
+  }
+}
+object(ArrayObject)#6 (1) {
+  ["storage":"ArrayObject":private]=>
+  array(2) {
+    ["b"]=>
+    int(1)
+    ["a"]=>
+    int(2)
+  }
+}
diff --git a/ext/spl/tests/bug38325.phpt b/ext/spl/tests/bug38325.phpt
@@ -6,4 +6,7 @@ spl_autoload_register();
 new ThisClassDoesNotExistEverFoo();
 ?>
 --EXPECTF--
-Fatal error: spl_autoload(): Class ThisClassDoesNotExistEverFoo could not be loaded in %s on line 3
+Fatal error: Uncaught Error: Class 'ThisClassDoesNotExistEverFoo' not found in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line 3
diff --git a/ext/spl/tests/bug52339.phpt b/ext/spl/tests/bug52339.phpt
@@ -0,0 +1,11 @@
+--TEST--
+Bug #52339: SPL autoloader breaks class_exists()
+--FILE--
+<?php
+var_dump(class_exists('asdfasdf'));
+spl_autoload_register();
+var_dump(class_exists('asdfasdf'));
+?>
+--EXPECT--
+bool(false)
+bool(false)
diff --git a/ext/spl/tests/bug71838.phpt b/ext/spl/tests/bug71838.phpt
@@ -0,0 +1,24 @@
+--TEST--
+Bug #71839: Deserializing serialized SPLObjectStorage-Object can't access properties in PHP
+--FILE--
+<?php
+
+class A extends SplObjectStorage {
+    protected $a = null;
+
+    public function __construct() {
+        $this->a = '123';
+    }
+    
+    public function getA() {
+        return $this->a;
+    }
+}
+
+$serialized = serialize(new A());
+$obj = unserialize($serialized);
+var_dump($obj->getA());
+
+?>
+--EXPECT--
+string(3) "123"
diff --git a/ext/spl/tests/spl_autoload_001.phpt b/ext/spl/tests/spl_autoload_001.phpt
diff --git a/ext/standard/math.c b/ext/standard/math.c

Original file line number	Diff line number	Diff line change
`@@ -737,11 +737,7 @@ void zend_do_free(znode op1) / {{{ */`
`737`	`737`	`}`
`738`	`738`	`}`
`739`	`739`
`740`		`- opline = get_next_op(CG(active_op_array));`
`741`		`-`
`742`		`- opline->opcode = ZEND_FREE;`
`743`		`- SET_NODE(opline->op1, op1);`
`744`		`- SET_UNUSED(opline->op2);`
	`740`	`+ zend_emit_op(NULL, ZEND_FREE, op1, NULL);`
`745`	`741`	`} else if (op1->op_type == IS_VAR) {`
`746`	`742`	`zend_op *opline = &CG(active_op_array)->opcodes[CG(active_op_array)->last-1];`
`747`	`743`	`while (opline->opcode == ZEND_END_SILENCE \|\|`
Original file line number	Diff line number	Diff line change
`@@ -397,7 +397,7 @@ void shutdown_executor(void) /* {{{ */`
`397`	`397`
`398`	`398`	`zend_shutdown_fpu();`
`399`	`399`
`400`		`-#ifdef ZEND_DEBUG`
	`400`	`+#if ZEND_DEBUG`
`401`	`401`	`if (EG(ht_iterators_used) && !CG(unclean_shutdown)) {`
`402`	`402`	`zend_error(E_WARNING, "Leaked %" PRIu32 " hashtable iterators", EG(ht_iterators_used));`
`403`	`403`	`}`