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: add RVRT to unallowed opcodes for predicates #6290

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions sway-core/src/asm_generation/fuel/checks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,9 @@ pub(crate) fn check_script_opcodes(
/// Checks if an opcode is one that cannot be executed from within a predicate.
/// If so, throw an error.
///
/// All contract opcodes are not allowed in predicates. Except for RVRT that can
/// be used to abort the predicate. One example of disallowed code is as follows:
/// All contract opcodes are not allowed in predicates, including RVRT that causes
/// a panic according to https://github.com/FuelLabs/fuel-vm/blob/master/fuel-asm/src/lib.rs#L984.
/// One example of disallowed code is as follows:
/// ```ignore
/// pub fn burn(sub_id: SubId, amount: u64) {
/// asm(r1: amount) {
Expand Down Expand Up @@ -120,6 +121,7 @@ pub(crate) fn check_predicate_opcodes(
TIME(..) => invalid_opcode("TIME"),
TR(..) => invalid_opcode("TR"),
TRO(..) => invalid_opcode("TRO"),
RVRT(..) => invalid_opcode("RVRT"),
_ => (),
};
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,10 @@ fn main() -> bool {
}

// retd: There is no way of testing
// rvrt: It is allowed and used to abort predicates.

asm(r1) {
rvrt r1;
}

asm(r1: 0, r2: 0, r3: 0, r4: 0) {
smo r1 r2 r3 r4;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ category = "fail"

# check: cb r1;
# nextln: $()The CB opcode cannot be used in a predicate.

# check: ccp r1 r2 r3 r4;
# nextln: $()The CCP opcode cannot be used in a predicate.

Expand Down Expand Up @@ -56,4 +56,5 @@ category = "fail"
# check: tr r1 r2 r3;
# nextln: $()The TR opcode cannot be used in a predicate.


# check: rvrt r1;
# nextln: $()The RVRT opcode cannot be used in a predicate.
Loading