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 5 pull requests #65812

Closed
wants to merge 22 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Oct 25, 2019

Successful merges:

Failed merges:

r? @ghost

oli-obk and others added 22 commits October 11, 2019 10:40
Co-Authored-By: Nikita Popov <nikita.ppv@googlemail.com>
Co-Authored-By: Ralf Jung <post@ralfj.de>
…ng,nikic

Make <*const/mut T>::offset_from `const fn`

This reenables offset_of cc @mjbshaw 	after rust-lang#63075 broke it
…er-tracking-issue, r=Centril

Fill tracking issue number for `array_value_iter`

Thanks for [noticing](rust-lang#62959 (comment))!

r? @Centril
…=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
Copy link
Contributor Author

Centril commented Oct 25, 2019

@bors r+ p=5 rollup=never

@bors
Copy link
Contributor

bors commented Oct 25, 2019

📌 Commit d043e95 has been approved by Centril

@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 Oct 25, 2019
@bors
Copy link
Contributor

bors commented Oct 25, 2019

⌛ Testing commit d043e95 with merge e470b0d6198661988f42e4e9aa6e1764b071aeec...

@Centril
Copy link
Contributor Author

Centril commented Oct 25, 2019

@bors r+ p=5 rollup=never

@bors
Copy link
Contributor

bors commented Oct 25, 2019

💡 This pull request was already approved, no need to approve it again.

@bors
Copy link
Contributor

bors commented Oct 25, 2019

📌 Commit d043e95 has been approved by Centril

@Centril Centril added the rollup A PR which is a rollup label Oct 25, 2019
@bors
Copy link
Contributor

bors commented Oct 25, 2019

⌛ Testing commit d043e95 with merge f74a956f64753fa1e4fb544d53e3349c5cca40a0...

@Centril
Copy link
Contributor Author

Centril commented Oct 25, 2019

@bors r- retry

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 25, 2019
@Centril Centril closed this Oct 25, 2019
@Centril Centril deleted the rollup-im0rq72 branch October 25, 2019 15:28
@rust-highfive
Copy link
Collaborator

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.

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)

@rust-highfive
Copy link
Collaborator

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-25T14:34:54.8884431Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-10-25T14:34:55.7897840Z ##[command]git config gc.auto 0
2019-10-25T14:34:55.7905002Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-10-25T14:34:55.7912663Z ##[command]git config --get-all http.proxy
2019-10-25T14:34:55.7915921Z ##[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/65812/merge:refs/remotes/pull/65812/merge
---
2019-10-25T15:35:39.9045033Z .................................................................................................... 1600/9254
2019-10-25T15:35:45.5140213Z .................................................................................................... 1700/9254
2019-10-25T15:35:58.2191903Z ..........................................................i...............i......................... 1800/9254
2019-10-25T15:36:05.8783541Z .................................................................................................... 1900/9254
2019-10-25T15:36:20.6545115Z ................................................iiiii............................................... 2000/9254
2019-10-25T15:36:31.4246655Z .................................................................................................... 2200/9254
2019-10-25T15:36:33.9935591Z .................................................................................................... 2300/9254
2019-10-25T15:36:37.7351647Z .................................................................................................... 2400/9254
2019-10-25T15:37:01.2327854Z .................................................................................................... 2500/9254
---
2019-10-25T15:39:54.0069574Z ...................................................i...............i................................ 4800/9254
2019-10-25T15:40:02.5494631Z .................................................................................................... 4900/9254
2019-10-25T15:40:11.2782124Z .................................................................................................... 5000/9254
2019-10-25T15:40:17.4577665Z .................................................................................................... 5100/9254
2019-10-25T15:40:27.9565882Z ....................................................ii.ii...........i............................... 5200/9254
2019-10-25T15:40:37.6094873Z .................................................................................................... 5400/9254
2019-10-25T15:40:47.0531639Z .................................................................................................... 5500/9254
2019-10-25T15:40:54.7246442Z ......................i............................................................................. 5600/9254
2019-10-25T15:41:00.5716077Z .................................................................................................... 5700/9254
2019-10-25T15:41:00.5716077Z .................................................................................................... 5700/9254
2019-10-25T15:41:12.4089445Z .................................................................................................... 5800/9254
2019-10-25T15:41:23.7241741Z ...................ii...i..ii...........i........................................................... 5900/9254
2019-10-25T15:41:45.2101268Z .................................................................................................... 6100/9254
2019-10-25T15:41:50.4112993Z .................................................................................................... 6200/9254
2019-10-25T15:41:50.4112993Z .................................................................................................... 6200/9254
2019-10-25T15:42:03.1974098Z ..........................................i..ii..................................................... 6300/9254
2019-10-25T15:42:25.5309760Z .................................................................................................... 6500/9254
2019-10-25T15:42:27.7105301Z .........i.......................................................................................... 6600/9254
2019-10-25T15:42:29.8957170Z ....................................................................................i............... 6700/9254
2019-10-25T15:42:32.6375520Z .................................................................................................... 6800/9254
---
2019-10-25T15:47:04.3804733Z  finished in 5.566
2019-10-25T15:47:04.3987643Z Check compiletest suite=codegen mode=codegen (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-10-25T15:47:04.5585752Z 
2019-10-25T15:47:04.5587176Z running 153 tests
2019-10-25T15:47:07.7413165Z i....iii......iii..iiii...i.............................i..i..................i....i...........ii.i. 100/153
2019-10-25T15:47:09.6989889Z i..iiii..............i.........iii.i.........ii......
2019-10-25T15:47:09.6992353Z 
2019-10-25T15:47:09.6994424Z  finished in 5.300
2019-10-25T15:47:09.7189999Z Check compiletest suite=codegen-units mode=codegen-units (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-10-25T15:47:09.8811053Z 
---
2019-10-25T15:47:11.8973162Z  finished in 2.178
2019-10-25T15:47:11.9150035Z Check compiletest suite=assembly mode=assembly (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-10-25T15:47:12.0889556Z 
2019-10-25T15:47:12.0889826Z running 9 tests
2019-10-25T15:47:12.0890675Z iiiiiiiii
2019-10-25T15:47:12.0891120Z 
2019-10-25T15:47:12.0891170Z  finished in 0.173
2019-10-25T15:47:12.1089059Z Check compiletest suite=incremental mode=incremental (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-10-25T15:47:12.2756659Z 
---
2019-10-25T15:47:30.4684380Z  finished in 18.359
2019-10-25T15:47:30.4885046Z Check compiletest suite=debuginfo mode=debuginfo-gdb+lldb (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-10-25T15:47:30.6523885Z 
2019-10-25T15:47:30.6525551Z running 123 tests
2019-10-25T15:47:55.9629555Z .iiiii...i.....i..i...i..i.i.i..i.ii..i.i.....i..i....ii..........iiii..........i...ii...i.......ii. 100/123
2019-10-25T15:48:00.8080725Z i.i.i......iii.i.....ii
2019-10-25T15:48:00.8081451Z 
2019-10-25T15:48:00.8087371Z  finished in 30.320
2019-10-25T15:48:00.8099338Z Uplifting stage1 rustc (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-10-25T15:48:00.8099745Z Copying stage2 rustc from stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu / x86_64-unknown-linux-gnu)
---
2019-10-25T16:00:37.7584773Z 
2019-10-25T16:00:37.7585557Z    Doc-tests core
2019-10-25T16:00:42.8904316Z 
2019-10-25T16:00:42.8905075Z running 2408 tests
2019-10-25T16:00:53.8912747Z ......iiiii......................................................................................... 100/2408
2019-10-25T16:01:04.8529628Z ................................................................................ii.................. 200/2408
2019-10-25T16:01:30.3694214Z ..i................................................................................................. 400/2408
2019-10-25T16:01:30.3694214Z ..i................................................................................................. 400/2408
2019-10-25T16:01:41.0406535Z .................................................i..i.................iiii.......................... 500/2408
2019-10-25T16:02:01.3824801Z .................................................................................................... 700/2408
2019-10-25T16:02:11.7633977Z .................................................................................................... 800/2408
2019-10-25T16:02:22.1353434Z .................................................................................................... 900/2408
2019-10-25T16:02:32.6258299Z .................................................................................................... 1000/2408
---
2019-10-25T16:05:05.9752007Z ---- slice/mod.rs - slice::[T]::as_ptr_range (line 428) stdout ----
2019-10-25T16:05:05.9752468Z error[E0658]: use of unstable library feature 'slice_ptr_range'
2019-10-25T16:05:05.9752730Z  --> slice/mod.rs:432:11
2019-10-25T16:05:05.9752807Z   |
2019-10-25T16:05:05.9752891Z 7 | assert!(a.as_ptr_range().contains(x));
2019-10-25T16:05:05.9752989Z   |
2019-10-25T16:05:05.9752989Z   |
2019-10-25T16:05:05.9753463Z   = note: for more information, see ***/issues/65807
2019-10-25T16:05:05.9753533Z   = help: add `#![feature(slice_ptr_range)]` to the crate attributes to enable
2019-10-25T16:05:05.9753641Z error[E0308]: mismatched types
2019-10-25T16:05:05.9753910Z  --> slice/mod.rs:432:35
2019-10-25T16:05:05.9754835Z   |
2019-10-25T16:05:05.9754835Z   |
2019-10-25T16:05:05.9755180Z 7 | assert!(a.as_ptr_range().contains(x));
2019-10-25T16:05:05.9755603Z   |                                   ^ expected *-ptr, found integer
2019-10-25T16:05:05.9755659Z   |
2019-10-25T16:05:05.9755710Z   = note: expected type `&*const {integer}`
2019-10-25T16:05:05.9755785Z              found type `&{integer}`
2019-10-25T16:05:05.9756114Z error[E0658]: use of unstable library feature 'slice_ptr_range'
2019-10-25T16:05:05.9756525Z  --> slice/mod.rs:433:12
2019-10-25T16:05:05.9756586Z   |
2019-10-25T16:05:05.9756586Z   |
2019-10-25T16:05:05.9756635Z 8 | assert!(!a.as_ptr_range().contains(y));
2019-10-25T16:05:05.9756749Z   |
2019-10-25T16:05:05.9756749Z   |
2019-10-25T16:05:05.9757147Z   = note: for more information, see ***/issues/65807
2019-10-25T16:05:05.9757238Z   = help: add `#![feature(slice_ptr_range)]` to the crate attributes to enable
2019-10-25T16:05:05.9757331Z error[E0308]: mismatched types
2019-10-25T16:05:05.9757627Z  --> slice/mod.rs:433:36
2019-10-25T16:05:05.9757714Z   |
2019-10-25T16:05:05.9757714Z   |
2019-10-25T16:05:05.9757767Z 8 | assert!(!a.as_ptr_range().contains(y));
2019-10-25T16:05:05.9758095Z   |                                    ^ expected *-ptr, found integer
2019-10-25T16:05:05.9758172Z   |
2019-10-25T16:05:05.9758225Z   = note: expected type `&*const {integer}`
2019-10-25T16:05:05.9758280Z              found type `&{integer}`
2019-10-25T16:05:05.9758386Z error: aborting due to 4 previous errors
2019-10-25T16:05:05.9758430Z 
2019-10-25T16:05:05.9758484Z Some errors have detailed explanations: E0308, E0658.
2019-10-25T16:05:05.9758809Z For more information about an error, try `rustc --explain E0308`.
---
2019-10-25T16:05:05.9759695Z 
2019-10-25T16:05:05.9804022Z error: test failed, to rerun pass '--doc'
2019-10-25T16:05:05.9824130Z 
2019-10-25T16:05:05.9824329Z 
2019-10-25T16:05:05.9826518Z 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:05:05.9827087Z 
2019-10-25T16:05:05.9827272Z 
2019-10-25T16:05:05.9840042Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2019-10-25T16:05:05.9840246Z Build completed unsuccessfully in 1:23:33
2019-10-25T16:05:05.9840246Z Build completed unsuccessfully in 1:23:33
2019-10-25T16:05:05.9902144Z == clock drift check ==
2019-10-25T16:05:05.9918919Z   local time: Fri Oct 25 16:05:05 UTC 2019
2019-10-25T16:05:06.2703865Z   network time: Fri, 25 Oct 2019 16:05:06 GMT
2019-10-25T16:05:06.2709140Z == end clock drift check ==
2019-10-25T16:05:06.8707952Z 
2019-10-25T16:05:06.8825403Z ##[error]Bash exited with code '1'.
2019-10-25T16:05:06.8895087Z ##[section]Starting: Checkout
2019-10-25T16:05:06.8898031Z ==============================================================================
2019-10-25T16:05:06.8898097Z Task         : Get sources
2019-10-25T16:05:06.8898168Z 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)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

8 participants