Skip to content

Miri Frame: use mir::Location to represent position in function - #71475

Merged
bors merged 1 commit into
rust-lang:masterfrom
RalfJung:miri-frame-loc
Apr 24, 2020
Merged

Miri Frame: use mir::Location to represent position in function#71475
bors merged 1 commit into
rust-lang:masterfrom
RalfJung:miri-frame-loc

Conversation

@RalfJung

Copy link
Copy Markdown
Member

I only recently learned that Location exists, and it seems to perfectly fit what Miri needs to represent which statement we are currently executing. :)

r? @ecstatic-morse

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 23, 2020
@ecstatic-morse

Copy link
Copy Markdown
Contributor

r=me once CI is green.

@bors delegate+

@bors

bors commented Apr 23, 2020

Copy link
Copy Markdown
Collaborator

✌️ @RalfJung can now approve this pull request

@RalfJung

Copy link
Copy Markdown
MemberAuthor

@bors r=ecstatic-morse

@bors

bors commented Apr 23, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 90f1131 has been approved by ecstatic-morse

@borsbors 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 Apr 23, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 24, 2020
Rollup of 5 pull requests
Successful merges:
- rust-lang#71235 (Tweak `'static` suggestion code)
- rust-lang#71318 (miri-unleash tests: ensure they fire even with 'allow(const_err)')
- rust-lang#71428 (Let compiletest recognize gdb 10.x)
- rust-lang#71475 (Miri Frame: use mir::Location to represent position in function)
- rust-lang#71476 (more compact way to adjust test sizes for Miri)
Failed merges:
r? @ghost
@bors

bors commented Apr 24, 2020

Copy link
Copy Markdown
Collaborator

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

@borsbors 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 Apr 24, 2020
@bors
bors merged commit aa9053a into rust-lang:masterApr 24, 2020
@RalfJung
RalfJung deleted the miri-frame-loc branch April 24, 2020 15:58
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-authorStatus: This is awaiting some action (such as code changes or more information) from the author.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@RalfJung@ecstatic-morse@bors@rust-highfive