Skip to content

py/emitnative.c: Fix STORE_ATTR when value is not a pyobj. #8888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

py/emitnative.c: Fix STORE_ATTR when value is not a pyobj. #8888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions py/emitnative.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1683,10 +1683,18 @@ STATIC void emit_native_store_global(emit_t *emit, qstr qst, int kind) {
}

STATIC void emit_native_store_attr(emit_t *emit, qstr qst) {
vtype_kind_t vtype_base, vtype_val;
emit_pre_pop_reg_reg(emit, &vtype_base, REG_ARG_1, &vtype_val, REG_ARG_3); // arg1 = base, arg3 = value
vtype_kind_t vtype_base;
vtype_kind_t vtype_val = peek_vtype(emit, 1);
if (vtype_val == VTYPE_PYOBJ) {
emit_pre_pop_reg_reg(emit, &vtype_base, REG_ARG_1, &vtype_val, REG_ARG_3); // arg1 = base, arg3 = value
} else {
emit_access_stack(emit, 2, &vtype_val, REG_ARG_1); // arg1 = value
emit_call_with_imm_arg(emit, MP_F_CONVERT_NATIVE_TO_OBJ, vtype_val, REG_ARG_2); // arg2 = type
ASM_MOV_REG_REG(emit->as, REG_ARG_3, REG_RET); // arg3 = value (converted)
emit_pre_pop_reg(emit, &vtype_base, REG_ARG_1); // arg1 = base
adjust_stack(emit, -1); // pop value
}
assert(vtype_base == VTYPE_PYOBJ);
assert(vtype_val == VTYPE_PYOBJ);
emit_call_with_qstr_arg(emit, MP_F_STORE_ATTR, qst, REG_ARG_2); // arg2 = attribute name
emit_post(emit);
}
Expand Down
25 changes: 25 additions & 0 deletions tests/micropython/viper_storeattr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# test storing an attribute with a value of different viper types


class X:
def __str__(self):
return "X"


x = X()


@micropython.viper
def a():
x.i0 = 0
x.i7 = 7
x.s = "hello"
x.o = x


a()

print(x.i0)
print(x.i7)
print(x.s)
print(x.o)
4 changes: 4 additions & 0 deletions tests/micropython/viper_storeattr.py.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
0
7
hello
X