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

Update toolchain to 2024-09-20 #3539

Merged

Conversation

tautschnig
Copy link
Member

Changes required due to:

Resolves: #3534

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

Changes required due to:
- rust-lang/rust@bdacdfe95f Minimize visibilities.

Resolves: model-checking#3534
@tautschnig tautschnig requested a review from a team as a code owner September 23, 2024 13:20
@github-actions github-actions bot added the Z-BenchCI Tag a PR to run benchmark CI label Sep 23, 2024
Copy link
Contributor

@qinheping qinheping left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it is OK to copy those functions in our code while waiting to see if they should be public in the upstream, and unblock the following toolchain updates.

Which way is better to remind us to review if these functions become pub in the future: mark them as FIXME, or create an issue to track them?

@tautschnig tautschnig added this pull request to the merge queue Sep 24, 2024
Merged via the queue into model-checking:main with commit 2755592 Sep 24, 2024
26 of 27 checks passed
@tautschnig tautschnig deleted the toolchain-2024-09-18-manual branch September 24, 2024 10:13
Copy link
Contributor

@celinval celinval left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you try the following solution instead?

In the if block from the link function, I would replace the body by a call to link_binary as other backend implementations do, e.g. here.

You will also need to implement the ArchiveBuilderBuilder trait. I believe a dummy implementation as this should work.

Let me know if that makes sense.

celinval added a commit to celinval/kani-dev that referenced this pull request Sep 24, 2024
@celinval
Copy link
Contributor

I guess it took me too long to post my comment. I created #3545 with the suggestion above.

github-merge-queue bot pushed a commit that referenced this pull request Sep 24, 2024
Replace the body by a call to link_binary as other backend
implementations do, e.g.
[rustc_codegen_gcc](https://github.com/rust-lang/rust/blob/648d024a7859e1ab7fdffe5e419b6e35ccb16a4a/compiler/rustc_codegen_gcc/src/lib.rs#L269-L271).
Also remove the implementation of `metadata_loader` which has a [default
body](https://github.com/rust-lang/rust/blob/11e760b7f4e4aaa11bf51a64d4bb7f1171f6e466/compiler/rustc_codegen_ssa/src/traits/backend.rs#L58-L60).

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

---------

Co-authored-by: Michael Tautschnig <tautschn@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Z-BenchCI Tag a PR to run benchmark CI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Toolchain upgrade to nightly-2024-09-18 failed
3 participants