Merged the if-else conditions

Author: Septa2112

core/iwasm/interpreter/wasm_loader.c

@@ -843,6 +843,7 @@ load_init_expr(WASMModule *module, const uint8 **p_buf, const uint8 *buf_end,
 #else
                 int32 heap_type;
                 read_leb_int32(p, p_end, heap_type);
+                cur_value.gc_obj = NULL_REF;
 
                 if (heap_type >= 0) {
                     if (!check_type_index(module, module->type_count, heap_type,
@@ -852,27 +853,39 @@ load_init_expr(WASMModule *module, const uint8 **p_buf, const uint8 *buf_end,
                     wasm_set_refheaptype_typeidx(&cur_ref_type.ref_ht_typeidx,
                                                  true, heap_type);
                     type1 = cur_ref_type.ref_type;
+
+                    if (!is_byte_a_type(type1)
+                        || wasm_is_type_multi_byte_type(type1)) {
+                        if (!push_const_expr_stack(&const_expr_ctx, flag,
+                                                   cur_ref_type.ref_type,
+                                                   &cur_ref_type, 0, &cur_value,
+                                                   error_buf, error_buf_size))
+                            goto fail;
+                    }
+                    else {
+                        if (!push_const_expr_stack(&const_expr_ctx, flag, type1,
+                                                   NULL, 0, &cur_value,
+                                                   error_buf, error_buf_size))
+                            goto fail;
+                    }
                 }
                 else {
                     if (!wasm_is_valid_heap_type(heap_type)) {
                         set_error_buf_v(error_buf, error_buf_size,
                                         "unknown type %d", heap_type);
                         goto fail;
                     }
+                    /*
+                     * When heap_type < 0 and wasm_is_valid_heap_type(heap_type)
+                     * is true, under the current implementation, the condition
+                     * (!is_byte_a_type(type1) ||
+                     * wasm_is_type_multi_byte_type(type1)) will always be
+                     * false, so there is no need to check_type_index here. If
+                     * the implementation changes in the future, this check may
+                     * be needed.
+                     */
                     type1 = (uint8)((int32)0x80 + heap_type);
-                }
-
-                cur_value.gc_obj = NULL_REF;
 
-                if (!is_byte_a_type(type1)
-                    || wasm_is_type_multi_byte_type(type1)) {
-                    if (!push_const_expr_stack(&const_expr_ctx, flag,
-                                               cur_ref_type.ref_type,
-                                               &cur_ref_type, 0, &cur_value,
-                                               error_buf, error_buf_size))
-                        goto fail;
-                }
-                else {
                     if (!push_const_expr_stack(&const_expr_ctx, flag, type1,
                                                NULL, 0, &cur_value, error_buf,
                                                error_buf_size))