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

Rollup of 9 pull requests #73550

Merged
merged 27 commits into from
Jun 20, 2020
Merged

Rollup of 9 pull requests #73550

merged 27 commits into from
Jun 20, 2020

Conversation

RalfJung
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

Aaron1011 and others added 27 commits May 26, 2020 01:48
Fixes rust-lang#68104

Previous, we were encoding AnonConst as a regular Const, causing us to
treat them differently after being deserialized in another compilation
session.
This will run all tests for `riscv64gc-unknown-linux-gnu` in a QEMU
instance. This is based upon the armhf QEMU test image.
Thanks to jfrimmel for pointing this out

Co-authored-by: J. Frimmel <[email protected]>
The build is not actually needed often, and it can be added back on a
case-by-case basis if a specific PR needs access to it.
Insufficient sanitization of the x87 FPU tag word in the trusted enclave runtime allowed unprivileged adversaries in the containing host application to induce incoherent or unexpected results for ABI-compliant compiled enclave application code that uses the x87 FPU.

Vulnerability was disclosed to us by Fritz Alder, Jo Van Bulck, David Oswald and Frank Piessens
…r=varkor

Properly encode AnonConst into crate metadata

Fixes rust-lang#68104

Previous, we were encoding AnonConst as a regular Const, causing us to
treat them differently after being deserialized in another compilation
session.
remove leftover mentions of `skol` and `int` from the compiler

This PR mostly changes `skol` -> `placeholder` and all cases where `int` is used as a type to `i32`.
Support sanitizers on aarch64-unknown-linux-gnu
RISC-V Emulated Testing

Adds a disabled docker image on which to run RISC-V tests. Based on the armhf image.

Test using
```
./src/ci/docker/run.sh riscv64gc-linux
```

cc: @msizanoen1
…ulacrum

Update CFGuard syntax

Update the naming and syntax of the control-flow-guard option, as discussed in rust-lang#68793.

r? @Mark-Simulacrum
…ark-Simulacrum

ci: disable alt build during try builds

The alt build is not actually needed often, and it can be added back on a case-by-case basis if a specific PR needs access to it.

This will free up a builder.

r? @Mark-Simulacrum
…jethrogb

Prevent attacker from manipulating FPU tag word used in SGX enclave

Insufficient sanitization of the x87 FPU tag word in the trusted enclave runtime allowed unprivileged adversaries in the containing host application to induce incoherent or unexpected results for ABI-compliant compiled enclave application code that uses the x87 FPU.

Vulnerability was disclosed to us by Fritz Alder, Jo Van Bulck, David Oswald and Frank Piessens

cc: @jethrogb
…e-item, r=Mark-Simulacrum

Deprecate `Vec::remove_item`

In rust-lang#40062 we decided to remove that method. In rust-lang#71834 it was said that we want to deprecate it for a few cycles before removing it. That's what this PR does.
@RalfJung
Copy link
Member Author

@rustbot modify labels: +rollup
@bors r+ rollup=never p=9

@bors
Copy link
Contributor

bors commented Jun 20, 2020

📌 Commit bb0016b has been approved by RalfJung

@rustbot rustbot added the rollup A PR which is a rollup label Jun 20, 2020
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 20, 2020
@Aaron1011
Copy link
Member

@bors retry

@bors
Copy link
Contributor

bors commented Jun 20, 2020

⌛ Testing commit bb0016b with merge f455e46...

This was referenced Jun 20, 2020
@bors
Copy link
Contributor

bors commented Jun 20, 2020

☀️ Test successful - checks-azure
Approved by: RalfJung
Pushing f455e46 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 20, 2020
@bors bors merged commit f455e46 into rust-lang:master Jun 20, 2020
@RalfJung RalfJung deleted the rollup-5huj1k1 branch June 21, 2020 08:53
@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. rollup A PR which is a rollup 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.