From d6d5072cc6f4d34b2d9ab592363b8cbc463d6354 Mon Sep 17 00:00:00 2001
From: Xu Jun <jun1.xu@intel.com>
Date: Mon, 5 Feb 2024 17:41:33 +0800
Subject: [PATCH] Fix locel.set in polymorphic stack (#3135)

The issue was reported in #3123.
---
 core/iwasm/interpreter/wasm_loader.c      | 2 +-
 core/iwasm/interpreter/wasm_mini_loader.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/iwasm/interpreter/wasm_loader.c b/core/iwasm/interpreter/wasm_loader.c
index 1bd3a392..8d4b6679 100644
--- a/core/iwasm/interpreter/wasm_loader.c
+++ b/core/iwasm/interpreter/wasm_loader.c
@@ -8906,7 +8906,6 @@ re_scan:
             {
                 p_org = p - 1;
                 GET_LOCAL_INDEX_TYPE_AND_OFFSET();
-                POP_TYPE(local_type);
 
 #if WASM_ENABLE_FAST_INTERP != 0
                 if (!(preserve_referenced_local(
@@ -8963,6 +8962,7 @@ re_scan:
                 }
 #endif
 #endif /* end of WASM_ENABLE_FAST_INTERP != 0 */
+                POP_TYPE(local_type);
                 break;
             }
 
diff --git a/core/iwasm/interpreter/wasm_mini_loader.c b/core/iwasm/interpreter/wasm_mini_loader.c
index 6b46ae41..c78da88e 100644
--- a/core/iwasm/interpreter/wasm_mini_loader.c
+++ b/core/iwasm/interpreter/wasm_mini_loader.c
@@ -6594,7 +6594,6 @@ re_scan:
             {
                 p_org = p - 1;
                 GET_LOCAL_INDEX_TYPE_AND_OFFSET();
-                POP_TYPE(local_type);
 
 #if WASM_ENABLE_FAST_INTERP != 0
                 if (!(preserve_referenced_local(
@@ -6648,6 +6647,7 @@ re_scan:
                 }
 #endif
 #endif
+                POP_TYPE(local_type);
                 break;
             }