Skip to content
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

Calculate array index offsets at compile time #2187

Merged
merged 1 commit into from
Oct 10, 2020
Merged

Calculate array index offsets at compile time #2187

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
63 changes: 28 additions & 35 deletions vyper/parser/parser_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,6 +525,19 @@ def pack_arguments(signature, args, context, stmt_expr, is_external_call):
)


def _make_array_index_setter(target, target_token, pos, location, offset):
if location == "memory" and isinstance(target.value, int):
offset = target.value + 32 * get_size_of_type(target.typ.subtype) * offset
return LLLnode.from_list([offset], typ=target.typ.subtype, location=location, pos=pos)
else:
return add_variable_offset(
target_token,
LLLnode.from_list(offset, typ="int128"),
pos=pos,
array_bounds_check=False,
)


# Create an x=y statement, where the types may be compound
@type_check_wrapper
def make_setter(left, right, location, pos, in_function_call=False):
Expand Down Expand Up @@ -561,20 +574,12 @@ def make_setter(left, right, location, pos, in_function_call=False):
if right.value == "multi":
subs = []
for i in range(left.typ.count):
subs.append(
make_setter(
add_variable_offset(
left_token,
LLLnode.from_list(i, typ="int128"),
pos=pos,
array_bounds_check=False,
),
right.args[i],
location,
pos=pos,
)
)
return LLLnode.from_list(["with", "_L", left, ["seq"] + subs], typ=None)
lhs_setter = _make_array_index_setter(left, left_token, pos, location, i)
subs.append(make_setter(lhs_setter, right.args[i], location, pos=pos,))
if left.location == "memory" and isinstance(left.value, int):
return LLLnode.from_list(["seq"] + subs, typ=None)
else:
return LLLnode.from_list(["with", "_L", left, ["seq"] + subs], typ=None)
elif right.value is None:
if right.typ != left.typ:
return
Expand Down Expand Up @@ -602,27 +607,15 @@ def make_setter(left, right, location, pos, in_function_call=False):
right_token = LLLnode.from_list("_R", typ=right.typ, location=right.location)
subs = []
for i in range(left.typ.count):
subs.append(
make_setter(
add_variable_offset(
left_token,
LLLnode.from_list(i, typ="int128"),
pos=pos,
array_bounds_check=False,
),
add_variable_offset(
right_token,
LLLnode.from_list(i, typ="int128"),
pos=pos,
array_bounds_check=False,
),
location,
pos=pos,
)
)
return LLLnode.from_list(
["with", "_L", left, ["with", "_R", right, ["seq"] + subs]], typ=None
)
lhs_setter = _make_array_index_setter(left, left_token, pos, left.location, i)
rhs_setter = _make_array_index_setter(right, right_token, pos, right.location, i)
subs.append(make_setter(lhs_setter, rhs_setter, location, pos=pos,))
lll_node = ["seq"] + subs
if right.location != "memory" or not isinstance(right.value, int):
lll_node = ["with", "_R", right, lll_node]
if left.location != "memory" or not isinstance(left.value, int):
lll_node = ["with", "_L", left, lll_node]
return LLLnode.from_list(lll_node, typ=None)
# Structs
elif isinstance(left.typ, TupleLike):
if left.value == "multi" and isinstance(left.typ, StructType):
Expand Down