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.

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

abort_internal is safe #72289

Merged
merged 1 commit into from
May 18, 2020
Merged

abort_internal is safe #72289

merged 1 commit into from
May 18, 2020

Conversation

RalfJung
Copy link
Member

sys::abort_internal is stably exposed as a safe function. Forward that assumption "inwards" to the sys module by making the function itself safe, too.

This corresponds to what #72204 did for the intrinsic. We should probably wait until that lands because some of the intrinsic calls in this PR might then need adjustments.

@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 17, 2020
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum left a comment

Choose a reason for hiding this comment

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

r=me but I agree it makes sense to wait and rebase atop the other PR, also left a nit.

src/libstd/alloc.rs Outdated Show resolved Hide resolved
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented May 17, 2020

📌 Commit bdbe35d has been approved by Mark-Simulacrum

@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 May 17, 2020
RalfJung added a commit to RalfJung/rust that referenced this pull request May 17, 2020
…ulacrum

abort_internal is safe

`sys::abort_internal` is stably exposed as a safe function. Forward that assumption "inwards" to the `sys` module by making the function itself safe, too.

This corresponds to what rust-lang#72204 did for the intrinsic. We should probably wait until that lands because some of the intrinsic calls in this PR might then need adjustments.
@RalfJung
Copy link
Member Author

Fixed SGX compilation.

@bors r=Mark-Simulacrum

@bors
Copy link
Contributor

bors commented May 17, 2020

📌 Commit 2764673 has been approved by Mark-Simulacrum

@RalfJung
Copy link
Member Author

@bors rollup-
('cause this failed a rollup before)

@bors
Copy link
Contributor

bors commented May 18, 2020

⌛ Testing commit 2764673 with merge 834d75db38f66b1f2e900118829f05d3b36c1e3e...

@RalfJung
Copy link
Member Author

yield
@bors retry

@bors
Copy link
Contributor

bors commented May 18, 2020

⌛ Testing commit 2764673 with merge 9e2a6a2...

@bors
Copy link
Contributor

bors commented May 18, 2020

☀️ Test successful - checks-azure
Approved by: Mark-Simulacrum
Pushing 9e2a6a2 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 18, 2020
@bors bors merged commit 9e2a6a2 into rust-lang:master May 18, 2020
@RalfJung RalfJung deleted the abort_internal branch May 21, 2020 08:00
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.

4 participants