Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[mypyc] Coerce Register assignments #11176

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

Merged
JukkaL merged 1 commit into from
Sep 22, 2021
Merged

[mypyc] Coerce Register assignments #11176

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
4 changes: 2 additions & 2 deletions mypyc/ir/rtypes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,11 +522,11 @@ def deserialize(cls, data: JsonDict, ctx: 'DeserMaps') -> 'RTuple':
# Dictionary iterator tuple: (should continue, internal offset, key, value)
# See mypyc.irbuild.for_helpers.ForDictionaryCommon for more details.
dict_next_rtuple_pair = RTuple(
[bool_rprimitive, int_rprimitive, object_rprimitive, object_rprimitive]
[bool_rprimitive, short_int_rprimitive, object_rprimitive, object_rprimitive]
)
# Same as above but just for key or value.
dict_next_rtuple_single = RTuple(
[bool_rprimitive, int_rprimitive, object_rprimitive]
[bool_rprimitive, short_int_rprimitive, object_rprimitive]
)


Expand Down
2 changes: 1 addition & 1 deletion mypyc/irbuild/builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,7 @@ def assign(self,
rvalue_reg: Value,
line: int) -> None:
if isinstance(target, Register):
self.add(Assign(target, rvalue_reg))
self.add(Assign(target, self.coerce(rvalue_reg, target.type, line)))
elif isinstance(target, AssignmentTargetRegister):
rvalue_reg = self.coerce(rvalue_reg, target.type, line)
self.add(Assign(target.register, rvalue_reg))
Expand Down
12 changes: 6 additions & 6 deletions mypyc/test-data/irbuild-dict.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,8 @@ def increment(d):
r1 :: native_int
r2 :: short_int
r3 :: object
r4 :: tuple[bool, int, object]
r5 :: int
r4 :: tuple[bool, short_int, object]
r5 :: short_int
r6 :: bool
r7 :: object
r8, k :: str
Expand Down Expand Up @@ -232,8 +232,8 @@ def print_dict_methods(d1, d2):
r1 :: native_int
r2 :: short_int
r3 :: object
r4 :: tuple[bool, int, object]
r5 :: int
r4 :: tuple[bool, short_int, object]
r5 :: short_int
r6 :: bool
r7 :: object
r8, v :: int
Expand All @@ -246,8 +246,8 @@ def print_dict_methods(d1, d2):
r16 :: native_int
r17 :: short_int
r18 :: object
r19 :: tuple[bool, int, object, object]
r20 :: int
r19 :: tuple[bool, short_int, object, object]
r20 :: short_int
r21 :: bool
r22, r23 :: object
r24, r25, k :: int
Expand Down
46 changes: 46 additions & 0 deletions mypyc/test-data/irbuild-lists.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,3 +381,49 @@ L7:
L8:
b = r16
return 1
[case testGeneratorNext]
from typing import List, Optional

def test(x: List[int]) -> None:
res = next((i for i in x), None)
[out]
def test(x):
x :: list
r0 :: short_int
r1 :: ptr
r2 :: native_int
r3 :: short_int
r4 :: bit
r5 :: object
r6, i :: int
r7 :: object
r8 :: union[int, None]
r9 :: short_int
r10 :: object
res :: union[int, None]
L0:
r0 = 0
L1:
r1 = get_element_ptr x ob_size :: PyVarObject
r2 = load_mem r1 :: native_int*
keep_alive x
r3 = r2 << 1
r4 = r0 < r3 :: signed
if r4 goto L2 else goto L4 :: bool
L2:
r5 = CPyList_GetItemUnsafe(x, r0)
r6 = unbox(int, r5)
i = r6
r7 = box(int, i)
r8 = r7
goto L5
L3:
r9 = r0 + 2
r0 = r9
goto L1
L4:
r10 = box(None, 1)
r8 = r10
L5:
res = r8
return 1
4 changes: 2 additions & 2 deletions mypyc/test-data/irbuild-set.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,8 @@ def test3():
r9 :: native_int
r10 :: short_int
r11 :: object
r12 :: tuple[bool, int, object]
r13 :: int
r12 :: tuple[bool, short_int, object]
r13 :: short_int
r14 :: bool
r15 :: object
r16, x, r17 :: int
Expand Down
8 changes: 4 additions & 4 deletions mypyc/test-data/irbuild-statements.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,8 +342,8 @@ def f(d):
r1 :: native_int
r2 :: short_int
r3 :: object
r4 :: tuple[bool, int, object]
r5 :: int
r4 :: tuple[bool, short_int, object]
r5 :: short_int
r6 :: bool
r7 :: object
r8, key :: int
Expand Down Expand Up @@ -394,8 +394,8 @@ def sum_over_even_values(d):
r1 :: native_int
r2 :: short_int
r3 :: object
r4 :: tuple[bool, int, object]
r5 :: int
r4 :: tuple[bool, short_int, object]
r5 :: short_int
r6 :: bool
r7 :: object
r8, key :: int
Expand Down
4 changes: 2 additions & 2 deletions mypyc/test-data/refcount.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,8 +724,8 @@ def f(d):
r1 :: native_int
r2 :: short_int
r3 :: object
r4 :: tuple[bool, int, object]
r5 :: int
r4 :: tuple[bool, short_int, object]
r5 :: short_int
r6 :: bool
r7 :: object
r8, key :: int
Expand Down
4 changes: 4 additions & 0 deletions mypyc/test-data/run-lists.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,4 +379,8 @@ def test() -> None:
source_str = "abcd"
f = list("str:" + x for x in source_str)
assert f == ["str:a", "str:b", "str:c", "str:d"]
[case testNextBug]
from typing import List, Optional

def test(x: List[int]) -> None:
res = next((i for i in x), None)