Skip to content
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.

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

Fix callx error discrepancy between interpreter and jit #629

Merged
merged 13 commits into from
Nov 22, 2024

Conversation

LucasSte
Copy link

@LucasSte LucasSte commented Nov 8, 2024

If we set a compute budget of N instructions and an invalid callx is the Nth instruction, the jitter would mistakenly throw a ExceededMaximumInstructions error, even though executing callx was still permitted (executing the very next instruction after callx is not). This PR patches the jitter to address this issue and fixes the interpreter to correctly count the instructions executed when callx errors out.

@LucasSte LucasSte changed the title Fix callx error discrepancy between interpreter and kit Fix callx error discrepancy between interpreter and jit Nov 8, 2024
@LucasSte LucasSte requested a review from Lichtso November 8, 2024 22:55
@LucasSte LucasSte marked this pull request as ready for review November 8, 2024 22:55
tests/execution.rs Outdated Show resolved Hide resolved
tests/execution.rs Outdated Show resolved Hide resolved
@LucasSte LucasSte requested a review from Lichtso November 12, 2024 22:44
src/jit.rs Outdated Show resolved Hide resolved
@LucasSte LucasSte requested a review from Lichtso November 18, 2024 22:05
src/jit.rs Outdated Show resolved Hide resolved
src/jit.rs Outdated Show resolved Hide resolved
src/jit.rs Outdated Show resolved Hide resolved
src/jit.rs Outdated Show resolved Hide resolved
src/jit.rs Outdated Show resolved Hide resolved
src/jit.rs Outdated Show resolved Hide resolved
src/jit.rs Outdated Show resolved Hide resolved
@LucasSte LucasSte merged commit 7d58371 into solana-labs:main Nov 22, 2024
12 checks passed
@LucasSte LucasSte deleted the fix-disc-2 branch November 22, 2024 14:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants