fix for of compiler error

Signed-off-by: Su Yihan <[email protected]>
web-devkits · Oct 23, 2023 · fb67710 · fb67710
1 parent 672f94d
commit fb67710
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 3 deletions.
diff --git a/runtime-library/libdyntype/extref/extref.c b/runtime-library/libdyntype/extref/extref.c
@@ -313,7 +313,6 @@ extref_get_keys(dyn_ctx_t ctx, dyn_value_t obj)
                     create_wasm_string(exec_env, prop_name_list[i]);
                 str = dynamic_new_string(
                     ctx, wasm_stringref_obj_get_value(sringref_obj));
-                /* TODO: free stringref_obj */
 #else
                 str = dynamic_new_string(ctx, prop_name_list[i],
                                          strlen(prop_name_list[i]));

diff --git a/runtime-library/libdyntype/libdyntype.c b/runtime-library/libdyntype/libdyntype.c
@@ -278,6 +278,19 @@ dyn_value_t dyntype_get_keys(dyn_ctx_t ctx, dyn_value_t obj)
                          dyntype_get_elem(ctx, dynamic_arr, i));
     }
 
+    if (extref_arr) {
+        for (i = 0; i < extref_arr_len; i++) {
+            dyntype_release(ctx, dyntype_get_elem(ctx, extref_arr, i));
+        }
+        dyntype_release(ctx, extref_arr);
+    }
+    if (dynamic_arr) {
+        for (i = 0; i < dynamic_arr_len; i++) {
+            dyntype_release(ctx, dyntype_get_elem(ctx, dynamic_arr, i));
+        }
+        dyntype_release(ctx, dynamic_arr);
+    }
+
     return total_arr;
 }
 

diff --git a/src/backend/binaryen/utils.ts b/src/backend/binaryen/utils.ts
@@ -657,6 +657,9 @@ export namespace FunctionalFuncs {
             case binaryen.i64: {
                 return module.f64.convert_u.i64(expression);
             }
+            case binaryen.f64: {
+                return expression;
+            }
         }
         return binaryen.none;
     }

diff --git a/src/backend/binaryen/wasm_expr_gen.ts b/src/backend/binaryen/wasm_expr_gen.ts
@@ -3637,7 +3637,7 @@ export class WASMExpressionGen {
             }
             case ValueTypeKind.STRING: {
                 const ownerRef = this.wasmExprGen(owner);
-                const idxRef = FunctionalFuncs.convertTypeToF64(
+                const idxF64Ref = FunctionalFuncs.convertTypeToF64(
                     this.module,
                     this.wasmExprGen(value.index),
                 );
@@ -3666,7 +3666,7 @@ export class WASMExpressionGen {
                 );
                 return this.module.call(
                     getBuiltInFuncName(BuiltinNames.stringcharAtFuncName),
-                    [context, ownerRef, idxRef],
+                    [context, ownerRef, idxF64Ref],
                     stringTypeInfo.typeRef,
                 );
             }

diff --git a/tests/samples/for_in.ts b/tests/samples/for_in.ts
@@ -56,3 +56,40 @@ export function infc_obj_set_method() {
     }
 }
 */
+
+class A {
+    a = 1;
+    b = 2;
+}
+
+export function extref_obj() {
+    const obj: any = new A();
+    for (const key in obj) {
+        const value = obj[key];
+        console.log(value);
+        obj[key] = 88;
+        console.log(obj[key]);
+    }
+}
+
+export function dynamic_obj() {
+    const obj: any = {a: 1, b: 2};
+    for (const key in obj) {
+        const value = obj[key];
+        console.log(value);
+        obj[key] = 88;
+        console.log(obj[key]);
+    }
+}
+
+export function mix_obj() {
+    const a = new A();
+    const obj: any = a;
+    obj['c'] = 3;
+    for (const key in obj) {
+        const value = obj[key];
+        console.log(value);
+        obj[key] = 88;
+        console.log(obj[key]);
+    }
+}