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 "type_name" support in emulate_intrinsic() #61498

Merged
merged 4 commits into from
Jun 5, 2019
Merged

Add "type_name" support in emulate_intrinsic() #61498

merged 4 commits into from
Jun 5, 2019

Conversation

TankhouseAle
Copy link
Contributor

@TankhouseAle TankhouseAle commented Jun 3, 2019 •
edited
Loading

I did some dumb Git things and deleted my original fork repo semi-accidentally (but probably for the best as I'd messed up the history.)

This is the same issue as #61399, which was obviously auto-closed, to be clear.

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @cramertj (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 3, 2019
@cramertj
Copy link
Member

cramertj commented Jun 3, 2019

r? @oli-obk since they reveiwed #61399.

@rust-highfive rust-highfive assigned oli-obk and unassigned cramertj Jun 3, 2019
@TankhouseAle TankhouseAle mentioned this pull request Jun 3, 2019
Closed
oli-obk
oli-obk requested changes Jun 4, 2019
View reviewed changes
Copy link
Contributor

@oli-obk oli-obk left a comment

Choose a reason for hiding this comment

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

lgtm.

Please remove the str_to_immediate function, since it is now not necessary anymore (miri can remove its use of it)

@TankhouseAle
Copy link
Contributor Author

TankhouseAle commented Jun 4, 2019 •
edited
Loading

Please remove the str_to_immediate function, since it is now not necessary anymore (miri can remove its use of it)

Ralf already did that, in this commit, which was merged I believe shortly before (or sometime shortly after) I initially submitted issue #61399.

My implementation of type_name() actually uses the tag_static_base_pointer() function introduced in that same commit that removed str_to_immediate(), for example.

@oli-obk
Copy link
Contributor

oli-obk commented Jun 4, 2019

concurrency is hard 😄 thanks for the details!

@bors r+

@bors
Copy link
Contributor

bors commented Jun 4, 2019

📌 Commit 70aeb22 has been approved by oli-obk

@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 Jun 4, 2019
Centril added a commit to Centril/rust that referenced this pull request Jun 4, 2019
@Centril
Rollup merge of rust-lang#61498 - TankhouseAle:const-fn-type-name, r=…
a898de2 
…oli-obk

Add "type_name" support in emulate_intrinsic()

I did some dumb Git things and deleted my original fork repo semi-accidentally (but probably for the best as I'd messed up the history.)

This is the same issue as rust-lang#61399, which was obviously auto-closed, to be clear.
@Centril Centril mentioned this pull request Jun 4, 2019
Closed
@TankhouseAle
Copy link
Contributor Author

TankhouseAle commented Jun 4, 2019 •
edited
Loading

concurrency is hard 😄 thanks for the details!

No problem.

@RalfJung RalfJung mentioned this pull request Jun 5, 2019
Merged
@bors
Copy link
Contributor

bors commented Jun 5, 2019

⌛ Testing commit 70aeb22 with merge 47f4975...

bors added a commit that referenced this pull request Jun 5, 2019
@bors
Auto merge of #61498 - TankhouseAle:const-fn-type-name, r=oli-obk
47f4975 
Add "type_name" support in emulate_intrinsic()

I did some dumb Git things and deleted my original fork repo semi-accidentally (but probably for the best as I'd messed up the history.)

This is the same issue as #61399, which was obviously auto-closed, to be clear.
@bors
Copy link
Contributor

bors commented Jun 5, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: oli-obk
Pushing 47f4975 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 5, 2019
@bors bors merged commit 70aeb22 into rust-lang:master Jun 5, 2019
ecstatic-morse added a commit to ecstatic-morse/miri that referenced this pull request Jun 6, 2019
@ecstatic-morse
Use in-core implementation of type_name.
d49e270 
We bump `rust-version` to pick up the new impl from
rust-lang/rust#61498 and add a test.
ecstatic-morse added a commit to ecstatic-morse/miri that referenced this pull request Jun 6, 2019
@ecstatic-morse
Use in-core implementation of type_name.
1ceb81b 
We bump `rust-version` to pick up the new impl from
rust-lang/rust#61498 and add a test.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oli-obk oli-obk oli-obk approved these changes

Assignees

@oli-obk oli-obk

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@TankhouseAle @rust-highfive @cramertj @oli-obk @bors