Merge branch 'PHP-7.1'

diff --cc ext/opcache/Optimizer/block_pass.c
Simple merge

diff --cc ext/opcache/Optimizer/zend_func_info.c
Simple merge

diff --cc ext/opcache/Optimizer/zend_inference.c
Simple merge