Disable block pass for large functions

nikic · nikic · commit 7ea261685f17 · 2017-03-17T12:49:20.000+01:00
This is the last fix for bug #74250.
diff --git a/NEWS b/NEWS
@@ -18,6 +18,10 @@ PHP                                                                        NEWS
   . Fixed bug #74004 (LIBXML_NOWARNING flag ingnored on loadHTML*).
     (somedaysummer)
 
+- Opcache:
+  . Fixed bug #74250 (OPcache compilation performance regression in PHP 5.6/7
+    with huge classes). (Nikita)
+
 - OpenSSL:
   . Fixed bug #72333 (fwrite() on non-blocking SSL sockets doesn't work).
     (Jakub Zelenka)
diff --git a/ext/opcache/Optimizer/block_pass.c b/ext/opcache/Optimizer/block_pass.c
@@ -1794,6 +1794,11 @@ void zend_optimize_cfg(zend_op_array *op_array, zend_optimizer_ctx *ctx)
 		return;
 	}
 
+	if (cfg.blocks_count * (op_array->last_var + op_array->T) > 64 * 1024 * 1024) {
+		zend_arena_release(&ctx->arena, checkpoint);
+		return;
+	}
+
 	if (ctx->debug_level & ZEND_DUMP_BEFORE_BLOCK_PASS) {
 		zend_dump_op_array(op_array, ZEND_DUMP_CFG, "before block pass", &cfg);
 	}

Original file line number	Diff line number	Diff line change
`@@ -1794,6 +1794,11 @@ void zend_optimize_cfg(zend_op_array op_array, zend_optimizer_ctx ctx)`
`1794`	`1794`	`return;`
`1795`	`1795`	`}`
`1796`	`1796`
	`1797`	`+ if (cfg.blocks_count * (op_array->last_var + op_array->T) > 64 * 1024 * 1024) {`
	`1798`	`+ zend_arena_release(&ctx->arena, checkpoint);`
	`1799`	`+ return;`
	`1800`	`+ }`
	`1801`	`+`
`1797`	`1802`	`if (ctx->debug_level & ZEND_DUMP_BEFORE_BLOCK_PASS) {`
`1798`	`1803`	`zend_dump_op_array(op_array, ZEND_DUMP_CFG, "before block pass", &cfg);`
`1799`	`1804`	`}`