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.

Sign up for GitHub

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

Jump to bottom

Add method to get instance instantiation arguments #119141

Merged
merged 1 commit into from
Dec 21, 2023
Merged

Add method to get instance instantiation arguments #119141

merged 1 commit into from
Dec 21, 2023

Conversation

celinval
Copy link
Contributor

Add a method to get the instance instantiation arguments, and include that information in the instance debug.

@rustbot
Copy link
Collaborator

rustbot commented Dec 19, 2023

r? @ouz-a

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Dec 19, 2023
@rustbot
Copy link
Collaborator

rustbot commented Dec 19, 2023

This PR changes Stable MIR

cc @oli-obk, @celinval, @spastorino, @ouz-a

@celinval celinval mentioned this pull request Dec 19, 2023
Merged
@compiler-errors
Copy link
Member

r? compiler-errors @bors r+ rollup

@bors
Copy link
Contributor

bors commented Dec 19, 2023

📌 Commit 2fd4c26 has been approved by compiler-errors

It is now in the queue for this repository.

@rustbot rustbot assigned compiler-errors and unassigned ouz-a Dec 19, 2023
@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 19, 2023
This was referenced Dec 19, 2023
Closed
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 20, 2023
@bors
Auto merge of rust-lang#119144 - compiler-errors:rollup-uhlhzvn, r=co…
10ee529 
…mpiler-errors

Rollup of 4 pull requests

Successful merges:

 - rust-lang#119026 (std::net::bind using -1 for openbsd which in turn sets it to somaxconn.)
 - rust-lang#119094 (Add function ABI and type layout to StableMIR)
 - rust-lang#119102 (Add arm-none-eabi and armv7r-none-eabi platform-support documentation.)
 - rust-lang#119107 (subtype_predicate: remove unnecessary probe)

Failed merges:

 - rust-lang#119141 (Add method to get instance instantiation arguments)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr matthiaskrgr mentioned this pull request Dec 20, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 20, 2023
@bors
Auto merge of rust-lang#119156 - matthiaskrgr:rollup-482ow65, r=matth…
3e4a15e 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#118691 (Add check for possible CStr literals in pre-2021)
 - rust-lang#118973 (rustc_codegen_ssa: Don't drop `IncorrectCguReuseType` , make `rustc_expected_cgu_reuse` attr work)
 - rust-lang#119071 (-Znext-solver: adapt overflow rules to avoid breakage)
 - rust-lang#119089 (effects: fix a comment)
 - rust-lang#119094 (Add function ABI and type layout to StableMIR)
 - rust-lang#119102 (Add arm-none-eabi and armv7r-none-eabi platform-support documentation.)
 - rust-lang#119107 (subtype_predicate: remove unnecessary probe)

Failed merges:

 - rust-lang#119135 (Fix crash due to `CrateItem::kind()` not handling constructors)
 - rust-lang#119141 (Add method to get instance instantiation arguments)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Contributor

bors commented Dec 20, 2023

☔ The latest upstream changes (presumably #119156) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 20, 2023
@bors
Copy link
Contributor

bors commented Dec 20, 2023

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout smir-instance-args (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self smir-instance-args --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message 
Auto-merging compiler/stable_mir/src/mir/mono.rs
Auto-merging compiler/stable_mir/src/compiler_interface.rs
Auto-merging compiler/rustc_smir/src/rustc_smir/context.rs
CONFLICT (content): Merge conflict in compiler/rustc_smir/src/rustc_smir/context.rs
Automatic merge failed; fix conflicts and then commit the result.

@celinval
Copy link
Contributor Author

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 20, 2023
@compiler-errors
Copy link
Member

For the record, when you deal with minor rebasing conflicts where none of the logic changes, feel free to r=me immediately. Those are generally uncontroversial.

@bors r+

@bors
Copy link
Contributor

bors commented Dec 20, 2023

📌 Commit e0a4693 has been approved by compiler-errors

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 20, 2023
@matthiaskrgr matthiaskrgr mentioned this pull request Dec 20, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 21, 2023
@bors
Auto merge of rust-lang#119170 - matthiaskrgr:rollup-nllgdf2, r=matth…
3694a6b 
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#119135 (Fix crash due to `CrateItem::kind()` not handling constructors)
 - rust-lang#119141 (Add method to get instance instantiation arguments)
 - rust-lang#119145 (Give `VariantData::Struct`  named fields, to clairfy `recovered`.)
 - rust-lang#119167 (E0761: module directory has .rs suffix)
 - rust-lang#119168 (resolve: Stop feeding visibilities for import list stems)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit f6a04f6 into rust-lang:master Dec 21, 2023
11 checks passed
@rustbot rustbot added this to the 1.76.0 milestone Dec 21, 2023
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Dec 21, 2023
@rust-timer
Unrolled build for rust-lang#119141
3a603af 
Rollup merge of rust-lang#119141 - celinval:smir-instance-args, r=compiler-errors

Add method to get instance instantiation arguments

Add a method to get the instance instantiation arguments, and include that information in the instance debug.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@compiler-errors compiler-errors

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.76.0
Development

Successfully merging this pull request may close these issues.
5 participants
@celinval @rustbot @compiler-errors @bors @ouz-a