Merge branch 'master' into jit-dynasm

dstogov · dstogov · commit a4983d88c036 · 2017-09-12T10:09:26.000+03:00
* master:
  Disable eliminatin of empty basic block with multiple predecessors
  [ci skip] Fix news entry format
  [ci skip] Fix news entry format
  [ci skip] Fix news entry format
  Fixed incorrect empty basic block removing
  Add test for ftp functions with bogus resource
  Refactor ftp_append test to clean temporary files
  Fixed typo
  fix bug #75173 incorrect behavior of AppendIterator::append in foreach loop
  Fix LDFLAGS getting overwritten (ext/curl)
  Fixed arginfo for get_defined_functions
  Narrow typeinfos down for zend_parse_paramenters_none
  Fixed bug #46781 (BC math handles minus zero incorrectly)
diff --git a/NEWS b/NEWS
@@ -68,5 +68,7 @@ PHP                                                                        NEWS
 - SPL:
   . Fixed bug #74977 (Appending AppendIterator leads to segfault). 
     (Andrew Nester)
+  . Fixed bug #75173 (incorrect behavior of AppendIterator::append in foreach loop).
+    (jhdxr)
 
 <<< NOTE: Insert NEWS from last stable release here prior to actual release! >>>
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
@@ -193,6 +193,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_set_exception_handler, 0, 0, 1)
 	ZEND_ARG_INFO(0, exception_handler)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_INFO_EX(arginfo_get_defined_functions, 0, 0, 1)
+	ZEND_ARG_INFO(0, exclude_disabled)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_INFO_EX(arginfo_create_function, 0, 0, 2)
 	ZEND_ARG_INFO(0, args)
 	ZEND_ARG_INFO(0, code)
@@ -270,7 +274,7 @@ static const zend_function_entry builtin_functions[] = { /* {{{ */
 	ZEND_FE(get_declared_classes, 		arginfo_zend__void)
 	ZEND_FE(get_declared_traits, 		arginfo_zend__void)
 	ZEND_FE(get_declared_interfaces, 	arginfo_zend__void)
-	ZEND_FE(get_defined_functions, 		arginfo_zend__void)
+	ZEND_FE(get_defined_functions, 		arginfo_get_defined_functions)
 	ZEND_FE(get_defined_vars,		arginfo_zend__void)
 	ZEND_DEP_FE(create_function,		arginfo_create_function)
 	ZEND_FE(get_resource_type,		arginfo_get_resource_type)
diff --git a/ext/bcmath/libbcmath/src/str2num.c b/ext/bcmath/libbcmath/src/str2num.c
@@ -105,5 +105,8 @@ bc_str2num (bc_num *num, char *str, int scale)
       for (;strscale > 0; strscale--)
 	*nptr++ = CH_VAL(*ptr++);
     }
+
+  if (bc_is_zero (*num))
+    (*num)->n_sign = PLUS;
 }
 
diff --git a/ext/bcmath/tests/bug46781.phpt b/ext/bcmath/tests/bug46781.phpt
@@ -0,0 +1,16 @@
+--TEST--
+Bug #46781 (BC math handles minus zero incorrectly)
+--SKIPIF--
+<?php
+if (!extension_loaded('bcmath')) die('skip bcmath extension is not available');
+?>
+--FILE--
+<?php
+var_dump(bcadd('-0.0', '-0.0', 1));
+var_dump(bccomp('-0.0', '0', 1));
+?>
+===DONE===
+--EXPECT--
+string(3) "0.0"
+int(0)
+===DONE===
diff --git a/ext/curl/config.m4 b/ext/curl/config.m4
@@ -99,7 +99,7 @@ if test "$PHP_CURL" != "no"; then
    
     save_CFLAGS="$CFLAGS"
     CFLAGS=$CURL_INCL
-    save_LDFLAGS="$CFLAGS"
+    save_LDFLAGS="$LDFLAGS"
     LDFLAGS=$CURL_LIBS
    
     AC_PROG_CPP
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
@@ -1757,6 +1757,10 @@ PHP_FUNCTION(gmstrftime)
    Return current UNIX timestamp */
 PHP_FUNCTION(time)
 {
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
+	}
+
 	RETURN_LONG((zend_long)time(NULL));
 }
 /* }}} */
@@ -4835,6 +4839,9 @@ PHP_FUNCTION(date_default_timezone_set)
 PHP_FUNCTION(date_default_timezone_get)
 {
 	timelib_tzinfo *default_tz;
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
+	}
 
 	default_tz = get_timezone_info();
 	RETVAL_STRING(default_tz->name);
diff --git a/ext/date/tests/date_default_timezone_get_error.phpt b/ext/date/tests/date_default_timezone_get_error.phpt
@@ -22,6 +22,8 @@ var_dump( date_default_timezone_get($extra_arg));
 *** Testing date_default_timezone_get() : error conditions ***
 
 -- Testing date_create() function with more than expected no. of arguments --
-string(3) "UTC"
 
-===Done===
+Warning: date_default_timezone_get() expects exactly 0 parameters, 1 given in %sdate_default_timezone_get_error.php on line %d
+NULL
+
+===Done===
diff --git a/ext/date/tests/time_error.phpt b/ext/date/tests/time_error.phpt
@@ -15,5 +15,7 @@ var_dump (time($extra_arg));
 ===DONE===
 --EXPECTF--
 Too many arguments
-int(%d)
-===DONE===
+
+Warning: time() expects exactly 0 parameters, 1 given in %stime_error.php on line %d
+NULL
+===DONE===
diff --git a/ext/ftp/tests/006.phpt b/ext/ftp/tests/006.phpt
@@ -31,6 +31,7 @@ var_dump(ftp_site($ftp));
 var_dump(ftp_set_option($ftp));
 var_dump(ftp_get_option($ftp));
 var_dump(ftp_mlsd($ftp));
+var_dump(ftp_append($ftp));
 
 ?>
 --EXPECTF--
@@ -102,3 +103,6 @@ NULL
 
 Warning: ftp_mlsd() expects exactly 2 parameters, 1 given in %s006.php on line 26
 NULL
+
+Warning: ftp_append() expects at least 3 parameters, 1 given in %s006.php on line 27
+NULL
diff --git a/ext/ftp/tests/007.phpt b/ext/ftp/tests/007.phpt
@@ -0,0 +1,148 @@
+--TEST--
+FTP with bogus resource
+--CREDITS--
+Michael Paul da Rosa <michael [at] michaelpaul [dot] com [dot] br>
+PHP TestFest Dublin 2017
+--SKIPIF--
+<?php
+require 'skipif.inc';
+?>
+--FILE--
+<?php
+$ftp = tmpfile();
+
+var_dump(ftp_login($ftp, 'user', 'pass'));
+var_dump(ftp_pwd($ftp));
+var_dump(ftp_cdup($ftp));
+var_dump(ftp_chdir($ftp, '~'));
+var_dump(ftp_exec($ftp, 'x'));
+var_dump(ftp_raw($ftp, 'x'));
+var_dump(ftp_mkdir($ftp, '/'));
+var_dump(ftp_rmdir($ftp, '/'));
+var_dump(ftp_chmod($ftp, 7777, '/'));
+var_dump(ftp_alloc($ftp, 7777));
+var_dump(ftp_nlist($ftp, '/'));
+var_dump(ftp_rawlist($ftp, '~'));
+var_dump(ftp_mlsd($ftp, '~'));
+var_dump(ftp_systype($ftp));
+var_dump(ftp_fget($ftp, $ftp, 'remote', 7777));
+var_dump(ftp_nb_fget($ftp, $ftp, 'remote', 7777));
+var_dump(ftp_pasv($ftp, false));
+var_dump(ftp_get($ftp, 'local', 'remote', 7777));
+var_dump(ftp_nb_get($ftp, 'local', 'remote', 7777));
+var_dump(ftp_nb_continue($ftp));
+var_dump(ftp_fput($ftp, 'remote', $ftp, 9999));
+var_dump(ftp_nb_fput($ftp, 'remote', $ftp, 9999));
+var_dump(ftp_put($ftp, 'remote', 'local', 9999));
+var_dump(ftp_append($ftp, 'remote', 'local', 9999));
+var_dump(ftp_nb_put($ftp, 'remote', 'local', 9999));
+var_dump(ftp_size($ftp, '~'));
+var_dump(ftp_mdtm($ftp, '~'));
+var_dump(ftp_rename($ftp, 'old', 'new'));
+var_dump(ftp_delete($ftp, 'gone'));
+var_dump(ftp_site($ftp, 'localhost'));
+var_dump(ftp_close($ftp));
+var_dump(ftp_set_option($ftp, 1, 2));
+var_dump(ftp_get_option($ftp, 1));
+
+fclose($ftp);
+?>
+--EXPECTF--
+Warning: ftp_login(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
+bool(false)
+
+Warning: ftp_pwd(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
+bool(false)
+
+Warning: ftp_cdup(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
+bool(false)
+
+Warning: ftp_chdir(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
+bool(false)
+
+Warning: ftp_exec(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
+bool(false)
+
+Warning: ftp_raw(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
+bool(false)
+
+Warning: ftp_mkdir(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
+bool(false)
+
+Warning: ftp_rmdir(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
+bool(false)
+
+Warning: ftp_chmod(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
+bool(false)
+
+Warning: ftp_alloc(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
+bool(false)
+
+Warning: ftp_nlist(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
+bool(false)
+
+Warning: ftp_rawlist(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
+bool(false)
+
+Warning: ftp_mlsd(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
+bool(false)
+
+Warning: ftp_systype(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
+bool(false)
+
+Warning: ftp_fget(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
+bool(false)
+
+Warning: ftp_nb_fget(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
+bool(false)
+
+Warning: ftp_pasv(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
+bool(false)
+
+Warning: ftp_get(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
+bool(false)
+
+Warning: ftp_nb_get(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
+bool(false)
+
+Warning: ftp_nb_continue(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
+bool(false)
+
+Warning: ftp_fput(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
+bool(false)
+
+Warning: ftp_nb_fput(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
+bool(false)
+
+Warning: ftp_put(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
+bool(false)
+
+Warning: ftp_append(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
+bool(false)
+
+Warning: ftp_nb_put(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
+bool(false)
+
+Warning: ftp_size(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
+bool(false)
+
+Warning: ftp_mdtm(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
+bool(false)
+
+Warning: ftp_rename(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
+bool(false)
+
+Warning: ftp_delete(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
+bool(false)
+
+Warning: ftp_site(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
+bool(false)
+
+Warning: ftp_close(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
+bool(false)
+
+Warning: ftp_set_option(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
+bool(false)
+
+Warning: ftp_get_option(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
+bool(false)
diff --git a/ext/ftp/tests/ftp_append.phpt b/ext/ftp/tests/ftp_append.phpt
@@ -13,18 +13,28 @@ if (!$ftp) die("Couldn't connect to the server");
 
 var_dump(ftp_login($ftp, 'user', 'pass'));
 
-@unlink(__DIR__.'/ftp_append_foobar');
+$fooPath = __DIR__ . '/ftp_append_foo';
+file_put_contents($fooPath, 'foo');
+var_dump(ftp_append($ftp, 'ftp_append_foobar', $fooPath, FTP_BINARY));
 
-file_put_contents(__DIR__.'/ftp_append_foo', 'foo');
-var_dump(ftp_append($ftp, 'ftp_append_foobar', __DIR__.'/ftp_append_foo', FTP_BINARY));
+$barPath = __DIR__ . '/ftp_append_bar';
+file_put_contents($barPath, 'bar');
+var_dump(ftp_append($ftp, 'ftp_append_foobar', $barPath, FTP_BINARY));
 
-file_put_contents(__DIR__.'/ftp_append_bar', 'bar');
-var_dump(ftp_append($ftp, 'ftp_append_foobar', __DIR__.'/ftp_append_bar', FTP_BINARY));
-
-var_dump(file_get_contents(__DIR__.'/ftp_append_foobar'));
+$fooBarPath = __DIR__ . '/ftp_append_foobar';
+var_dump(file_get_contents($fooBarPath));
 
 ftp_close($ftp);
 ?>
+--CLEAN--
+<?php
+$fooPath = __DIR__ . '/ftp_append_foo';
+unlink($fooPath);
+$barPath = __DIR__ . '/ftp_append_bar';
+unlink($barPath);
+$fooBarPath = __DIR__ . '/ftp_append_foobar';
+unlink($fooBarPath);
+?>
 --EXPECTF--
 bool(true)
 bool(true)
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
@@ -1323,7 +1323,7 @@ PHP_MINFO_FUNCTION(gd)
 PHP_FUNCTION(gd_info)
 {
 	if (zend_parse_parameters_none() == FAILURE) {
-		RETURN_FALSE;
+		return;
 	}
 
 	array_init(return_value);
diff --git a/ext/gd/tests/gd_info_error.phpt b/ext/gd/tests/gd_info_error.phpt
@@ -31,8 +31,8 @@ var_dump(gd_info($extra_arg_string, $extra_arg_number));
 -- Testing gd_info() function with more than expected number of arguments --
 
 Warning: gd_info() expects exactly 0 parameters, 1 given in %s on line %d
-bool(false)
+NULL
 
 Warning: gd_info() expects exactly 0 parameters, 2 given in %s on line %d
-bool(false)
-===DONE===
+NULL
+===DONE===
diff --git a/ext/opcache/Optimizer/dfa_pass.c b/ext/opcache/Optimizer/dfa_pass.c
@@ -489,7 +489,7 @@ static void compress_block(zend_op_array *op_array, zend_basic_block *block)
 	}
 }
 
-static void zned_ssa_replace_control_link(zend_op_array *op_array, zend_ssa *ssa, int from, int to, int new_to)
+static void zend_ssa_replace_control_link(zend_op_array *op_array, zend_ssa *ssa, int from, int to, int new_to)
 {
 	zend_basic_block *src = &ssa->cfg.blocks[from];
 	zend_basic_block *old = &ssa->cfg.blocks[to];
@@ -578,16 +578,16 @@ static void zned_ssa_replace_control_link(zend_op_array *op_array, zend_ssa *ssa
 
 static void zend_ssa_unlink_block(zend_op_array *op_array, zend_ssa *ssa, zend_basic_block *block, int block_num)
 {
-	if (block->predecessors_count && ssa->blocks[block_num].phis == NULL) {
+	if (block->predecessors_count == 1 && ssa->blocks[block_num].phis == NULL) {
 		int *predecessors, i;
 
 		ZEND_ASSERT(block->successors_count == 1);
 		predecessors = &ssa->cfg.predecessors[block->predecessor_offset];
 		for (i = 0; i < block->predecessors_count; i++) {
-			zned_ssa_replace_control_link(op_array, ssa, predecessors[i], block_num, block->successors[0]);
+			zend_ssa_replace_control_link(op_array, ssa, predecessors[i], block_num, block->successors[0]);
 		}
+		zend_ssa_remove_block(op_array, ssa, block_num);
 	}
-	zend_ssa_remove_block(op_array, ssa, block_num);
 }
 
 static int zend_dfa_optimize_jmps(zend_op_array *op_array, zend_ssa *ssa)
diff --git a/ext/opcache/Optimizer/zend_func_info.c b/ext/opcache/Optimizer/zend_func_info.c
diff --git a/ext/opcache/tests/jmp_elim_002.phpt b/ext/opcache/tests/jmp_elim_002.phpt
diff --git a/ext/opcache/tests/jmp_elim_003.phpt b/ext/opcache/tests/jmp_elim_003.phpt
diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
diff --git a/ext/spl/tests/bug75173.phpt b/ext/spl/tests/bug75173.phpt
diff --git a/ext/standard/lcg.c b/ext/standard/lcg.c
diff --git a/ext/standard/tests/math/lcg_value_basic.phpt b/ext/standard/tests/math/lcg_value_basic.phpt

Original file line number	Diff line number	Diff line change
`@@ -105,5 +105,8 @@ bc_str2num (bc_num num, char str, int scale)`
`105`	`105`	`for (;strscale > 0; strscale--)`
`106`	`106`	`nptr++ = CH_VAL(ptr++);`
`107`	`107`	`}`
	`108`	`+`
	`109`	`+ if (bc_is_zero (*num))`
	`110`	`+ (*num)->n_sign = PLUS;`
`108`	`111`	`}`
`109`	`112`
Original file line number	Diff line number	Diff line change
`@@ -1757,6 +1757,10 @@ PHP_FUNCTION(gmstrftime)`
`1757`	`1757`	`Return current UNIX timestamp */`
`1758`	`1758`	`PHP_FUNCTION(time)`
`1759`	`1759`	`{`
	`1760`	`+ if (zend_parse_parameters_none() == FAILURE) {`
	`1761`	`+ return;`
	`1762`	`+ }`
	`1763`	`+`
`1760`	`1764`	`RETURN_LONG((zend_long)time(NULL));`
`1761`	`1765`	`}`
`1762`	`1766`	`/* }}} */`
`@@ -4835,6 +4839,9 @@ PHP_FUNCTION(date_default_timezone_set)`
`4835`	`4839`	`PHP_FUNCTION(date_default_timezone_get)`
`4836`	`4840`	`{`
`4837`	`4841`	`timelib_tzinfo *default_tz;`
	`4842`	`+ if (zend_parse_parameters_none() == FAILURE) {`
	`4843`	`+ return;`
	`4844`	`+ }`
`4838`	`4845`
`4839`	`4846`	`default_tz = get_timezone_info();`
`4840`	`4847`	`RETVAL_STRING(default_tz->name);`