Refactor calling bundle to avoid cast

victormlg · victormlg · commit 630b5445026b · 2025-12-18T13:49:01.000+01:00
Signed-off-by: Victor Moene &lt;victor.moene@northern.tech&gt;
diff --git a/cf-agent/cf-agent.c b/cf-agent/cf-agent.c
@@ -1547,7 +1547,7 @@ static void KeepPromiseBundles(EvalContext *ctx, const Policy *policy, GenericAg
         if (bp)
         {
             BundleBanner(bp,args);
-            EvalContextStackPushBundleFrame(ctx, bp, args, false);
+            EvalContextStackPushBundleFrame(ctx, bp, args, false, NULL);
             ScheduleAgentOperations(ctx, bp);
             EvalContextStackPopFrame(ctx);
             EndBundleBanner(bp);
diff --git a/cf-agent/verify_files.c b/cf-agent/verify_files.c
@@ -894,7 +894,7 @@ static PromiseResult RenderTemplateCFEngine(EvalContext *ctx,
 
         a.haveeditline = true;
 
-        EvalContextStackPushBundleFrame(ctx, bp, bundle_args, a.edits.inherit);
+        EvalContextStackPushBundleFrame(ctx, bp, bundle_args, a.edits.inherit, NULL);
         BundleResolve(ctx, bp);
 
         *save_file = ScheduleEditLineOperations(ctx, bp, &a, pp, edcontext);
@@ -1154,7 +1154,7 @@ PromiseResult ScheduleEditOperation(EvalContext *ctx, char *filename,
         const Bundle *bp = EvalContextResolveBundleExpression(ctx, policy, edit_bundle_name, "edit_line");
         if (bp)
         {
-            EvalContextStackPushBundleFrame(ctx, bp, args, a->edits.inherit);
+            EvalContextStackPushBundleFrame(ctx, bp, args, a->edits.inherit, NULL);
 
             BundleResolve(ctx, bp);
 
@@ -1192,7 +1192,7 @@ PromiseResult ScheduleEditOperation(EvalContext *ctx, char *filename,
         const Bundle *bp = EvalContextResolveBundleExpression(ctx, policy, edit_bundle_name, "edit_xml");
         if (bp)
         {
-            EvalContextStackPushBundleFrame(ctx, bp, args, a->edits.inherit);
+            EvalContextStackPushBundleFrame(ctx, bp, args, a->edits.inherit, NULL);
             BundleResolve(ctx, bp);
 
             ScheduleEditXmlOperations(ctx, bp, a, pp, edcontext);
diff --git a/cf-agent/verify_methods.c b/cf-agent/verify_methods.c
@@ -128,11 +128,11 @@ PromiseResult VerifyMethod(EvalContext *ctx, const Rval call, const Attributes *
 
     PromiseBanner(ctx, pp);
 
-    Bundle *bp = (Bundle *) EvalContextResolveBundleExpression(ctx, PromiseGetPolicy(pp), BufferData(method_name), "agent");
+    const Bundle *bp = EvalContextResolveBundleExpression(ctx, PromiseGetPolicy(pp), BufferData(method_name), "agent");
 
     if (!bp)
     {
-        bp = (Bundle *) EvalContextResolveBundleExpression(ctx, PromiseGetPolicy(pp), BufferData(method_name), "common");
+        bp = EvalContextResolveBundleExpression(ctx, PromiseGetPolicy(pp), BufferData(method_name), "common");
     }
 
     PromiseResult result = PROMISE_RESULT_NOOP;
@@ -148,7 +148,7 @@ PromiseResult VerifyMethod(EvalContext *ctx, const Rval call, const Attributes *
         {
             BundleBanner(bp, args);
             EvalContextSetBundleArgs(ctx, args);
-            EvalContextStackPushBundleFrame(ctx, bp, args, a->inherit);
+            EvalContextStackPushBundleFrame(ctx, bp, args, a->inherit, PromiseGetBundle(pp));
 
             /* Clear all array-variables that are already set in the sub-bundle.
                Otherwise, array-data accumulates between multiple bundle evaluations.
@@ -169,7 +169,6 @@ PromiseResult VerifyMethod(EvalContext *ctx, const Rval call, const Attributes *
 
             BundleResolve(ctx, bp);
 
-            bp->calling_bundle = (Bundle *) PromiseGetBundle(pp);
             result = ScheduleAgentOperations(ctx, bp);
 
             GetReturnValue(ctx, bp, pp);
diff --git a/cf-monitord/env_monitor.c b/cf-monitord/env_monitor.c
@@ -1143,7 +1143,7 @@ static void GatherPromisedMeasures(EvalContext *ctx, const Policy *policy)
     for (size_t i = 0; i < SeqLength(policy->bundles); i++)
     {
         const Bundle *bp = SeqAt(policy->bundles, i);
-        EvalContextStackPushBundleFrame(ctx, bp, NULL, false);
+        EvalContextStackPushBundleFrame(ctx, bp, NULL, false, NULL);
 
         if ((strcmp(bp->type, CF_AGENTTYPES[AGENT_TYPE_MONITOR]) == 0) || (strcmp(bp->type, CF_AGENTTYPES[AGENT_TYPE_COMMON]) == 0))
         {
diff --git a/cf-serverd/server_transform.c b/cf-serverd/server_transform.c
@@ -641,7 +641,7 @@ static bool IsPromiseTypeNotInTypeSequence(const char *promise_type,
 
 static void EvaluateBundle(EvalContext *ctx, const Bundle *bp, const char * const *seq)
 {
-    EvalContextStackPushBundleFrame(ctx, bp, NULL, false);
+    EvalContextStackPushBundleFrame(ctx, bp, NULL, false, NULL);
 
     for (int type = 0; seq[type] != NULL; type++)
     {
diff --git a/libpromises/eval_context.c b/libpromises/eval_context.c
@@ -1355,13 +1355,14 @@ static StackFrame *StackFrameNew(StackFrameType type, bool inherit_previous)
     return frame;
 }
 
-static StackFrame *StackFrameNewBundle(const Bundle *owner, bool inherit_previous, bool profiling)
+static StackFrame *StackFrameNewBundle(const Bundle *owner, bool inherit_previous, bool profiling, const Bundle *calling_bundle)
 {
     StackFrame *frame = StackFrameNew(STACK_FRAME_TYPE_BUNDLE, inherit_previous);
 
     frame->data.bundle.owner = owner;
     frame->data.bundle.classes = ClassTableNew();
     frame->data.bundle.vars = VariableTableNew();
+    frame->data.bundle.calling_bundle = calling_bundle;
     frame->event = (profiling) ? BundleToEventFrame(owner) : NULL;
 
     return frame;
@@ -1438,12 +1439,12 @@ static void EvalContextStackPushFrame(EvalContext *ctx, StackFrame *frame)
              STACK_FRAME_TYPE_STR[frame->type]);
 }
 
-void EvalContextStackPushBundleFrame(EvalContext *ctx, const Bundle *owner, const Rlist *args, bool inherits_previous)
+void EvalContextStackPushBundleFrame(EvalContext *ctx, const Bundle *owner, const Rlist *args, bool inherits_previous, const Bundle *calling_bundle)
 {
     assert(ctx != NULL);
     assert(!LastStackFrame(ctx, 0) || LastStackFrame(ctx, 0)->type == STACK_FRAME_TYPE_PROMISE_ITERATION);
 
-    EvalContextStackPushFrame(ctx, StackFrameNewBundle(owner, inherits_previous, ctx->profiling));
+    EvalContextStackPushFrame(ctx, StackFrameNewBundle(owner, inherits_previous, ctx->profiling, calling_bundle));
 
     if (RlistLen(args) > 0)
     {
@@ -1566,9 +1567,11 @@ void EvalContextStackPushPromiseFrame(EvalContext *ctx, const Promise *owner)
 
     EvalContextVariablePutSpecial(ctx, SPECIAL_SCOPE_THIS, "bundle", PromiseGetBundle(owner)->name, CF_DATA_TYPE_STRING, "source=promise");
     EvalContextVariablePutSpecial(ctx, SPECIAL_SCOPE_THIS, "namespace", PromiseGetNamespace(owner), CF_DATA_TYPE_STRING, "source=promise");
-    if (PromiseGetBundle(owner)->calling_bundle != NULL)
+
+    StackFrame *bundle_frame = LastStackFrameByType(ctx, STACK_FRAME_TYPE_BUNDLE);
+    if (bundle_frame->data.bundle.calling_bundle != NULL)
     {
-        char *calling_bundle_name = StringFormat("%s:%s", PromiseGetBundle(owner)->calling_bundle->ns, PromiseGetBundle(owner)->calling_bundle->name);
+        char *calling_bundle_name = StringFormat("%s:%s",bundle_frame->data.bundle.calling_bundle->ns, bundle_frame->data.bundle.calling_bundle->name);
         EvalContextVariablePutSpecial(ctx, SPECIAL_SCOPE_THIS, "calling_bundle", calling_bundle_name, CF_DATA_TYPE_STRING, "source=promise");
         free(calling_bundle_name);
     }
diff --git a/libpromises/eval_context.h b/libpromises/eval_context.h
@@ -62,6 +62,7 @@ typedef enum
 typedef struct
 {
     const Bundle *owner;
+    const Bundle *calling_bundle;
 
     ClassTable *classes;
     VariableTable *vars;
@@ -183,7 +184,7 @@ void EvalContextClear(EvalContext *ctx);
 
 Rlist *EvalContextGetPromiseCallerMethods(EvalContext *ctx);
 
-void EvalContextStackPushBundleFrame(EvalContext *ctx, const Bundle *owner, const Rlist *args, bool inherits_previous);
+void EvalContextStackPushBundleFrame(EvalContext *ctx, const Bundle *owner, const Rlist *args, bool inherits_previous, const Bundle *calling_bundle);
 void EvalContextStackPushBodyFrame(EvalContext *ctx, const Promise *caller, const Body *body, const Rlist *args);
 void EvalContextStackPushBundleSectionFrame(EvalContext *ctx, const BundleSection *owner);
 void EvalContextStackPushPromiseFrame(EvalContext *ctx, const Promise *owner);
diff --git a/libpromises/expand.c b/libpromises/expand.c
@@ -1118,7 +1118,7 @@ void PolicyResolve(EvalContext *ctx, const Policy *policy,
         Bundle *bundle = SeqAt(policy->bundles, i);
         if (strcmp("common", bundle->type) == 0)
         {
-            EvalContextStackPushBundleFrame(ctx, bundle, NULL, false);
+            EvalContextStackPushBundleFrame(ctx, bundle, NULL, false, NULL);
             BundleResolve(ctx, bundle);            /* PRE-EVAL classes,vars */
             EvalContextStackPopFrame(ctx);
         }
@@ -1136,7 +1136,7 @@ void PolicyResolve(EvalContext *ctx, const Policy *policy,
         Bundle *bundle = SeqAt(policy->bundles, i);
         if (strcmp("common", bundle->type) != 0)
         {
-            EvalContextStackPushBundleFrame(ctx, bundle, NULL, false);
+            EvalContextStackPushBundleFrame(ctx, bundle, NULL, false, NULL);
             BundleResolve(ctx, bundle);                    /* PRE-EVAL vars */
             EvalContextStackPopFrame(ctx);
         }
diff --git a/libpromises/loading.c b/libpromises/loading.c
@@ -573,7 +573,7 @@ Policy *LoadPolicy(EvalContext *ctx, GenericAgentConfig *config)
         for (size_t i = 0; i < SeqLength(policy->bundles); i++)
         {
             Bundle *bp = SeqAt(policy->bundles, i);
-            EvalContextStackPushBundleFrame(ctx, bp, NULL, false);
+            EvalContextStackPushBundleFrame(ctx, bp, NULL, false, NULL);
 
             for (size_t j = 0; j < SeqLength(bp->sections); j++)
             {
diff --git a/libpromises/policy.c b/libpromises/policy.c
@@ -1324,7 +1324,6 @@ Bundle *PolicyAppendBundle(Policy *policy,
     bundle->custom_sections = SeqNew(10, BundleSectionDestroy);
     bundle->all_promises = SeqNew(10, NULL);
     bundle->evaluation_order = evaluation_order;
-    bundle->calling_bundle = NULL;
 
     return bundle;
 }
diff --git a/libpromises/policy.h b/libpromises/policy.h
@@ -71,7 +71,6 @@ typedef struct
 struct Bundle_
 {
     Policy *parent_policy;
-    struct Bundle_ *calling_bundle;
 
     char *type;
     char *name;
diff --git a/tests/unit/eval_context_test.c b/tests/unit/eval_context_test.c
@@ -55,7 +55,7 @@ static void test_class_persistence(void)
         Policy *p = PolicyNew();
         Bundle *bp = PolicyAppendBundle(p, "ns1", "bundle1", "agent", NULL, NULL, EVAL_ORDER_UNDEFINED);
 
-        EvalContextStackPushBundleFrame(ctx, bp, NULL, false);
+        EvalContextStackPushBundleFrame(ctx, bp, NULL, false, NULL);
         EvalContextHeapPersistentSave(ctx, "class2", 5, CONTEXT_STATE_POLICY_PRESERVE, "x");
         EvalContextStackPopFrame(ctx);
 
diff --git a/tests/unit/expand_test.c b/tests/unit/expand_test.c
@@ -130,7 +130,7 @@ static void test_map_iterators_from_rval_naked_list_var(void **state)
         RlistDestroy(list);
     }
 
-    EvalContextStackPushBundleFrame(ctx, bp, NULL, false);
+    EvalContextStackPushBundleFrame(ctx, bp, NULL, false, NULL);
 
     {
         Rlist *lists = NULL;
@@ -203,7 +203,7 @@ static void test_map_iterators_from_rval_naked_list_var_namespace(void **state)
         RlistDestroy(list);
     }
 
-    EvalContextStackPushBundleFrame(ctx, bp, NULL, false);
+    EvalContextStackPushBundleFrame(ctx, bp, NULL, false, NULL);
 
     {
         Rlist *lists = NULL;
@@ -425,7 +425,7 @@ static void test_expand_promise_array_with_scalar_arg(void **state)
     BundleSection *section = BundleAppendSection(bundle, "dummy");
     Promise *promise = BundleSectionAppendPromise(section, "$(foo[$(bar)])", (Rval) { NULL, RVAL_TYPE_NOPROMISEE }, "any", NULL);
 
-    EvalContextStackPushBundleFrame(ctx, bundle, NULL, false);
+    EvalContextStackPushBundleFrame(ctx, bundle, NULL, false, NULL);
     EvalContextStackPushBundleSectionFrame(ctx, section);
     ExpandPromise(ctx, promise, actuator_expand_promise_array_with_scalar_arg, NULL);
     EvalContextStackPopFrame(ctx);
@@ -480,7 +480,7 @@ static void test_expand_promise_slist(void **state)
     BundleSection *section = BundleAppendSection(bundle, "dummy");
     Promise *promise = BundleSectionAppendPromise(section, "$(foo)", (Rval) { NULL, RVAL_TYPE_NOPROMISEE }, "any", NULL);
 
-    EvalContextStackPushBundleFrame(ctx, bundle, NULL, false);
+    EvalContextStackPushBundleFrame(ctx, bundle, NULL, false, NULL);
     EvalContextStackPushBundleSectionFrame(ctx, section);
     ExpandPromise(ctx, promise, actuator_expand_promise_slist, NULL);
     EvalContextStackPopFrame(ctx);
@@ -548,7 +548,7 @@ static void test_expand_promise_array_with_slist_arg(void **state)
     BundleSection *section = BundleAppendSection(bundle, "dummy");
     Promise *promise = BundleSectionAppendPromise(section, "$(arr[$(keys)])", (Rval) { NULL, RVAL_TYPE_NOPROMISEE }, "any", NULL);
 
-    EvalContextStackPushBundleFrame(ctx, bundle, NULL, false);
+    EvalContextStackPushBundleFrame(ctx, bundle, NULL, false, NULL);
     EvalContextStackPushBundleSectionFrame(ctx, section);
     ExpandPromise(ctx, promise, actuator_expand_promise_array_with_slist_arg, NULL);
     EvalContextStackPopFrame(ctx);
diff --git a/tests/unit/iteration_test.c b/tests/unit/iteration_test.c
@@ -249,7 +249,7 @@ static void IteratorPrepare_TestHelper(
     Promise *promise = BundleSectionAppendPromise(section, promiser,
                                                   (Rval) { NULL, RVAL_TYPE_NOPROMISEE },
                                                   "any", NULL);
-    EvalContextStackPushBundleFrame(evalctx, bundle, NULL, false);
+    EvalContextStackPushBundleFrame(evalctx, bundle, NULL, false, NULL);
     EvalContextStackPushBundleSectionFrame(evalctx, section);
     PromiseIterator *iterctx = PromiseIteratorNew(promise);
     char *promiser_copy = xstrdup(promiser);

Original file line number	Diff line number	Diff line change
`@@ -1547,7 +1547,7 @@ static void KeepPromiseBundles(EvalContext ctx, const Policy policy, GenericAg`
`1547`	`1547`	`if (bp)`
`1548`	`1548`	`{`
`1549`	`1549`	`BundleBanner(bp,args);`
`1550`		`- EvalContextStackPushBundleFrame(ctx, bp, args, false);`
	`1550`	`+ EvalContextStackPushBundleFrame(ctx, bp, args, false, NULL);`
`1551`	`1551`	`ScheduleAgentOperations(ctx, bp);`
`1552`	`1552`	`EvalContextStackPopFrame(ctx);`
`1553`	`1553`	`EndBundleBanner(bp);`
Original file line number	Diff line number	Diff line change
`@@ -1143,7 +1143,7 @@ static void GatherPromisedMeasures(EvalContext ctx, const Policy policy)`
`1143`	`1143`	`for (size_t i = 0; i < SeqLength(policy->bundles); i++)`
`1144`	`1144`	`{`
`1145`	`1145`	`const Bundle *bp = SeqAt(policy->bundles, i);`
`1146`		`- EvalContextStackPushBundleFrame(ctx, bp, NULL, false);`
	`1146`	`+ EvalContextStackPushBundleFrame(ctx, bp, NULL, false, NULL);`
`1147`	`1147`
`1148`	`1148`	`if ((strcmp(bp->type, CF_AGENTTYPES[AGENT_TYPE_MONITOR]) == 0) \|\| (strcmp(bp->type, CF_AGENTTYPES[AGENT_TYPE_COMMON]) == 0))`
`1149`	`1149`	`{`
Original file line number	Diff line number	Diff line change
`@@ -641,7 +641,7 @@ static bool IsPromiseTypeNotInTypeSequence(const char *promise_type,`
`641`	`641`
`642`	`642`	`static void EvaluateBundle(EvalContext ctx, const Bundle bp, const char * const *seq)`
`643`	`643`	`{`
`644`		`- EvalContextStackPushBundleFrame(ctx, bp, NULL, false);`
	`644`	`+ EvalContextStackPushBundleFrame(ctx, bp, NULL, false, NULL);`
`645`	`645`
`646`	`646`	`for (int type = 0; seq[type] != NULL; type++)`
`647`	`647`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1355,13 +1355,14 @@ static StackFrame *StackFrameNew(StackFrameType type, bool inherit_previous)`
`1355`	`1355`	`return frame;`
`1356`	`1356`	`}`
`1357`	`1357`
`1358`		`-static StackFrame StackFrameNewBundle(const Bundle owner, bool inherit_previous, bool profiling)`
	`1358`	`+static StackFrame StackFrameNewBundle(const Bundle owner, bool inherit_previous, bool profiling, const Bundle *calling_bundle)`
`1359`	`1359`	`{`
`1360`	`1360`	`StackFrame *frame = StackFrameNew(STACK_FRAME_TYPE_BUNDLE, inherit_previous);`
`1361`	`1361`
`1362`	`1362`	`frame->data.bundle.owner = owner;`
`1363`	`1363`	`frame->data.bundle.classes = ClassTableNew();`
`1364`	`1364`	`frame->data.bundle.vars = VariableTableNew();`
	`1365`	`+ frame->data.bundle.calling_bundle = calling_bundle;`
`1365`	`1366`	`frame->event = (profiling) ? BundleToEventFrame(owner) : NULL;`
`1366`	`1367`
`1367`	`1368`	`return frame;`
`@@ -1438,12 +1439,12 @@ static void EvalContextStackPushFrame(EvalContext ctx, StackFrame frame)`
`1438`	`1439`	`STACK_FRAME_TYPE_STR[frame->type]);`
`1439`	`1440`	`}`
`1440`	`1441`
`1441`		`-void EvalContextStackPushBundleFrame(EvalContext ctx, const Bundle owner, const Rlist *args, bool inherits_previous)`
	`1442`	`+void EvalContextStackPushBundleFrame(EvalContext ctx, const Bundle owner, const Rlist args, bool inherits_previous, const Bundle calling_bundle)`
`1442`	`1443`	`{`
`1443`	`1444`	`assert(ctx != NULL);`
`1444`	`1445`	`assert(!LastStackFrame(ctx, 0) \|\| LastStackFrame(ctx, 0)->type == STACK_FRAME_TYPE_PROMISE_ITERATION);`
`1445`	`1446`
`1446`		`- EvalContextStackPushFrame(ctx, StackFrameNewBundle(owner, inherits_previous, ctx->profiling));`
	`1447`	`+ EvalContextStackPushFrame(ctx, StackFrameNewBundle(owner, inherits_previous, ctx->profiling, calling_bundle));`
`1447`	`1448`
`1448`	`1449`	`if (RlistLen(args) > 0)`
`1449`	`1450`	`{`
`@@ -1566,9 +1567,11 @@ void EvalContextStackPushPromiseFrame(EvalContext ctx, const Promise owner)`
`1566`	`1567`
`1567`	`1568`	`EvalContextVariablePutSpecial(ctx, SPECIAL_SCOPE_THIS, "bundle", PromiseGetBundle(owner)->name, CF_DATA_TYPE_STRING, "source=promise");`
`1568`	`1569`	`EvalContextVariablePutSpecial(ctx, SPECIAL_SCOPE_THIS, "namespace", PromiseGetNamespace(owner), CF_DATA_TYPE_STRING, "source=promise");`
`1569`		`- if (PromiseGetBundle(owner)->calling_bundle != NULL)`
	`1570`	`+`
	`1571`	`+ StackFrame *bundle_frame = LastStackFrameByType(ctx, STACK_FRAME_TYPE_BUNDLE);`
	`1572`	`+ if (bundle_frame->data.bundle.calling_bundle != NULL)`
`1570`	`1573`	`{`
`1571`		`- char *calling_bundle_name = StringFormat("%s:%s", PromiseGetBundle(owner)->calling_bundle->ns, PromiseGetBundle(owner)->calling_bundle->name);`
	`1574`	`+ char *calling_bundle_name = StringFormat("%s:%s",bundle_frame->data.bundle.calling_bundle->ns, bundle_frame->data.bundle.calling_bundle->name);`
`1572`	`1575`	`EvalContextVariablePutSpecial(ctx, SPECIAL_SCOPE_THIS, "calling_bundle", calling_bundle_name, CF_DATA_TYPE_STRING, "source=promise");`
`1573`	`1576`	`free(calling_bundle_name);`
`1574`	`1577`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1118,7 +1118,7 @@ void PolicyResolve(EvalContext ctx, const Policy policy,`
`1118`	`1118`	`Bundle *bundle = SeqAt(policy->bundles, i);`
`1119`	`1119`	`if (strcmp("common", bundle->type) == 0)`
`1120`	`1120`	`{`
`1121`		`- EvalContextStackPushBundleFrame(ctx, bundle, NULL, false);`
	`1121`	`+ EvalContextStackPushBundleFrame(ctx, bundle, NULL, false, NULL);`
`1122`	`1122`	`BundleResolve(ctx, bundle); /* PRE-EVAL classes,vars */`
`1123`	`1123`	`EvalContextStackPopFrame(ctx);`
`1124`	`1124`	`}`
`@@ -1136,7 +1136,7 @@ void PolicyResolve(EvalContext ctx, const Policy policy,`
`1136`	`1136`	`Bundle *bundle = SeqAt(policy->bundles, i);`
`1137`	`1137`	`if (strcmp("common", bundle->type) != 0)`
`1138`	`1138`	`{`
`1139`		`- EvalContextStackPushBundleFrame(ctx, bundle, NULL, false);`
	`1139`	`+ EvalContextStackPushBundleFrame(ctx, bundle, NULL, false, NULL);`
`1140`	`1140`	`BundleResolve(ctx, bundle); /* PRE-EVAL vars */`
`1141`	`1141`	`EvalContextStackPopFrame(ctx);`
`1142`	`1142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -573,7 +573,7 @@ Policy LoadPolicy(EvalContext ctx, GenericAgentConfig *config)`
`573`	`573`	`for (size_t i = 0; i < SeqLength(policy->bundles); i++)`
`574`	`574`	`{`
`575`	`575`	`Bundle *bp = SeqAt(policy->bundles, i);`
`576`		`- EvalContextStackPushBundleFrame(ctx, bp, NULL, false);`
	`576`	`+ EvalContextStackPushBundleFrame(ctx, bp, NULL, false, NULL);`
`577`	`577`
`578`	`578`	`for (size_t j = 0; j < SeqLength(bp->sections); j++)`
`579`	`579`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1324,7 +1324,6 @@ Bundle PolicyAppendBundle(Policy policy,`
`1324`	`1324`	`bundle->custom_sections = SeqNew(10, BundleSectionDestroy);`
`1325`	`1325`	`bundle->all_promises = SeqNew(10, NULL);`
`1326`	`1326`	`bundle->evaluation_order = evaluation_order;`
`1327`		`- bundle->calling_bundle = NULL;`
`1328`	`1327`
`1329`	`1328`	`return bundle;`
`1330`	`1329`	`}`