Skip to content

Get rid of the fake stack frame for reading from constants - #57606

Merged
bors merged 5 commits into
rust-lang:masterfrom
oli-obk:shrink
Jan 25, 2019
Merged

Get rid of the fake stack frame for reading from constants#57606
bors merged 5 commits into
rust-lang:masterfrom
oli-obk:shrink

Conversation

@oli-obk

@oli-obkoli-obk commented Jan 14, 2019•
edited
Loading

Copy link
Copy Markdown
Contributor

r? @RalfJung

fixes the ice in #53708 but still keeps around the wrong "non-exhaustive match" error

cc @varkor

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 14, 2019
@RalfJung

RalfJung commented Jan 14, 2019

Copy link
Copy Markdown
Member

(I'm on a conference, and will start catching up with my emails on Jan 22nd.)

@oli-obk

oli-obk commented Jan 15, 2019

Copy link
Copy Markdown
ContributorAuthor

@bors try

@bors

bors commented Jan 15, 2019

Copy link
Copy Markdown
Collaborator

⌛ Trying commit b805232 with merge a5a18a4e3822d2c19cb9cc6752bcc8930f8162e8...

@oli-obk

oli-obk commented Jan 15, 2019

Copy link
Copy Markdown
ContributorAuthor

@rust-timer build a5a18a4e3822d2c19cb9cc6752bcc8930f8162e8

@rust-timer

rust-timer commented Jan 15, 2019

Copy link
Copy Markdown
Collaborator

Success: Queued a5a18a4e3822d2c19cb9cc6752bcc8930f8162e8 with parent 33e6df4, comparison URL.

@kennytm

This comment has been minimized.

Sign in to view
@bors

This comment has been minimized.

Sign in to view
bors added a commit that referenced this pull request Jan 15, 2019
@bors
Auto merge of#57606- oli-obk:shrink, r=<try>
c5b89bf
Get rid of the fake stack frame for reading from constants
r? @RalfJung
fixes the ice in #53708 but still keeps around the wrong "non-exhaustive match" error
cc @varkor
@bors

This comment has been minimized.

Sign in to view
@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-review Status: Awaiting review from the assignee but also interested parties. labels Jan 15, 2019
@kennytmkennytm 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 Jan 15, 2019
@rust-timer

rust-timer commented Jan 15, 2019

Copy link
Copy Markdown
Collaborator

Finished benchmarking try commit a5a18a4e3822d2c19cb9cc6752bcc8930f8162e8

RalfJung
RalfJung reviewed Jan 22, 2019
View reviewed changes
Comment threadsrc/librustc_mir/interpret/eval_context.rs Outdated
RalfJung
RalfJung reviewed Jan 22, 2019
View reviewed changes
Comment threadsrc/librustc_mir/interpret/eval_context.rs Outdated
@bors

bors commented Jan 22, 2019

Copy link
Copy Markdown
Collaborator

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

@RalfJung

RalfJung commented Jan 23, 2019

Copy link
Copy Markdown
Member

Thanks!

@bors r+

@bors

bors commented Jan 23, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit d4ee556 has been approved by RalfJung

@bors

bors commented Jan 23, 2019

Copy link
Copy Markdown
Collaborator

🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened

@borsbors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 23, 2019
@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 23, 2019
Centril added a commit to Centril/rust that referenced this pull request Jan 24, 2019
@Centril
Rollup merge ofrust-lang#57606- oli-obk:shrink, r=RalfJung
25f6171
Get rid of the fake stack frame for reading from constants
r? @RalfJung
fixes the ice in rust-lang#53708 but still keeps around the wrong "non-exhaustive match" error
cc @varkor
@CentrilCentril mentioned this pull request Jan 24, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Jan 24, 2019
@Centril
Rollup merge ofrust-lang#57606- oli-obk:shrink, r=RalfJung
8348f83
Get rid of the fake stack frame for reading from constants
r? @RalfJung
fixes the ice in rust-lang#53708 but still keeps around the wrong "non-exhaustive match" error
cc @varkor
@CentrilCentril mentioned this pull request Jan 24, 2019
Merged
bors added a commit that referenced this pull request Jan 24, 2019
@bors
Auto merge of#57879- Centril:rollup, r=Centril
278067d
Rollup of 9 pull requests
Successful merges:
- #57380 (Fix Instant/Duration math precision & associativity on Windows)
- #57606 (Get rid of the fake stack frame for reading from constants)
- #57803 (Several changes to libunwind for SGX target)
- #57846 (rustdoc: fix ICE from loading proc-macro stubs)
- #57860 (Add os::fortanix_sgx::ffi module)
- #57861 (Don't export table by default in wasm)
- #57863 (Add suggestion for incorrect field syntax.)
- #57867 (Fix std::future::from_generator documentation)
- #57873 (Stabilize no_panic_pow)
Failed merges:
r? @ghost
@bors
bors merged commit d4ee556 into rust-lang:masterJan 25, 2019
@pnkfelixpnkfelix mentioned this pull request Mar 4, 2019
Closed
@ehussehuss mentioned this pull request Jun 24, 2019
Closed
@oli-obk
oli-obk deleted the shrink branch June 15, 2020 15:30
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@RalfJungRalfJungRalfJung left review comments

Assignees

@RalfJungRalfJung

Labels

S-waiting-on-borsStatus: 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.

6 participants

@oli-obk@RalfJung@bors@rust-timer@kennytm@rust-highfive