Skip to content

fix caller_location intrinsic for Miri#73277

Merged
bors merged 1 commit into
rust-lang:masterfrom
RalfJung:miri-caller-location
Jun 13, 2020
Merged

fix caller_location intrinsic for Miri#73277
bors merged 1 commit into
rust-lang:masterfrom
RalfJung:miri-caller-location

Conversation

@RalfJung

Copy link
Copy Markdown
Member

Fixes #73272

r? @oli-obk Cc @Aaron1011

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 12, 2020
@RalfJung

RalfJung commented Jun 12, 2020

Copy link
Copy Markdown
Member Author

Let's land this ASAP to un-break Miri... latest shipped Miri is broken and even #73275 will not fix that (and most projects using Miri in their CI use "latest shipped Miri").
@bors p=1

@oli-obk

oli-obk commented Jun 12, 2020

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Jun 12, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit b4bd180 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 12, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Jun 12, 2020
@Dylan-DPC-zz

Copy link
Copy Markdown

@bors p=2

@bors

bors commented Jun 13, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit b4bd180 with merge 1fb612b...

@bors

bors commented Jun 13, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-azure
Approved by: oli-obk
Pushing 1fb612b to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 13, 2020
@bors bors merged commit 1fb612b into rust-lang:master Jun 13, 2020
@RalfJung RalfJung deleted the miri-caller-location branch June 13, 2020 09:00
@cuviper cuviper added this to the 1.46 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

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

Development

Successfully merging this pull request may close these issues.

caller_location ICEs in Miri

6 participants