opcache: re-enable PASS_15 (constant collection) by default

Was disabled in Dec 2015 to fix bug #71127. The bug no longer reproduces on current master -- bug71127.phpt passes with PASS_15 enabled.

Author: wilaak

Zend/Optimizer/zend_optimizer.h

@@ -46,7 +46,7 @@
 
 #define ZEND_OPTIMIZER_ALL_PASSES	0x7FFFFFFF
 
-#define DEFAULT_OPTIMIZATION_LEVEL  "0x7FFEBFFF"
+#define DEFAULT_OPTIMIZATION_LEVEL  "0x7FFEFFFF"
 
 
 #define ZEND_DUMP_AFTER_PASS_1		ZEND_OPTIMIZER_PASS_1

ext/opcache/tests/const_inline_define.phpt

@@ -0,0 +1,42 @@
+--TEST--
+const and define() at file scope are inlined by the optimizer
+--EXTENSIONS--
+opcache
+--INI--
+opcache.enable_cli=1
+opcache.opt_debug_level=0x20000
+--FILE--
+<?php
+
+const CONST_VAL = 1;
+define('DEFINE_VAL', 2);
+
+function use_const() {
+    return CONST_VAL;
+}
+
+function use_define() {
+    return DEFINE_VAL;
+}
+
+?>
+--EXPECTF--
+$_main:
+     ; (lines=%d, args=%d, vars=%d, tmps=%d)
+     ; (after optimizer)
+     ; %s
+0000 DECLARE_CONST string("CONST_VAL") int(1)
+0001 DECLARE_CONST string("DEFINE_VAL") int(2)
+0002 RETURN int(1)
+
+use_const:
+     ; (lines=%d, args=%d, vars=%d, tmps=%d)
+     ; (after optimizer)
+     ; %s
+0000 RETURN int(1)
+
+use_define:
+     ; (lines=%d, args=%d, vars=%d, tmps=%d)
+     ; (after optimizer)
+     ; %s
+0000 RETURN int(2)

ext/opcache/tests/const_inline_global.phpt

@@ -0,0 +1,64 @@
+--TEST--
+Global and namespace const declarations are inlined by the optimizer
+--EXTENSIONS--
+opcache
+--INI--
+opcache.enable_cli=1
+opcache.opt_debug_level=0x20000
+--FILE--
+<?php
+
+const GLOBAL_CONST = 42;
+
+function use_global_const() {
+    return GLOBAL_CONST;
+}
+
+function use_global_const_fqn() {
+    return \GLOBAL_CONST;
+}
+
+class MyClass {
+    const CLASS_CONST = 99;
+
+    public function use_class_const() {
+        return self::CLASS_CONST;
+    }
+}
+
+function use_class_const_static() {
+    return MyClass::CLASS_CONST;
+}
+
+?>
+--EXPECTF--
+$_main:
+     ; (lines=%d, args=%d, vars=%d, tmps=%d)
+     ; (after optimizer)
+     ; %s
+0000 DECLARE_CONST string("GLOBAL_CONST") int(42)
+0001 RETURN int(1)
+
+use_global_const:
+     ; (lines=%d, args=%d, vars=%d, tmps=%d)
+     ; (after optimizer)
+     ; %s
+0000 RETURN int(42)
+
+use_global_const_fqn:
+     ; (lines=%d, args=%d, vars=%d, tmps=%d)
+     ; (after optimizer)
+     ; %s
+0000 RETURN int(42)
+
+use_class_const_static:
+     ; (lines=%d, args=%d, vars=%d, tmps=%d)
+     ; (after optimizer)
+     ; %s
+0000 RETURN int(99)
+
+MyClass::use_class_const:
+     ; (lines=%d, args=%d, vars=%d, tmps=%d)
+     ; (after optimizer)
+     ; %s
+0000 RETURN int(99)

ext/opcache/tests/const_inline_namespace.phpt

@@ -0,0 +1,41 @@
+--TEST--
+Namespace const declarations are inlined by the optimizer
+--EXTENSIONS--
+opcache
+--INI--
+opcache.enable_cli=1
+opcache.opt_debug_level=0x20000
+--FILE--
+<?php
+namespace MyNS;
+
+const NS_CONST = 100;
+
+function use_ns_const() {
+    return NS_CONST;
+}
+
+function use_ns_const_fqn() {
+    return \MyNS\NS_CONST;
+}
+
+?>
+--EXPECTF--
+$_main:
+     ; (lines=%d, args=%d, vars=%d, tmps=%d)
+     ; (after optimizer)
+     ; %s
+0000 DECLARE_CONST string("MyNS\\NS_CONST") int(100)
+0001 RETURN int(1)
+
+MyNS\use_ns_const:
+     ; (lines=%d, args=%d, vars=%d, tmps=%d)
+     ; (after optimizer)
+     ; %s
+0000 RETURN int(100)
+
+MyNS\use_ns_const_fqn:
+     ; (lines=%d, args=%d, vars=%d, tmps=%d)
+     ; (after optimizer)
+     ; %s
+0000 RETURN int(100)