tweak

ndossche · ndossche · commit 81efe6bcb8bf · 2025-02-05T23:36:08.000+01:00
diff --git a/ext/json/json_encoder.c b/ext/json/json_encoder.c
@@ -586,12 +586,12 @@ zend_result php_json_escape_string(
 
 			int input_range_mask = _mm_movemask_epi8(input_range);
 			if (input_range_mask != 0) {
-				max_shift = zend_ulong_ntz(input_range_mask);
-				if (UNEXPECTED(max_shift <= 1)) {
+				if (UNEXPECTED(input_range_mask & 1)) {
 					/* not worth it */
 					us = (unsigned char)s[pos];
 					goto fallback;
 				}
+				max_shift = zend_ulong_ntz(input_range_mask);
 			}
 
 #ifdef ZEND_INTRIN_SSE4_2_NATIVE

Original file line number	Diff line number	Diff line change
`@@ -586,12 +586,12 @@ zend_result php_json_escape_string(`
`586`	`586`
`587`	`587`	`int input_range_mask = _mm_movemask_epi8(input_range);`
`588`	`588`	`if (input_range_mask != 0) {`
`589`		`- max_shift = zend_ulong_ntz(input_range_mask);`
`590`		`- if (UNEXPECTED(max_shift <= 1)) {`
	`589`	`+ if (UNEXPECTED(input_range_mask & 1)) {`
`591`	`590`	`/* not worth it */`
`592`	`591`	`us = (unsigned char)s[pos];`
`593`	`592`	`goto fallback;`
`594`	`593`	`}`
	`594`	`+ max_shift = zend_ulong_ntz(input_range_mask);`
`595`	`595`	`}`
`596`	`596`
`597`	`597`	`#ifdef ZEND_INTRIN_SSE4_2_NATIVE`