Merge pull request #279 from ichiban/make-slice

respect debug.SetMemoryLimit() when allocate a slice.
ichiban · Dec 31, 2022 · 983a67f · 983a67f
2 parents ff2a162 + 3011ae4
commit 983a67f
Show file tree

Hide file tree

Showing 7 changed files with 200 additions and 21 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.18
+        go-version: 1.19
 
     - name: Build
       run: go build -v ./...

diff --git a/engine/atom.go b/engine/atom.go
@@ -124,6 +124,7 @@ var (
 	atomMax                     = NewAtom("max")
 	atomMaxArity                = NewAtom("max_arity")
 	atomMaxInteger              = NewAtom("max_integer")
+	atomMemory                  = NewAtom("memory")
 	atomMin                     = NewAtom("min")
 	atomMinInteger              = NewAtom("min_integer")
 	atomMod                     = NewAtom("mod")

diff --git a/engine/builtin.go b/engine/builtin.go
@@ -41,7 +41,10 @@ func Call(vm *VM, goal Term, k Cont, env *Env) *Promise {
 		return Error(instantiationError(env))
 	default:
 		fvs := env.freeVariables(g)
-		args := make([]Term, len(fvs))
+		args, err := makeSlice[Term](len(fvs))
+		if err != nil {
+			return Error(resourceError(resourceMemory, env))
+		}
 		for i, fv := range fvs {
 			args[i] = fv
 		}
@@ -95,7 +98,11 @@ func callN(vm *VM, closure Term, additional []Term, k Cont, env *Env) *Promise {
 	if err != nil {
 		return Error(err)
 	}
-	args := make([]Term, pi.arity, int(pi.arity)+len(additional))
+	args, err := makeSlice[Term](int(pi.arity) + len(additional))
+	if err != nil {
+		return Error(resourceError(resourceMemory, env))
+	}
+	args = args[:pi.arity]
 	for i := 0; i < int(pi.arity); i++ {
 		args[i] = arg(i)
 	}
@@ -276,7 +283,10 @@ func Functor(vm *VM, t, name, arity Term, k Cont, env *Env) *Promise {
 				return Error(typeError(validTypeAtom, name, env))
 			}
 
-			vs := make([]Term, arity)
+			vs, err := makeSlice[Term](int(arity))
+			if err != nil {
+				return Error(resourceError(resourceMemory, env))
+			}
 			for i := range vs {
 				vs[i] = NewVariable()
 			}
@@ -404,9 +414,13 @@ func renamedCopy(t Term, copied map[termID]Term, env *Env) Term {
 		p.tail = &tail
 		return &p
 	case Compound:
+		args, err := makeSlice[Term](t.Arity())
+		if err != nil {
+			return resourceError(resourceMemory, env)
+		}
 		c := compound{
 			functor: t.Functor(),
-			args:    make([]Term, t.Arity()),
+			args:    args,
 		}
 		copied[id(t)] = &c
 		for i := 0; i < t.Arity(); i++ {
@@ -435,7 +449,10 @@ func TermVariables(vm *VM, term, vars Term, k Cont, env *Env) *Promise {
 			}
 			witness[t] = struct{}{}
 		case Compound:
-			args := make([]Term, t.Arity())
+			args, err := makeSlice[Term](t.Arity())
+			if err != nil {
+				return Error(resourceError(resourceMemory, env))
+			}
 			for i := 0; i < t.Arity(); i++ {
 				args[i] = t.Arg(i)
 			}
@@ -697,7 +714,11 @@ func SetOf(vm *VM, template, goal, instances Term, k Cont, env *Env) *Promise {
 
 func collectionOf(vm *VM, agg func([]Term, *Env) Term, template, goal, instances Term, k Cont, env *Env) *Promise {
 	fvs := newFreeVariablesSet(goal, template, env)
-	w := make([]Term, 0, len(fvs))
+	w, err := makeSlice[Term](len(fvs))
+	if err != nil {
+		return Error(resourceError(resourceMemory, env))
+	}
+	w = w[:0]
 	for v := range fvs {
 		w = append(w, v)
 	}
@@ -2785,7 +2806,10 @@ func Length(vm *VM, list, length Term, k Cont, env *Env) *Promise {
 }
 
 func lengthRundown(vm *VM, list Variable, n Integer, k Cont, env *Env) *Promise {
-	elems := make([]Term, n)
+	elems, err := makeSlice[Term](int(n))
+	if err != nil {
+		return Error(resourceError(resourceMemory, env))
+	}
 	for i := range elems {
 		elems[i] = NewVariable()
 	}