WIP

Author: infradig

src/query.c

@@ -665,17 +665,17 @@ static void reuse_frame(query *q, unsigned num_vars)
 		drop_choice(q);
 
 	frame *fold = GET_CURR_FRAME();
+	fold->initial_slots = fold->actual_slots = num_vars;
+	fold->no_recov = false;
 	const frame *fnew = GET_NEW_FRAME();
-	const slot *from = get_slot(q, fnew, 0);
-	slot *to = get_slot(q, fold, 0);
 
 	for (pl_idx i = 0; i < num_vars; i++) {
+		const slot *from = get_slot(q, fnew, i);
+		slot *to = get_slot(q, fold, i);
 		unshare_cell(&to->c);
-		*to++ = *from++;					// Slots are contiguous
+		*to = *from;
 	}
 
-	fold->initial_slots = fold->actual_slots = num_vars;
-	fold->no_recov = false;
 	q->st.sp = fold->base + fold->actual_slots;
 	q->st.dbe->tcos++;
 	q->total_tcos++;

tests/tests/test101.expected

@@ -1,6 +1,6 @@
-test1: [f,5,c,5,t,5,s,10]
-test2: [f,5,c,5,t,5,s,10]
-test3: [f,5,c,5,t,5,s,11]
+test1: [f,4,c,5,t,4,s,8]
+test2: [f,4,c,5,t,4,s,8]
+test3: [f,4,c,5,t,4,s,8]
 test4: [f,4,c,5,t,4,s,8]
 test5: [f,4,c,5,t,4,s,8]
 test6: [f,200004,c,5,t,200004,s,500008]