-
Notifications
You must be signed in to change notification settings - Fork 307
transpile: Use try_from to detect overflow builtin result truncation #1879
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
Open
thedataking
wants to merge
1
commit into
perl/overflow-builtin-types
Choose a base branch
from
perl/overflow-try-from
base: perl/overflow-builtin-types
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| // Overflow builtins with operand/result types that do not share one Rust | ||
| // type compute in i128 and check that the result fits via `try_from`. | ||
|
|
||
| int mixed_types(long long a, int b, unsigned long long *out) | ||
| { | ||
| return __builtin_add_overflow(a, b, out); | ||
| } | ||
|
|
||
| int narrow_result(long long a, long long b, int *out) | ||
| { | ||
| return __builtin_mul_overflow(a, b, out); | ||
| } |
37 changes: 37 additions & 0 deletions
37
c2rust-transpile/tests/snapshots/snapshots__transpile@overflow_mixed.c.2021.clang15.snap
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| --- | ||
| source: c2rust-transpile/tests/snapshots.rs | ||
| expression: cat tests/snapshots/overflow_mixed.2021.clang15.rs | ||
| --- | ||
| #![allow( | ||
| clippy::missing_safety_doc, | ||
| dead_code, | ||
| non_camel_case_types, | ||
| non_snake_case, | ||
| non_upper_case_globals, | ||
| unused_assignments, | ||
| unused_mut | ||
| )] | ||
| #[no_mangle] | ||
| pub unsafe extern "C" fn mixed_types( | ||
| mut a: ::core::ffi::c_longlong, | ||
| mut b: ::core::ffi::c_int, | ||
| mut out: *mut ::core::ffi::c_ulonglong, | ||
| ) -> ::core::ffi::c_int { | ||
| let (c2rust_result, c2rust_overflowed) = (a as i128).overflowing_add(b as i128); | ||
| let c2rust_result_narrow = c2rust_result as ::core::ffi::c_ulonglong; | ||
| *out = c2rust_result_narrow; | ||
| return (c2rust_overflowed || ::core::ffi::c_ulonglong::try_from(c2rust_result).is_err()) | ||
| as ::core::ffi::c_int; | ||
| } | ||
| #[no_mangle] | ||
| pub unsafe extern "C" fn narrow_result( | ||
| mut a: ::core::ffi::c_longlong, | ||
| mut b: ::core::ffi::c_longlong, | ||
| mut out: *mut ::core::ffi::c_int, | ||
| ) -> ::core::ffi::c_int { | ||
| let (c2rust_result, c2rust_overflowed) = (a as i128).overflowing_mul(b as i128); | ||
| let c2rust_result_narrow = c2rust_result as ::core::ffi::c_int; | ||
| *out = c2rust_result_narrow; | ||
| return (c2rust_overflowed || ::core::ffi::c_int::try_from(c2rust_result).is_err()) | ||
| as ::core::ffi::c_int; | ||
| } | ||
38 changes: 38 additions & 0 deletions
38
c2rust-transpile/tests/snapshots/snapshots__transpile@overflow_mixed.c.2024.clang15.snap
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| --- | ||
| source: c2rust-transpile/tests/snapshots.rs | ||
| expression: cat tests/snapshots/overflow_mixed.2024.clang15.rs | ||
| --- | ||
| #![allow( | ||
| clippy::missing_safety_doc, | ||
| dead_code, | ||
| non_camel_case_types, | ||
| non_snake_case, | ||
| non_upper_case_globals, | ||
| unsafe_op_in_unsafe_fn, | ||
| unused_assignments, | ||
| unused_mut | ||
| )] | ||
| #[unsafe(no_mangle)] | ||
| pub unsafe extern "C" fn mixed_types( | ||
| mut a: ::core::ffi::c_longlong, | ||
| mut b: ::core::ffi::c_int, | ||
| mut out: *mut ::core::ffi::c_ulonglong, | ||
| ) -> ::core::ffi::c_int { | ||
| let (c2rust_result, c2rust_overflowed) = (a as i128).overflowing_add(b as i128); | ||
| let c2rust_result_narrow = c2rust_result as ::core::ffi::c_ulonglong; | ||
| *out = c2rust_result_narrow; | ||
| return (c2rust_overflowed || ::core::ffi::c_ulonglong::try_from(c2rust_result).is_err()) | ||
| as ::core::ffi::c_int; | ||
| } | ||
| #[unsafe(no_mangle)] | ||
| pub unsafe extern "C" fn narrow_result( | ||
| mut a: ::core::ffi::c_longlong, | ||
| mut b: ::core::ffi::c_longlong, | ||
| mut out: *mut ::core::ffi::c_int, | ||
| ) -> ::core::ffi::c_int { | ||
| let (c2rust_result, c2rust_overflowed) = (a as i128).overflowing_mul(b as i128); | ||
| let c2rust_result_narrow = c2rust_result as ::core::ffi::c_int; | ||
| *out = c2rust_result_narrow; | ||
| return (c2rust_overflowed || ::core::ffi::c_int::try_from(c2rust_result).is_err()) | ||
| as ::core::ffi::c_int; | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you're using
try_frombelow, you don't need this cast here becauseOk(x)is what you want.