Skip to content

refactor(gnovm): inline make varg type enforcement, remove isBuiltinMake flag #3

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
ltzmaxwell merged 1 commit into from
Mar 31, 2026
Merged

refactor(gnovm): inline make varg type enforcement, remove isBuiltinMake flag #3

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
28 changes: 11 additions & 17 deletions gnovm/pkg/gnolang/preprocess.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1714,7 +1714,6 @@ func preprocess1(store Store, ctx BlockNode, n Node) Node {
// LEAVE (FUNC) CALL EXPR SPECIAL CASES:
//----------------------------------------

isBuiltinMake := false
// NOTE: these appear to be actually special cases in go.
// In general, a string is not assignable to []bytes
// without conversion.
Expand Down Expand Up @@ -1775,7 +1774,16 @@ func preprocess1(store Store, ctx BlockNode, n Node) Node {
}
}
case "make":
isBuiltinMake = true
// make's variadic params are declared as Vrd(AnyT()), so untyped
// constants won't be automatically coerced to int; enforce it here.
for i := range n.Args[1:] {
at := evalStaticTypeOf(store, last, n.Args[i+1])
if isUntyped(at) {
checkOrConvertType(store, last, n, &n.Args[i+1], IntType)
} else if !isInteger(at) {
panic(fmt.Sprintf("invalid argument: index %v (variable of type %v) must be integer", n.Args[i+1], at))
}
}
case "_cross_gno0p0":
if ctxpn.GetAttribute(ATTR_FIX_FROM) == GnoVerMissing {
// This is only backwards compatibility for the gno 0.9
Expand Down Expand Up @@ -2017,21 +2025,7 @@ func preprocess1(store Store, ctx BlockNode, n Node) Node {
}
checkOrConvertType(store, last, n, &n.Args[i], spts[i].Type)
} else {
expectedType := spts[len(spts)-1].Type.Elem()

// SPECIAL CASE: 'make' variadic arguments are untyped sizes
// that must default to 'int' if no type is explicitly provided.
if isBuiltinMake {
at := evalStaticTypeOf(store, last, n.Args[i])
switch {
case isUntyped(at):
expectedType = IntType
case !isInteger(at):
panic(fmt.Sprintf("invalid argument: index %v (variable of type %v) must be integer", n.Args[i], at))
}
}

checkOrConvertType(store, last, n, &n.Args[i], expectedType)
checkOrConvertType(store, last, n, &n.Args[i], spts[len(spts)-1].Type.Elem())
}
} else {
checkOrConvertType(store, last, n, &n.Args[i], spts[i].Type)
Expand Down
Loading