Merge branch 'PHP-8.1'

dstogov · dstogov · commit a9c2dcd80ff7 · 2021-12-03T13:53:11.000+03:00
* PHP-8.1:
  Add missing "return"
diff --git a/ext/opcache/jit/zend_jit_helpers.c b/ext/opcache/jit/zend_jit_helpers.c
@@ -1241,6 +1241,7 @@ static void ZEND_FASTCALL zend_jit_assign_dim_helper(zval *object_ptr, zval *dim
 				ZVAL_UNDEF(result);
 			}
 		}
+		return;
 	} else if (EXPECTED(Z_TYPE_P(object_ptr) == IS_STRING) && EXPECTED(dim != NULL)) {
 		zend_assign_to_string_offset(object_ptr, dim, value, result);
 		return;

Original file line number	Diff line number	Diff line change
`@@ -1241,6 +1241,7 @@ static void ZEND_FASTCALL zend_jit_assign_dim_helper(zval object_ptr, zval dim`
`1241`	`1241`	`ZVAL_UNDEF(result);`
`1242`	`1242`	`}`
`1243`	`1243`	`}`
	`1244`	`+ return;`
`1244`	`1245`	`} else if (EXPECTED(Z_TYPE_P(object_ptr) == IS_STRING) && EXPECTED(dim != NULL)) {`
`1245`	`1246`	`zend_assign_to_string_offset(object_ptr, dim, value, result);`
`1246`	`1247`	`return;`