fixes for review

Author: Lukasdoe

core/iwasm/compilation/aot_emit_control.c

@@ -279,7 +279,7 @@ aot_emit_branch_hint(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx,
         hint = hint->next;
     }
     if (hint != NULL) {
-        ((struct WASMCompilationHintBranchHint *)hint)->used = true;
+        hint->used = true;
         // same weight llvm MDBuilder::createLikelyBranchWeights assigns
         const uint32_t likely_weight = (1U << 20) - 1;
         const uint32_t unlikely_weight = 1;

core/iwasm/compilation/aot_emit_function.c

@@ -120,8 +120,7 @@ aot_emit_call_target_hint(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx,
     struct WASMCompilationHint *hint = func_ctx->function_hints;
     while (hint != NULL) {
         if (hint->type == WASM_COMPILATION_HINT_CALL_TARGETS
-            && ((struct WASMCompilationHintCallTargets *)hint)->offset
-                   == offset) {
+            && hint->offset == offset) {
             break;
         }
         hint = hint->next;

core/iwasm/interpreter/wasm.h

@@ -778,25 +778,15 @@ struct WASMCompilationHint {
     bool used;
 };
 struct WASMCompilationHintBranchHint {
-    struct WASMCompilationHint *next;
-    enum WASMCompilationHintType type;
-    uint32 offset;
-    bool used;
-
-    // custom field
+    struct WASMCompilationHint common;
     bool is_likely;
 };
 struct WASMCompilationHintCallTargetsHint {
     uint32 func_idx;
     uint32 call_frequency;
 };
 struct WASMCompilationHintCallTargets {
-    struct WASMCompilationHint *next;
-    enum WASMCompilationHintType type;
-    uint32 offset;
-    bool used;
-
-    // custom fields
+    struct WASMCompilationHint common;
     size_t target_count;
     struct WASMCompilationHintCallTargetsHint *hints;
 };

core/iwasm/interpreter/wasm_loader.c

@@ -5648,7 +5648,7 @@ handle_compilation_hint_branch_hint_processor(const uint8 *buf,
 {
     (void)module;
     struct WASMCompilationHintBranchHint *hint = hint_store;
-    hint->type = WASM_COMPILATION_HINT_BRANCH;
+    hint->common.type = WASM_COMPILATION_HINT_BRANCH;
     if (hint_size != 1) {
         set_error_buf_v(error_buf, error_buf_size,
                         "invalid branch hint size, expected 1, got %d.",
@@ -5671,6 +5671,7 @@ handle_compilation_hint_branch_hint_processor(const uint8 *buf,
 fail:
     return false;
 }
+
 static bool
 handle_branch_hint_section(const uint8 *buf, const uint8 *buf_end,
                            WASMModule *module, char *error_buf,
@@ -5691,7 +5692,7 @@ handle_compilation_hint_call_targets_processor(
     WASMModule *module)
 {
     struct WASMCompilationHintCallTargets *hint = hint_store;
-    hint->type = WASM_COMPILATION_HINT_CALL_TARGETS;
+    hint->common.type = WASM_COMPILATION_HINT_CALL_TARGETS;
     CHECK_BUF(buf, buf_end, hint_size);
     hint->target_count = 0;
 
@@ -7634,8 +7635,8 @@ wasm_loader_unload(WASMModule *module)
             struct WASMCompilationHint *last_chain_start = curr;
             while (curr != NULL) {
                 if (!curr->used) {
-                    printf("Unused hint for function %u, offset: %x\n",
-                           i + module->import_count, curr->offset);
+                    LOG_WARNING("Unused hint for function %u, offset: %x\n",
+                                i + module->import_count, curr->offset);
                 }
                 if (curr->type != last_chain_start->type) {
                     // we switched chains -> deallocate previous chain and reset