Sync JIT zend_check_string_offset()

nikic · nikic · commit a190c7fdb7cb · 2021-07-21T10:32:45.000+02:00
Return after zend_jit_illegal_string_offset() to avoid a redundant
warning during conversion.

This fixes some tests under PROFITABILITY_CHECKS=0.
diff --git a/ext/opcache/jit/zend_jit_helpers.c b/ext/opcache/jit/zend_jit_helpers.c
@@ -689,7 +689,7 @@ static zend_never_inline zend_long zend_check_string_offset(zval *dim/*, int typ
 				return offset;
 			}
 			zend_jit_illegal_string_offset(dim);
-			break;
+			return 0;
 		}
 		case IS_UNDEF:
 			zend_jit_undefined_op_helper(EG(current_execute_data)->opline->op2.var);
@@ -705,7 +705,7 @@ static zend_never_inline zend_long zend_check_string_offset(zval *dim/*, int typ
 			goto try_again;
 		default:
 			zend_jit_illegal_string_offset(dim);
-			break;
+			return 0;
 	}
 
 	return zval_get_long_func(dim, /* is_strict */ false);

Original file line number	Diff line number	Diff line change
`@@ -689,7 +689,7 @@ static zend_never_inline zend_long zend_check_string_offset(zval dim/, int typ`
`689`	`689`	`return offset;`
`690`	`690`	`}`
`691`	`691`	`zend_jit_illegal_string_offset(dim);`
`692`		`- break;`
	`692`	`+ return 0;`
`693`	`693`	`}`
`694`	`694`	`case IS_UNDEF:`
`695`	`695`	`zend_jit_undefined_op_helper(EG(current_execute_data)->opline->op2.var);`
`@@ -705,7 +705,7 @@ static zend_never_inline zend_long zend_check_string_offset(zval dim/, int typ`
`705`	`705`	`goto try_again;`
`706`	`706`	`default:`
`707`	`707`	`zend_jit_illegal_string_offset(dim);`
`708`		`- break;`
	`708`	`+ return 0;`
`709`	`709`	`}`
`710`	`710`
`711`	`711`	`return zval_get_long_func(dim, /* is_strict */ false);`