Store JIT/non-JIT regex in a different PCRE cache slot

Author: mvorisek

ext/pcre/php_pcre.c

@@ -612,20 +612,31 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache_ex(zend_string *regex, in
 	pcre_cache_entry	*ret;
 
 	if (locale_aware && BG(ctype_string)) {
-		key = zend_string_concat2(
+		key = zend_string_concat3(
 			ZSTR_VAL(BG(ctype_string)), ZSTR_LEN(BG(ctype_string)),
-			ZSTR_VAL(regex), ZSTR_LEN(regex));
+			ZSTR_VAL(regex), ZSTR_LEN(regex),
+#ifdef HAVE_PCRE_JIT_SUPPORT
+            PCRE_G(jit) ? "1" : "0", 1
+#else
+            "0", 1
+#endif
+        );
 	} else {
-		key = regex;
+		key = zend_string_concat2(
+			ZSTR_VAL(regex), ZSTR_LEN(regex),
+#ifdef HAVE_PCRE_JIT_SUPPORT
+            PCRE_G(jit) ? "1" : "0", 1
+#else
+            "0", 1
+#endif
+        );
 	}
 
 	/* Try to lookup the cached regex entry, and if successful, just pass
 	   back the compiled pattern, otherwise go on and compile it. */
 	zv = zend_hash_find(&PCRE_G(pcre_cache), key);
 	if (zv) {
-		if (key != regex) {
-			zend_string_release_ex(key, 0);
-		}
+        zend_string_release_ex(key, 0);
 		return (pcre_cache_entry*)Z_PTR_P(zv);
 	}
 
@@ -636,9 +647,7 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache_ex(zend_string *regex, in
 	   get to the end without encountering a delimiter. */
 	while (isspace((int)*(unsigned char *)p)) p++;
 	if (p >= end_p) {
-		if (key != regex) {
-			zend_string_release_ex(key, 0);
-		}
+        zend_string_release_ex(key, 0);
 		php_error_docref(NULL, E_WARNING, "Empty regular expression");
 		pcre_handle_exec_error(PCRE2_ERROR_INTERNAL);
 		return NULL;
@@ -648,9 +657,7 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache_ex(zend_string *regex, in
 	   or a backslash. */
 	delimiter = *p++;
 	if (isalnum((int)*(unsigned char *)&delimiter) || delimiter == '\\' || delimiter == '\0') {
-		if (key != regex) {
-			zend_string_release_ex(key, 0);
-		}
+        zend_string_release_ex(key, 0);
 		php_error_docref(NULL, E_WARNING, "Delimiter must not be alphanumeric, backslash, or NUL");
 		pcre_handle_exec_error(PCRE2_ERROR_INTERNAL);
 		return NULL;
@@ -691,9 +698,7 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache_ex(zend_string *regex, in
 	}
 
 	if (pp >= end_p) {
-		if (key != regex) {
-			zend_string_release_ex(key, 0);
-		}
+        zend_string_release_ex(key, 0);
 		if (start_delimiter == end_delimiter) {
 			php_error_docref(NULL,E_WARNING, "No ending delimiter '%c' found", delimiter);
 		} else {
@@ -753,9 +758,7 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache_ex(zend_string *regex, in
 				}
 				pcre_handle_exec_error(PCRE2_ERROR_INTERNAL);
 				efree(pattern);
-				if (key != regex) {
-					zend_string_release_ex(key, 0);
-				}
+                zend_string_release_ex(key, 0);
 				return NULL;
 		}
 	}
@@ -764,13 +767,11 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache_ex(zend_string *regex, in
 		php_error_docref(NULL, E_WARNING, "The /e modifier is no longer supported, use preg_replace_callback instead");
 		pcre_handle_exec_error(PCRE2_ERROR_INTERNAL);
 		efree(pattern);
-		if (key != regex) {
-			zend_string_release_ex(key, 0);
-		}
+        zend_string_release_ex(key, 0);
 		return NULL;
 	}
 
-	if (key != regex) {
+	if (locale_aware && BG(ctype_string)) {
 		tables = (uint8_t *)zend_hash_find_ptr(&char_tables, BG(ctype_string));
 		if (!tables) {
 			zend_string *_k;
@@ -794,9 +795,7 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache_ex(zend_string *regex, in
 	re = pcre2_compile((PCRE2_SPTR)pattern, pattern_len, coptions, &errnumber, &erroffset, cctx);
 
 	if (re == NULL) {
-		if (key != regex) {
-			zend_string_release_ex(key, 0);
-		}
+        zend_string_release_ex(key, 0);
 		pcre2_get_error_message(errnumber, error, sizeof(error));
 		php_error_docref(NULL,E_WARNING, "Compilation failed: %s at offset %zu", error, erroffset);
 		pcre_handle_exec_error(PCRE2_ERROR_INTERNAL);
@@ -846,19 +845,15 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache_ex(zend_string *regex, in
 
 	rc = pcre2_pattern_info(re, PCRE2_INFO_CAPTURECOUNT, &new_entry.capture_count);
 	if (rc < 0) {
-		if (key != regex) {
-			zend_string_release_ex(key, 0);
-		}
+        zend_string_release_ex(key, 0);
 		php_error_docref(NULL, E_WARNING, "Internal pcre2_pattern_info() error %d", rc);
 		pcre_handle_exec_error(PCRE2_ERROR_INTERNAL);
 		return NULL;
 	}
 
 	rc = pcre2_pattern_info(re, PCRE2_INFO_NAMECOUNT, &new_entry.name_count);
 	if (rc < 0) {
-		if (key != regex) {
-			zend_string_release_ex(key, 0);
-		}
+        zend_string_release_ex(key, 0);
 		php_error_docref(NULL, E_WARNING, "Internal pcre_pattern_info() error %d", rc);
 		pcre_handle_exec_error(PCRE2_ERROR_INTERNAL);
 		return NULL;
@@ -882,9 +877,7 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache_ex(zend_string *regex, in
 		ret = zend_hash_add_new_mem(&PCRE_G(pcre_cache), key, &new_entry, sizeof(pcre_cache_entry));
 	}
 
-	if (key != regex) {
-		zend_string_release_ex(key, 0);
-	}
+    zend_string_release_ex(key, 0);
 
 	return ret;
 }