Skip to content

Fix call stack display for recursive function calls #203

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
gnidan merged 1 commit into from
Apr 2, 2026
+23 −15
Merged

Fix call stack display for recursive function calls #203

Show file tree
Hide file tree
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
20 changes: 12 additions & 8 deletions packages/programs-react/src/utils/mockTrace.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,15 +298,19 @@ export function buildCallStack(
}

if (callInfo.kind === "invoke") {
// The compiler emits invoke on both the caller JUMP and
// callee entry JUMPDEST. Skip if the top frame already
// matches this call.
// The compiler emits invoke on both the caller JUMP
// and callee entry JUMPDEST for the same call. These
// occur on consecutive trace steps. Only skip if the
// top frame matches AND was pushed on the immediately
// preceding step — otherwise this is a new call (e.g.
// recursion with the same function name).
const top = stack[stack.length - 1];
if (
!top ||
top.identifier !== callInfo.identifier ||
top.callType !== callInfo.callType
) {
const isDuplicate =
top &&
top.identifier === callInfo.identifier &&
top.callType === callInfo.callType &&
top.stepIndex === i - 1;
if (!isDuplicate) {
stack.push({
identifier: callInfo.identifier,
stepIndex: i,
Expand Down
18 changes: 11 additions & 7 deletions packages/web/src/theme/ProgramExample/TraceDrawer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,14 +118,18 @@ function TraceDrawerContent(): JSX.Element {

if (info.kind === "invoke") {
// The compiler emits invoke on both the caller
// JUMP and callee entry JUMPDEST. Skip if the
// top frame already matches this call.
// JUMP and callee entry JUMPDEST for the same
// call. These occur on consecutive trace steps.
// Only skip if the top frame matches AND was
// pushed on the immediately preceding step —
// otherwise this is a new call (e.g. recursion).
const top = frames[frames.length - 1];
if (
!top ||
top.identifier !== info.identifier ||
top.callType !== info.callType
) {
const isDuplicate =
top &&
top.identifier === info.identifier &&
top.callType === info.callType &&
top.stepIndex === i - 1;
if (!isDuplicate) {
frames.push({
identifier: info.identifier,
stepIndex: i,
Expand Down
Loading