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

Conform with recent changes in rustc (alloc id, scalar ptr, vtable method) #361

Merged

Conversation

adpaco-aws
Copy link
Contributor

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

  • Each commit message has a non-empty body, explaining why the change was made
  • Methods or procedures are documented
  • Regression or unit tests are included, or existing tests cover the modified code
  • My PR is restricted to a single feature or bugfix

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses.

@adpaco-aws adpaco-aws marked this pull request as ready for review July 27, 2021 15:05
Copy link
Contributor

@bdalrhm bdalrhm left a 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.

compiler/rustc_codegen_llvm/src/gotoc/metadata.rs Outdated Show resolved Hide resolved
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), _) => {
Copy link
Contributor

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,
Copy link
Contributor

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?

@danielsn danielsn merged commit 22d72ef into model-checking:main-153-2021-07-26 Jul 27, 2021
adpaco-aws added a commit that referenced this pull request Aug 2, 2021
…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
@zhassan-aws zhassan-aws mentioned this pull request Aug 6, 2021
4 tasks
adpaco-aws added a commit that referenced this pull request Aug 6, 2021
…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
adpaco-aws added a commit that referenced this pull request Aug 17, 2021
…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
adpaco-aws added a commit that referenced this pull request Aug 24, 2021
…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
tedinski pushed a commit to tedinski/rmc that referenced this pull request Apr 22, 2022
…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
tedinski pushed a commit to tedinski/rmc that referenced this pull request Apr 25, 2022
…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
tedinski pushed a commit to tedinski/rmc that referenced this pull request Apr 26, 2022
…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
tedinski pushed a commit that referenced this pull request Apr 27, 2022
…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
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.

5 participants