[Opcache] Add Opcache\Jit attribute example

Author: beberlei

ext/opcache/jit/zend_jit.c

@@ -3135,20 +3135,8 @@ static int zend_jit_setup_hot_counters(zend_op_array *op_array)
 
 static int zend_needs_manual_jit(const zend_op_array *op_array)
 {
-	if (op_array->doc_comment) {
-		const char *s = ZSTR_VAL(op_array->doc_comment);
-		const char *p = strstr(s, "@jit");
-
-		if (p) {
-			size_t l = ZSTR_LEN(op_array->doc_comment);
-
-			if ((p == s + 3 || *(p-1) <= ' ') &&
-			    (p + 6 == s + l || *(p+4) <= ' ')) {
-				return 1;
-			}
-		}
-	}
-	return 0;
+	return op_array->attributes &&
+        zend_hash_str_exists(op_array->attributes, "opcache\\jit", sizeof("opcache\\jit")-1);
 }
 
 ZEND_EXT_API int zend_jit_op_array(zend_op_array *op_array, zend_script *script)
@@ -3190,7 +3178,7 @@ ZEND_EXT_API int zend_jit_op_array(zend_op_array *op_array, zend_script *script)
 		return zend_jit_setup_hot_counters(op_array);
 	} else if (zend_jit_trigger == ZEND_JIT_ON_SCRIPT_LOAD) {
 		return zend_real_jit_func(op_array, script, NULL);
-	} else if (zend_jit_trigger == ZEND_JIT_ON_DOC_COMMENT) {
+	} else if (zend_jit_trigger == ZEND_JIT_ON_ATTRIBUTE) {
 		if (zend_needs_manual_jit(op_array)) {
 			return zend_real_jit_func(op_array, script, NULL);
 		} else {
@@ -3231,9 +3219,9 @@ ZEND_EXT_API int zend_jit_script(zend_script *script)
 			}
 		}
 	} else if (zend_jit_trigger == ZEND_JIT_ON_SCRIPT_LOAD ||
-	           zend_jit_trigger == ZEND_JIT_ON_DOC_COMMENT) {
+	           zend_jit_trigger == ZEND_JIT_ON_ATTRIBUTE) {
 
-		if (zend_jit_trigger == ZEND_JIT_ON_DOC_COMMENT) {
+		if (zend_jit_trigger == ZEND_JIT_ON_ATTRIBUTE) {
 			int do_jit = 0;
 			for (i = 0; i < call_graph.op_arrays_count; i++) {
 				if (zend_needs_manual_jit(call_graph.op_arrays[i])) {
@@ -3266,7 +3254,7 @@ ZEND_EXT_API int zend_jit_script(zend_script *script)
 		}
 
 		for (i = 0; i < call_graph.op_arrays_count; i++) {
-			if (zend_jit_trigger == ZEND_JIT_ON_DOC_COMMENT &&
+			if (zend_jit_trigger == ZEND_JIT_ON_ATTRIBUTE &&
 			    !zend_needs_manual_jit(call_graph.op_arrays[i])) {
 				continue;
 			}
@@ -3281,7 +3269,7 @@ ZEND_EXT_API int zend_jit_script(zend_script *script)
 
 		if (ZCG(accel_directives).jit_debug & ZEND_JIT_DEBUG_SSA) {
 			for (i = 0; i < call_graph.op_arrays_count; i++) {
-				if (zend_jit_trigger == ZEND_JIT_ON_DOC_COMMENT &&
+				if (zend_jit_trigger == ZEND_JIT_ON_ATTRIBUTE &&
 				    !zend_needs_manual_jit(call_graph.op_arrays[i])) {
 					continue;
 				}
@@ -3293,7 +3281,7 @@ ZEND_EXT_API int zend_jit_script(zend_script *script)
 		}
 
 		for (i = 0; i < call_graph.op_arrays_count; i++) {
-			if (zend_jit_trigger == ZEND_JIT_ON_DOC_COMMENT &&
+			if (zend_jit_trigger == ZEND_JIT_ON_ATTRIBUTE &&
 			    !zend_needs_manual_jit(call_graph.op_arrays[i])) {
 				continue;
 			}
@@ -3428,9 +3416,25 @@ static int zend_jit_make_stubs(void)
 	return 1;
 }
 
+void zend_jit_validate_opcache_attribute(zval *attribute, int target)
+{
+	if (target != ZEND_ATTRIBUTE_TARGET_METHOD && target != ZEND_ATTRIBUTE_TARGET_FUNCTION) {
+		zend_error(E_COMPILE_ERROR, "<<Opcache\\Jit>> attribute can only be declared on methods or functions.");
+	}
+}
+
 ZEND_EXT_API int zend_jit_startup(zend_long jit, void *buf, size_t size, zend_bool reattached)
 {
 	int ret;
+	zend_class_entry ce;
+	zend_attributes_internal_validator cb;
+
+	INIT_NS_CLASS_ENTRY(ce, "Opcache\\Jit", NULL);
+	zend_ce_opcache_jit_attribute = zend_register_internal_class(&ce);
+	zend_ce_opcache_jit_attribute->ce_flags |= ZEND_ACC_FINAL;
+
+	cb = zend_jit_validate_opcache_attribute;
+	zend_compiler_attribute_register(zend_ce_opcache_jit_attribute, &cb);
 
 	zend_jit_level = ZEND_JIT_LEVEL(jit);
 	zend_jit_trigger = ZEND_JIT_TRIGGER(jit);

ext/opcache/jit/zend_jit.h

@@ -32,7 +32,7 @@
 #define ZEND_JIT_ON_FIRST_EXEC     1
 #define ZEND_JIT_ON_PROF_REQUEST   2     /* compile the most frequently caled on first request functions */
 #define ZEND_JIT_ON_HOT_COUNTERS   3     /* compile functions after N calls or loop iterations */
-#define ZEND_JIT_ON_DOC_COMMENT    4     /* compile functions with "@jit" tag in doc-comments */
+#define ZEND_JIT_ON_ATTRIBUTE      4     /* compile functions with "<<Opcache\Jit>>" attribute */
 
 #define ZEND_JIT_TRIGGER(n)        (((n) / 10) % 10)
 
@@ -106,4 +106,6 @@ struct _zend_lifetime_interval {
 	zend_lifetime_interval *list_next;
 };
 
+zend_class_entry *zend_ce_opcache_jit_attribute;
+
 #endif /* HAVE_JIT_H */