Skip to content

Validate that index args are within bounds. #215

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.

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
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 15 additions & 2 deletions py/dml/codegen.py
Original file line number Diff line number Diff line change
Expand Up @@ -3770,6 +3770,14 @@ def codegen_method_func(func):
inline_scope.add(ExpressionSymbol(name, inlined_arg, method.site))
inp = [(n, t) for (n, t) in func.inp if isinstance(t, DMLType)]

if indices:
within_bounds = ' && '.join([
f'_idx{i} < {dimsize}'
for (i, dimsize) in enumerate(method.dimsizes)])
validate_indices = f'ASSERT({within_bounds});'
else:
validate_indices = None

with ErrorContext(method):
location = Location(method, indices)
if func.memoized:
Expand All @@ -3781,7 +3789,8 @@ def codegen_method_func(func):
method.site, inp, func.outp, func.throws, func.independent,
memoization, method.astcode,
method.default_method.default_sym(indices),
location, inline_scope, method.rbrace_site)
location, inline_scope, method.rbrace_site,
validate_indices)
return code

def codegen_return(site, outp, throws, retvals):
Expand Down Expand Up @@ -3814,7 +3823,7 @@ def codegen_return(site, outp, throws, retvals):
return mkCompound(site, stmts)

def codegen_method(site, inp, outp, throws, independent, memoization, ast,
default, location, fnscope, rbrace_site):
default, location, fnscope, rbrace_site, validate_indices=None):
with (crep.DeviceInstanceContext() if not independent
else contextlib.nullcontext()):
for (arg, etype) in inp:
Expand Down Expand Up @@ -3867,6 +3876,8 @@ def prelude():
code.append(mkAssignStatement(site, param, init))
else:
code = []
if validate_indices:
code.append(mkInline(site, validate_indices))

with fail_handler, exit_handler:
code.append(codegen_statement(ast, location, fnscope))
Expand All @@ -3882,6 +3893,8 @@ def prelude():
[subs] = ast.args
with fail_handler, exit_handler:
body = prelude()
if validate_indices:
body.append(mkInline(site, validate_indices))
body.extend(codegen_statements(subs, location, fnscope))
code = mkCompound(site, body)
if code.control_flow().fallthrough:
Expand Down
2 changes: 2 additions & 0 deletions py/dml/ctree.py
Original file line number Diff line number Diff line change
Expand Up @@ -4601,6 +4601,8 @@ def value(self):
def mkInlinedParam(site, expr, name, type):
if not defined(expr):
raise ICE(site, 'undefined parameter')
if isinstance(expr, InlinedParam):
expr = expr.expr
if isinstance(expr, IntegerConstant):
value = expr.value
type = realtype(type)
Expand Down
6 changes: 5 additions & 1 deletion test/1.4/expressions/T_inlined_param.dml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ inline method m(inline x, void *y) {
}
}

inline method m2(inline x, void *y) {
m(x, y);
}

method init() {
m(NULL, NULL);
m2(NULL, NULL);
}