Rollup of 5 pull requests by Centril · Pull Request #65817 · rust-lang/rust

Centril · 2019-10-25T15:26:15Z

Successful merges:

Make <*const/mut T>::offset_from const fn #63810 (Make <*const/mut T>::offset_from const fn)
Fill tracking issue number for array_value_iter #65799 (Fill tracking issue number for array_value_iter)
self-profiling: Update measureme to 0.4.0 and remove non-RAII methods from profiler. #65800 (self-profiling: Update measureme to 0.4.0 and remove non-RAII methods from profiler.)
Add [T]::as_ptr_range() and [T]::as_mut_ptr_range(). #65806 (Add [T]::as_ptr_range() and [T]::as_mut_ptr_range().)
SGX: Clear additional flag on enclave entry #65810 (SGX: Clear additional flag on enclave entry)

Failed merges:

r? @ghost

Co-Authored-By: Nikita Popov <nikita.ppv@googlemail.com>

Co-Authored-By: Ralf Jung <post@ralfj.de>

See rust-lang/rfcs#2791 for motivation.

@mjbshaw

…ng,nikic Make <*const/mut T>::offset_from `const fn` This reenables offset_of cc @mjbshaw after rust-lang#63075 broke it

@Centril

…er-tracking-issue, r=Centril Fill tracking issue number for `array_value_iter` Thanks for [noticing](rust-lang#62959 (comment))! r? @Centril

@wesleywiser

…=wesleywiser self-profiling: Update measureme to 0.4.0 and remove non-RAII methods from profiler. This PR removes all non-RAII based profiling methods from `SelfProfilerRef` 🎉 It also delegates the `TimingGuard` implementation to `measureme`, now that that is available there. r? @wesleywiser

…range, r=Centril Add [T]::as_ptr_range() and [T]::as_mut_ptr_range(). Implementation of rust-lang/rfcs#2791

SGX: Clear additional flag on enclave entry An attacker could set both the AC flag in CR0 as in rflags. This causes the enclave to perform an AEX upon a misaligned memory access, and an attacker learns some information about the internal enclave state. The AC flag in rflags is copied from userspace upon an enclave entry. Upon AEX it is copied and later restored. This patch forces the rflag.AC bit to be reset right after an enter.

Centril · 2019-10-25T15:28:04Z

@bors r+ p=5 rollup=never

bors · 2019-10-25T15:28:05Z

📌 Commit 3183d6b has been approved by Centril

bors · 2019-10-25T15:28:34Z

⌛ Testing commit 3183d6b with merge 379419f3c2febb9979a32a1a728ee15aa18fd7fb...

Centril · 2019-10-25T16:06:52Z

@bors r- retry

rust-highfive · 2019-10-25T16:53:20Z

The job x86_64-gnu-llvm-6.0 of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

2019-10-25T15:28:45.6576466Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-10-25T15:28:45.6782508Z ##[command]git config gc.auto 0
2019-10-25T15:28:45.6845336Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-10-25T15:28:45.6890933Z ##[command]git config --get-all http.proxy
2019-10-25T15:28:45.7030414Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/65817/merge:refs/remotes/pull/65817/merge
---
2019-10-25T16:25:31.5283618Z .................................................................................................... 1600/9254
2019-10-25T16:25:36.7601559Z .................................................................................................... 1700/9254
2019-10-25T16:25:48.3418535Z ..........................................................i...............i......................... 1800/9254
2019-10-25T16:25:55.4392460Z .................................................................................................... 1900/9254
2019-10-25T16:26:09.1902047Z ................................................iiiii............................................... 2000/9254
2019-10-25T16:26:19.2614370Z .................................................................................................... 2200/9254
2019-10-25T16:26:21.6862875Z .................................................................................................... 2300/9254
2019-10-25T16:26:25.1930055Z .................................................................................................... 2400/9254
2019-10-25T16:26:47.0179681Z .................................................................................................... 2500/9254
---
2019-10-25T16:29:28.0444938Z ...................................................i...............i................................ 4800/9254
2019-10-25T16:29:36.3591485Z .................................................................................................... 4900/9254
2019-10-25T16:29:44.5727666Z .................................................................................................... 5000/9254
2019-10-25T16:29:50.3047318Z .................................................................................................... 5100/9254
2019-10-25T16:30:00.0922822Z ....................................................ii.ii...........i............................... 5200/9254
2019-10-25T16:30:09.1298235Z .................................................................................................... 5400/9254
2019-10-25T16:30:17.8760032Z .................................................................................................... 5500/9254
2019-10-25T16:30:24.9094303Z ......................i............................................................................. 5600/9254
2019-10-25T16:30:30.4589884Z .................................................................................................... 5700/9254
2019-10-25T16:30:30.4589884Z .................................................................................................... 5700/9254
2019-10-25T16:30:41.6667853Z .................................................................................................... 5800/9254
2019-10-25T16:30:52.3167997Z ...................ii...i..ii...........i........................................................... 5900/9254
2019-10-25T16:31:12.3415279Z .................................................................................................... 6100/9254
2019-10-25T16:31:18.7151572Z .................................................................................................... 6200/9254
2019-10-25T16:31:18.7151572Z .................................................................................................... 6200/9254
2019-10-25T16:31:30.4683602Z ..........................................i..ii..................................................... 6300/9254
2019-10-25T16:31:51.3501306Z .................................................................................................... 6500/9254
2019-10-25T16:31:53.4247179Z .........i.......................................................................................... 6600/9254
2019-10-25T16:31:55.5194495Z ....................................................................................i............... 6700/9254
2019-10-25T16:31:58.0733471Z .................................................................................................... 6800/9254
---
2019-10-25T16:36:11.9392352Z finished in 5.360
2019-10-25T16:36:11.9568402Z Check compiletest suite=codegen mode=codegen (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-10-25T16:36:12.1144931Z 2019-10-25T16:36:12.1145710Z running 153 tests
2019-10-25T16:36:15.0809796Z i....iii......iii..iiii...i.............................i..i..................i....i...........ii.i. 100/153
2019-10-25T16:36:16.8855856Z i..iiii..............i.........iii.i.........ii......
2019-10-25T16:36:16.8857295Z 2019-10-25T16:36:16.8861804Z finished in 4.929
2019-10-25T16:36:16.9043704Z Check compiletest suite=codegen-units mode=codegen-units (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-10-25T16:36:17.0609924Z ---
2019-10-25T16:36:18.9413011Z finished in 2.036
2019-10-25T16:36:18.9582075Z Check compiletest suite=assembly mode=assembly (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-10-25T16:36:19.1136677Z 2019-10-25T16:36:19.1136916Z running 9 tests
2019-10-25T16:36:19.1137735Z iiiiiiiii
2019-10-25T16:36:19.1138150Z 2019-10-25T16:36:19.1138194Z finished in 0.155
2019-10-25T16:36:19.1315122Z Check compiletest suite=incremental mode=incremental (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-10-25T16:36:19.2890781Z ---
2019-10-25T16:36:36.2995171Z finished in 17.168
2019-10-25T16:36:36.3173133Z Check compiletest suite=debuginfo mode=debuginfo-gdb+lldb (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-10-25T16:36:36.4797495Z 2019-10-25T16:36:36.4798181Z running 123 tests
2019-10-25T16:36:59.4717713Z .iiiii...i.....i..i...i..i.i.i..i.ii..i.i.....i..i....ii..........iiii..........i...ii...i.......ii. 100/123
2019-10-25T16:37:03.8756089Z i.i.i......iii.i.....ii
2019-10-25T16:37:03.8756867Z 2019-10-25T16:37:03.8756916Z finished in 27.558
2019-10-25T16:37:03.8763212Z Uplifting stage1 rustc (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-10-25T16:37:03.8763559Z Copying stage2 rustc from stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu / x86_64-unknown-linux-gnu)
---
2019-10-25T16:48:43.2159688Z 2019-10-25T16:48:43.2160946Z Doc-tests core
2019-10-25T16:48:48.4122156Z 2019-10-25T16:48:48.4122916Z running 2408 tests
2019-10-25T16:48:59.0069897Z ......iiiii......................................................................................... 100/2408
2019-10-25T16:49:09.6393019Z ................................................................................ii.................. 200/2408
2019-10-25T16:49:34.1473320Z ..i................................................................................................. 400/2408
2019-10-25T16:49:34.1473320Z ..i................................................................................................. 400/2408
2019-10-25T16:49:44.0195127Z .................................................i..i.................iiii.......................... 500/2408
2019-10-25T16:50:03.0246157Z .................................................................................................... 700/2408
2019-10-25T16:50:12.7831488Z .................................................................................................... 800/2408
2019-10-25T16:50:22.6508251Z .................................................................................................... 900/2408
2019-10-25T16:50:32.4814165Z .................................................................................................... 1000/2408
---
2019-10-25T16:52:57.8517982Z ---- slice/mod.rs - slice::[T]::as_ptr_range (line 428) stdout ----
2019-10-25T16:52:57.8518042Z error[E0308]: mismatched types
2019-10-25T16:52:57.8518276Z --> slice/mod.rs:435:35
2019-10-25T16:52:57.8518323Z |
2019-10-25T16:52:57.8518414Z 10 | assert!(a.as_ptr_range().contains(x));
2019-10-25T16:52:57.8518683Z | ^ expected *-ptr, found integer
2019-10-25T16:52:57.8518731Z |
2019-10-25T16:52:57.8518791Z = note: expected type `&*const {integer}`
2019-10-25T16:52:57.8519042Z found type `&{integer}`
2019-10-25T16:52:57.8519116Z error[E0308]: mismatched types
2019-10-25T16:52:57.8519390Z --> slice/mod.rs:436:36
2019-10-25T16:52:57.8519435Z |
2019-10-25T16:52:57.8519435Z |
2019-10-25T16:52:57.8519479Z 11 | assert!(!a.as_ptr_range().contains(y));
2019-10-25T16:52:57.8519745Z | ^ expected *-ptr, found integer
2019-10-25T16:52:57.8519793Z |
2019-10-25T16:52:57.8519835Z = note: expected type `&*const {integer}`
2019-10-25T16:52:57.8520150Z found type `&{integer}`
2019-10-25T16:52:57.8520227Z error: aborting due to 2 previous errors
2019-10-25T16:52:57.8520254Z 2019-10-25T16:52:57.8520594Z For more information about this error, try `rustc --explain E0308`.
2019-10-25T16:52:57.8520822Z Couldn't compile the test.
---
2019-10-25T16:52:57.8525610Z 2019-10-25T16:52:57.8554154Z error: test failed, to rerun pass '--doc'
2019-10-25T16:52:57.8567752Z 2019-10-25T16:52:57.8568680Z 2019-10-25T16:52:57.8572980Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "-Zconfig-profile" "--target" "x86_64-unknown-linux-gnu" "-Zbinary-dep-depinfo" "-j" "2" "--release" "--locked" "--color" "always" "--features" "panic-unwind backtrace compiler-builtins-c" "--manifest-path" "/checkout/src/libtest/Cargo.toml" "-p" "core" "--" "--quiet"
2019-10-25T16:52:57.8573162Z 2019-10-25T16:52:57.8573193Z 2019-10-25T16:52:57.8579035Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2019-10-25T16:52:57.8579141Z Build completed unsuccessfully in 1:17:40
2019-10-25T16:52:57.8579141Z Build completed unsuccessfully in 1:17:40
2019-10-25T16:52:57.8631372Z == clock drift check ==
2019-10-25T16:52:57.8652750Z local time: Fri Oct 25 16:52:57 UTC 2019
2019-10-25T16:52:58.0269179Z network time: Fri, 25 Oct 2019 16:52:58 GMT
2019-10-25T16:52:58.0269793Z == end clock drift check ==
2019-10-25T16:52:58.5826817Z 2019-10-25T16:52:58.5956148Z ##[error]Bash exited with code '1'.
2019-10-25T16:52:58.5991068Z ##[section]Starting: Checkout
2019-10-25T16:52:58.5992777Z ==============================================================================
2019-10-25T16:52:58.5992832Z Task : Get sources
2019-10-25T16:52:58.5992880Z Description : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

oli-obkand others added 23 commits October 11, 2019 10:40

Make <*const/mut T>::offset_from const fn
88b5e94

Use dedicated method for getting the type size
4a51801
Co-Authored-By: Nikita Popov <nikita.ppv@googlemail.com>

Adjust const eval code to reflect offset_from docs
94a6d4b

Review nit
1c9d889
Co-Authored-By: Ralf Jung <post@ralfj.de>

Ignore a test on musl because its ui output differs
3956c48

Update ui output
bf83ecf

fixed ac vulnerability
fc50036

self-profiling: Remove unused methods from profiler.
f6aa64b

self-profiling: Update measureme to 0.4.0 and use new RAII-based API.
ee1173a

self-profiling: Switch query-blocking measurements to RAII-style API.
9c08306

Fill tracking issue number for array_value_iter and fix Rust version
dcf3436

Add [T]::as_ptr_range() and [T]::as_mut_ptr_range().
4936f96
See rust-lang/rfcs#2791 for motivation.

Add slice_ptr_range tracking issue number.
f1b69b0

removed unnecessary push
d257c20

cleaning up code
34f5d59

Explain why pointer::add in slice::as_ptr_range is safe.
de9b660

forgot pushfq/popqfq: fixed
5aafa98

Fix slice::as_ptr_range doctest.
225b245

Rollup merge ofrust-lang#63810- oli-obk:const_offset_from, r=RalfJu…
24bfee2
…ng,nikic Make <*const/mut T>::offset_from `const fn` This reenables offset_of cc @mjbshaw after rust-lang#63075 broke it

Rollup merge ofrust-lang#65799- LukasKalbertodt:fill-array-value-it…
affcac6
…er-tracking-issue, r=Centril Fill tracking issue number for `array_value_iter` Thanks for [noticing](rust-lang#62959 (comment))! r? @Centril

Rollup merge ofrust-lang#65806- fusion-engineering-forks:slice-ptr-…
520b771
…range, r=Centril Add [T]::as_ptr_range() and [T]::as_mut_ptr_range(). Implementation of rust-lang/rfcs#2791

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 25, 2019

Centril added the rollup A PR which is a rollup label Oct 25, 2019

Centril closed this Oct 25, 2019

Centril deleted the rollup-04ixuyh branch October 25, 2019 16:07

Navigation Menu

Uh oh!

Uh oh!

Rollup of 5 pull requests - #65817

Rollup of 5 pull requests#65817
Centril wants to merge 23 commits into
rust-lang:masterfrom
Centril:rollup-04ixuyh

Centril commented Oct 25, 2019

Uh oh!

Centril commented Oct 25, 2019

Uh oh!

bors commented Oct 25, 2019

Uh oh!

bors commented Oct 25, 2019

Uh oh!

Centril commented Oct 25, 2019

Uh oh!

rust-highfive commented Oct 25, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Uh oh!

Uh oh!

Conversation

Centril commented Oct 25, 2019

Uh oh!

Centril commented Oct 25, 2019

Uh oh!

bors commented Oct 25, 2019

Uh oh!

bors commented Oct 25, 2019

Uh oh!

Centril commented Oct 25, 2019

Uh oh!

rust-highfive commented Oct 25, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants