-
Notifications
You must be signed in to change notification settings - Fork 101
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
Conform with recent changes in rustc (alloc id, scalar ptr, vtable method) #361
Conform with recent changes in rustc (alloc id, scalar ptr, vtable method) #361
Conversation
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.
LGTM! With a minor request.
Co-authored-by: Abdalrhman M Mohamed <[email protected]>
@@ -265,9 +265,10 @@ impl<'tcx> GotocCtx<'tcx> { | |||
&self.symbol_table, | |||
) | |||
} | |||
(Scalar::Ptr(ptr), _) => { | |||
(Scalar::Ptr(ptr, _size), _) => { |
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.
What does the _size mean?
VtblEntry::MetadataDropInPlace | ||
| VtblEntry::MetadataSize | ||
| VtblEntry::MetadataAlign | ||
| VtblEntry::Vacant => None, | ||
// Super trait vtable entries already handled by now | ||
VtblEntry::TraitVPtr(..) => None, |
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.
Is returning None, or throwing an error the right thing here?
…thod) (#361) * Refactor for alloc_id iterators * Access scalar pointer values via `into_parts` * Trait compile fixes * Vtable field name workaround * Remove `unused doc comment` warning
…thod) (#361) * Refactor for alloc_id iterators * Access scalar pointer values via `into_parts` * Trait compile fixes * Vtable field name workaround * Remove `unused doc comment` warning
…thod) (#361) * Refactor for alloc_id iterators * Access scalar pointer values via `into_parts` * Trait compile fixes * Vtable field name workaround * Remove `unused doc comment` warning
…thod) (#361) * Refactor for alloc_id iterators * Access scalar pointer values via `into_parts` * Trait compile fixes * Vtable field name workaround * Remove `unused doc comment` warning
…thod) (model-checking#361) * Refactor for alloc_id iterators * Access scalar pointer values via `into_parts` * Trait compile fixes * Vtable field name workaround * Remove `unused doc comment` warning
…thod) (model-checking#361) * Refactor for alloc_id iterators * Access scalar pointer values via `into_parts` * Trait compile fixes * Vtable field name workaround * Remove `unused doc comment` warning
…thod) (model-checking#361) * Refactor for alloc_id iterators * Access scalar pointer values via `into_parts` * Trait compile fixes * Vtable field name workaround * Remove `unused doc comment` warning
…thod) (#361) * Refactor for alloc_id iterators * Access scalar pointer values via `into_parts` * Trait compile fixes * Vtable field name workaround * Remove `unused doc comment` warning
Description of changes:
This PR adds the required fixes for candidate failing branch
main-153-2021-07-26
to work. See #345 for more details.Resolved issues:
Partially resolves #345
Call-outs:
Testing:
How is this change tested?
Is this a refactor change?
Checklist
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses.