Rearrange code to make cleanup code simpler

Author: Girgias

Zend/zend_vm_def.h

@@ -8829,7 +8829,6 @@ ZEND_VM_COLD_CONST_HANDLER(121, ZEND_STRLEN, CONST|TMP|CV, ANY)
 		strict = EX_USES_STRICT_TYPES();
 		do {
 			if (EXPECTED(!strict)) {
-				zend_string *str;
 				zval tmp;
 
 				if (UNEXPECTED(Z_TYPE_P(value) == IS_NULL)) {
@@ -8843,12 +8842,12 @@ ZEND_VM_COLD_CONST_HANDLER(121, ZEND_STRLEN, CONST|TMP|CV, ANY)
 				}
 
 				ZVAL_COPY(&tmp, value);
-				if ((str = zend_parse_arg_str_weak(&tmp, 1)) != NULL) {
+				zend_string *str = zend_parse_arg_str_weak(&tmp, 1);
+				zval_ptr_dtor(&tmp);
+				if (str) {
 					ZVAL_LONG(EX_VAR(opline->result.var), ZSTR_LEN(str));
-					zval_ptr_dtor(&tmp);
 					break;
 				}
-				zval_ptr_dtor(&tmp);
 			}
 			if (!EG(exception)) {
 				zend_type_error("strlen(): Argument #1 ($string) must be of type string, %s given", zend_zval_value_name(value));