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

Split up ptr/mod.rs in libcore... #67163

Merged
merged 1 commit into from
Dec 21, 2019
Merged

Conversation

TheSamsa
Copy link
Contributor

@TheSamsa TheSamsa commented Dec 8, 2019

...one with implementation detail for const ptr and the other with mut ptr

I am not sure if the "stable since 1.0.0" flags are the correct choice for the two additional mods.
Also, is it necessary for them to be "pub"? If so, there should be a good description for them.

Closes #66891

@rust-highfive
Copy link
Collaborator

r? @withoutboats

(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 Dec 8, 2019
@Mark-Simulacrum
Copy link
Member

r? @Mark-Simulacrum

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-7 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-12-08T20:52:43.4830419Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-12-08T20:52:43.5040454Z ##[command]git config gc.auto 0
2019-12-08T20:52:44.2849581Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-12-08T20:52:44.2859875Z ##[command]git config --get-all http.proxy
2019-12-08T20:52:44.2866731Z ##[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/67163/merge:refs/remotes/pull/67163/merge
---
2019-12-08T21:54:09.1049560Z .................................................................................................... 1600/9337
2019-12-08T21:54:13.7853862Z ...................................................................F................................ 1700/9337
2019-12-08T21:54:25.9341807Z ...............................................i.................................................... 1800/9337
2019-12-08T21:54:34.1210427Z .................................................................................................... 1900/9337
2019-12-08T21:54:48.1553508Z ................................iiiii............................................................... 2000/9337
2019-12-08T21:54:58.1952226Z .................................................................................................... 2200/9337
2019-12-08T21:55:00.7407554Z .................................................................................................... 2300/9337
2019-12-08T21:55:05.1018637Z .................................................................................................... 2400/9337
2019-12-08T21:55:26.9711939Z .................................................................................................... 2500/9337
---
2019-12-08T21:58:06.2301119Z ...................................i...............i................................................ 4800/9337
2019-12-08T21:58:15.9874297Z .................................................................................................... 4900/9337
2019-12-08T21:58:22.8196362Z ...............................................................................i.................... 5000/9337
2019-12-08T21:58:29.0789663Z .................................................................................................... 5100/9337
2019-12-08T21:58:38.6304950Z ............................................ii.ii...........i....................................... 5200/9337
2019-12-08T21:58:48.2374390Z .................................................................................................... 5400/9337
2019-12-08T21:58:58.0403756Z .................................................................................................... 5500/9337
2019-12-08T21:59:05.1624480Z ..........................i......................................................................... 5600/9337
2019-12-08T21:59:11.4462159Z .................................................................................................... 5700/9337
2019-12-08T21:59:11.4462159Z .................................................................................................... 5700/9337
2019-12-08T21:59:23.3890425Z .................................................................................................... 5800/9337
2019-12-08T21:59:34.6298151Z .............ii...i..ii...........i................................................................. 5900/9337
2019-12-08T21:59:52.5768396Z .................................................................................................... 6100/9337
2019-12-08T22:00:00.3648276Z .................................................................................................... 6200/9337
2019-12-08T22:00:00.3648276Z .................................................................................................... 6200/9337
2019-12-08T22:00:19.0551927Z ....................................i..ii........................................................... 6300/9337
2019-12-08T22:00:39.9483044Z .................................................................................................... 6500/9337
2019-12-08T22:00:42.0850838Z ........i........................................................................................... 6600/9337
2019-12-08T22:00:44.3786112Z ...................................................................................................i 6700/9337
2019-12-08T22:00:46.9695992Z .................................................................................................... 6800/9337
---
2019-12-08T22:02:26.7609321Z .................................................................................................... 7400/9337
2019-12-08T22:02:31.9252676Z .................................................................................................... 7500/9337
2019-12-08T22:02:39.1790638Z .................................................................................................... 7600/9337
2019-12-08T22:02:50.1228126Z .................................................................................................... 7700/9337
2019-12-08T22:02:56.4300122Z ...............iiii................................................................................. 7800/9337
2019-12-08T22:03:10.5233410Z .................................................................................................... 8000/9337
2019-12-08T22:03:22.1276176Z .................................................................................................... 8100/9337
2019-12-08T22:03:34.8059542Z .................................................................................................... 8200/9337
2019-12-08T22:03:41.6399272Z .................................................................................................... 8300/9337
---
2019-12-08T22:05:36.9681973Z 
2019-12-08T22:05:36.9683101Z ---- [ui] ui/consts/offset_from_ub.rs stdout ----
2019-12-08T22:05:36.9683314Z diff of stderr:
2019-12-08T22:05:36.9683948Z 
2019-12-08T22:05:36.9684093Z 1 error: any use of this value will cause an error
2019-12-08T22:05:36.9684645Z -   --> $SRC_DIR/libcore/ptr/mod.rs:LL:COL
2019-12-08T22:05:36.9684938Z +   --> $SRC_DIR/libcore/ptr/const_ptr.rs:LL:COL
2019-12-08T22:05:36.9685124Z 3    |
2019-12-08T22:05:36.9685171Z 4 LL |           intrinsics::ptr_offset_from(self, origin)
2019-12-08T22:05:36.9685255Z 
2019-12-08T22:05:36.9685313Z 6    |           |
2019-12-08T22:05:36.9685363Z 7    |           ptr_offset_from cannot compute offset of pointers into different allocations.
2019-12-08T22:05:36.9685363Z 7    |           ptr_offset_from cannot compute offset of pointers into different allocations.
2019-12-08T22:05:36.9685706Z -    |           inside call to `std::ptr::<impl *const Struct>::offset_from` at $DIR/offset_from_ub.rs:19:27
2019-12-08T22:05:36.9685791Z +    |           inside call to `std::ptr::const_ptr::<impl *const Struct>::offset_from` at $DIR/offset_from_ub.rs:19:27
2019-12-08T22:05:36.9685841Z 9    | 
2019-12-08T22:05:36.9685886Z 10   ::: $DIR/offset_from_ub.rs:13:1
2019-12-08T22:05:36.9685981Z 
2019-12-08T22:05:36.9686240Z 21    = note: `#[deny(const_err)]` on by default
2019-12-08T22:05:36.9686315Z 22 
2019-12-08T22:05:36.9686360Z 23 error: any use of this value will cause an error
2019-12-08T22:05:36.9686360Z 23 error: any use of this value will cause an error
2019-12-08T22:05:36.9686655Z -   --> $SRC_DIR/libcore/ptr/mod.rs:LL:COL
2019-12-08T22:05:36.9686896Z +   --> $SRC_DIR/libcore/ptr/const_ptr.rs:LL:COL
2019-12-08T22:05:36.9686959Z 25    |
2019-12-08T22:05:36.9687003Z 26 LL |           intrinsics::ptr_offset_from(self, origin)
2019-12-08T22:05:36.9687098Z 
2019-12-08T22:05:36.9687138Z 28    |           |
2019-12-08T22:05:36.9687186Z 29    |           a memory access tried to interpret some bytes as a pointer
2019-12-08T22:05:36.9687186Z 29    |           a memory access tried to interpret some bytes as a pointer
2019-12-08T22:05:36.9687503Z -    |           inside call to `std::ptr::<impl *const u8>::offset_from` at $DIR/offset_from_ub.rs:25:14
2019-12-08T22:05:36.9687567Z +    |           inside call to `std::ptr::const_ptr::<impl *const u8>::offset_from` at $DIR/offset_from_ub.rs:25:14
2019-12-08T22:05:36.9687740Z 31    | 
2019-12-08T22:05:36.9687806Z 32   ::: $DIR/offset_from_ub.rs:23:1
2019-12-08T22:05:36.9687875Z 
2019-12-08T22:05:36.9688119Z 38    | |__-
2019-12-08T22:05:36.9688180Z 39 
2019-12-08T22:05:36.9688225Z 40 error: any use of this value will cause an error
2019-12-08T22:05:36.9688225Z 40 error: any use of this value will cause an error
2019-12-08T22:05:36.9688462Z -   --> $SRC_DIR/libcore/ptr/mod.rs:LL:COL
2019-12-08T22:05:36.9688714Z +   --> $SRC_DIR/libcore/ptr/const_ptr.rs:LL:COL
2019-12-08T22:05:36.9688760Z 42    |
2019-12-08T22:05:36.9688803Z 43 LL |           intrinsics::ptr_offset_from(self, origin)
2019-12-08T22:05:36.9688896Z 
2019-12-08T22:05:36.9688936Z 45    |           |
2019-12-08T22:05:36.9688936Z 45    |           |
2019-12-08T22:05:36.9688983Z 46    |           exact_div: 1 cannot be divided by 2 without remainder
2019-12-08T22:05:36.9689297Z -    |           inside call to `std::ptr::<impl *const u16>::offset_from` at $DIR/offset_from_ub.rs:33:14
2019-12-08T22:05:36.9689379Z +    |           inside call to `std::ptr::const_ptr::<impl *const u16>::offset_from` at $DIR/offset_from_ub.rs:33:14
2019-12-08T22:05:36.9689426Z 48    | 
2019-12-08T22:05:36.9689483Z 49   ::: $DIR/offset_from_ub.rs:28:1
2019-12-08T22:05:36.9689550Z 
2019-12-08T22:05:36.9689751Z 58    | |__-
2019-12-08T22:05:36.9689811Z 59 
2019-12-08T22:05:36.9689855Z 60 error: any use of this value will cause an error
2019-12-08T22:05:36.9689855Z 60 error: any use of this value will cause an error
2019-12-08T22:05:36.9690086Z -   --> $SRC_DIR/libcore/ptr/mod.rs:LL:COL
2019-12-08T22:05:36.9690334Z +   --> $SRC_DIR/libcore/ptr/const_ptr.rs:LL:COL
2019-12-08T22:05:36.9690380Z 62    |
2019-12-08T22:05:36.9690424Z 63 LL |           intrinsics::ptr_offset_from(self, origin)
2019-12-08T22:05:36.9690516Z 
2019-12-08T22:05:36.9690556Z 65    |           |
2019-12-08T22:05:36.9690599Z 66    |           invalid use of NULL pointer
2019-12-08T22:05:36.9690599Z 66    |           invalid use of NULL pointer
2019-12-08T22:05:36.9690926Z -    |           inside call to `std::ptr::<impl *const u8>::offset_from` at $DIR/offset_from_ub.rs:39:14
2019-12-08T22:05:36.9690991Z +    |           inside call to `std::ptr::const_ptr::<impl *const u8>::offset_from` at $DIR/offset_from_ub.rs:39:14
2019-12-08T22:05:36.9691037Z 68    | 
2019-12-08T22:05:36.9691094Z 69   ::: $DIR/offset_from_ub.rs:36:1
2019-12-08T22:05:36.9691160Z 
2019-12-08T22:05:36.9691360Z 76    | |__-
2019-12-08T22:05:36.9691419Z 77 
2019-12-08T22:05:36.9691462Z 78 error: any use of this value will cause an error
2019-12-08T22:05:36.9691462Z 78 error: any use of this value will cause an error
2019-12-08T22:05:36.9691692Z -   --> $SRC_DIR/libcore/ptr/mod.rs:LL:COL
2019-12-08T22:05:36.9691939Z +   --> $SRC_DIR/libcore/ptr/const_ptr.rs:LL:COL
2019-12-08T22:05:36.9691984Z 80    |
2019-12-08T22:05:36.9692027Z 81 LL |           intrinsics::ptr_offset_from(self, origin)
2019-12-08T22:05:36.9692119Z 
2019-12-08T22:05:36.9692158Z 83    |           |
2019-12-08T22:05:36.9692299Z 84    |           a memory access tried to interpret some bytes as a pointer
2019-12-08T22:05:36.9692299Z 84    |           a memory access tried to interpret some bytes as a pointer
2019-12-08T22:05:36.9692663Z -    |           inside call to `std::ptr::<impl *const u8>::offset_from` at $DIR/offset_from_ub.rs:46:14
2019-12-08T22:05:36.9692727Z +    |           inside call to `std::ptr::const_ptr::<impl *const u8>::offset_from` at $DIR/offset_from_ub.rs:46:14
2019-12-08T22:05:36.9692774Z 86    | 
2019-12-08T22:05:36.9692832Z 87   ::: $DIR/offset_from_ub.rs:42:1
2019-12-08T22:05:36.9692899Z 
2019-12-08T22:05:36.9692924Z 
2019-12-08T22:05:36.9692983Z The actual stderr differed from the expected stderr.
2019-12-08T22:05:36.9692983Z The actual stderr differed from the expected stderr.
2019-12-08T22:05:36.9693301Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/consts/offset_from_ub/offset_from_ub.stderr
2019-12-08T22:05:36.9693896Z To update references, rerun the tests and pass the `--bless` flag
2019-12-08T22:05:36.9694207Z To only update this specific test, also pass `--test-args consts/offset_from_ub.rs`
2019-12-08T22:05:36.9694423Z error: 1 errors occurred comparing output.
2019-12-08T22:05:36.9694467Z status: exit code: 1
2019-12-08T22:05:36.9694467Z status: exit code: 1
2019-12-08T22:05:36.9695272Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/consts/offset_from_ub.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/consts/offset_from_ub" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/consts/offset_from_ub/auxiliary" "-A" "unused"
2019-12-08T22:05:36.9695612Z ------------------------------------------
2019-12-08T22:05:36.9695646Z 
2019-12-08T22:05:36.9696389Z ------------------------------------------
2019-12-08T22:05:36.9696470Z stderr:
2019-12-08T22:05:36.9696470Z stderr:
2019-12-08T22:05:36.9696770Z ------------------------------------------
2019-12-08T22:05:36.9696829Z error: any use of this value will cause an error
2019-12-08T22:05:36.9697089Z   --> /checkout/src/libcore/ptr/const_ptr.rs:292:9
2019-12-08T22:05:36.9697137Z    |
2019-12-08T22:05:36.9697181Z LL |           intrinsics::ptr_offset_from(self, origin)
2019-12-08T22:05:36.9697298Z    |           |
2019-12-08T22:05:36.9697349Z    |           ptr_offset_from cannot compute offset of pointers into different allocations.
2019-12-08T22:05:36.9697427Z    |           inside call to `std::ptr::const_ptr::<impl *const Struct>::offset_from` at /checkout/src/test/ui/consts/offset_from_ub.rs:19:27
2019-12-08T22:05:36.9697479Z    | 
2019-12-08T22:05:36.9697479Z    | 
2019-12-08T22:05:36.9697526Z   ::: /checkout/src/test/ui/consts/offset_from_ub.rs:13:1
2019-12-08T22:05:36.9697584Z    |
2019-12-08T22:05:36.9697628Z LL | / pub const DIFFERENT_ALLOC: usize = {
2019-12-08T22:05:36.9697673Z LL | |     //~^ NOTE
2019-12-08T22:05:36.9697734Z LL | |     let uninit = std::mem::MaybeUninit::<Struct>::uninit();
2019-12-08T22:05:36.9697801Z LL | |     let base_ptr: *const Struct = &uninit as *const _ as *const Struct;
2019-12-08T22:05:36.9697888Z LL | |     offset as usize
2019-12-08T22:05:36.9697945Z LL | | };
2019-12-08T22:05:36.9698157Z    | |__-
2019-12-08T22:05:36.9698200Z    |
2019-12-08T22:05:36.9698200Z    |
2019-12-08T22:05:36.9698259Z    = note: `#[deny(const_err)]` on by default
2019-12-08T22:05:36.9698291Z 
2019-12-08T22:05:36.9698334Z error: any use of this value will cause an error
2019-12-08T22:05:36.9698576Z   --> /checkout/src/libcore/ptr/const_ptr.rs:292:9
2019-12-08T22:05:36.9698638Z    |
2019-12-08T22:05:36.9698682Z LL |           intrinsics::ptr_offset_from(self, origin)
2019-12-08T22:05:36.9698791Z    |           |
2019-12-08T22:05:36.9698838Z    |           a memory access tried to interpret some bytes as a pointer
2019-12-08T22:05:36.9699023Z    |           inside call to `std::ptr::const_ptr::<impl *const u8>::offset_from` at /checkout/src/test/ui/consts/offset_from_ub.rs:25:14
2019-12-08T22:05:36.9699095Z    | 
2019-12-08T22:05:36.9699095Z    | 
2019-12-08T22:05:36.9699140Z   ::: /checkout/src/test/ui/consts/offset_from_ub.rs:23:1
2019-12-08T22:05:36.9699181Z    |
2019-12-08T22:05:36.9699239Z LL | / pub const NOT_PTR: usize = {
2019-12-08T22:05:36.9699284Z LL | |     //~^ NOTE
2019-12-08T22:05:36.9699330Z LL | |     unsafe { (42 as *const u8).offset_from(&5u8) as usize }
2019-12-08T22:05:36.9699626Z    | |__-
2019-12-08T22:05:36.9699657Z 
2019-12-08T22:05:36.9699701Z error: any use of this value will cause an error
2019-12-08T22:05:36.9699954Z   --> /checkout/src/libcore/ptr/const_ptr.rs:292:9
2019-12-08T22:05:36.9699954Z   --> /checkout/src/libcore/ptr/const_ptr.rs:292:9
2019-12-08T22:05:36.9700000Z    |
2019-12-08T22:05:36.9700044Z LL |           intrinsics::ptr_offset_from(self, origin)
2019-12-08T22:05:36.9700237Z    |           |
2019-12-08T22:05:36.9700237Z    |           |
2019-12-08T22:05:36.9700291Z    |           exact_div: 1 cannot be divided by 2 without remainder
2019-12-08T22:05:36.9700351Z    |           inside call to `std::ptr::const_ptr::<impl *const u16>::offset_from` at /checkout/src/test/ui/consts/offset_from_ub.rs:33:14
2019-12-08T22:05:36.9700460Z   ::: /checkout/src/test/ui/consts/offset_from_ub.rs:28:1
2019-12-08T22:05:36.9700501Z    |
2019-12-08T22:05:36.9700501Z    |
2019-12-08T22:05:36.9700560Z LL | / pub const NOT_MULTIPLE_OF_SIZE: isize = {
2019-12-08T22:05:36.9700604Z LL | |     //~^ NOTE
2019-12-08T22:05:36.9700647Z LL | |     let data = [5u8, 6, 7];
2019-12-08T22:05:36.9700707Z LL | |     let base_ptr = data.as_ptr();
2019-12-08T22:05:36.9700755Z LL | |     let field_ptr = &data[1] as *const u8 as *const u16;
2019-12-08T22:05:36.9700805Z LL | |     unsafe { field_ptr.offset_from(base_ptr as *const u16) }
2019-12-08T22:05:36.9701097Z    | |__-
2019-12-08T22:05:36.9701128Z 
2019-12-08T22:05:36.9701181Z error: any use of this value will cause an error
2019-12-08T22:05:36.9701444Z   --> /checkout/src/libcore/ptr/const_ptr.rs:292:9
2019-12-08T22:05:36.9701444Z   --> /checkout/src/libcore/ptr/const_ptr.rs:292:9
2019-12-08T22:05:36.9701492Z    |
2019-12-08T22:05:36.9701536Z LL |           intrinsics::ptr_offset_from(self, origin)
2019-12-08T22:05:36.9701641Z    |           |
2019-12-08T22:05:36.9701685Z    |           invalid use of NULL pointer
2019-12-08T22:05:36.9701740Z    |           inside call to `std::ptr::const_ptr::<impl *const u8>::offset_from` at /checkout/src/test/ui/consts/offset_from_ub.rs:39:14
2019-12-08T22:05:36.9701804Z    | 
2019-12-08T22:05:36.9701804Z    | 
2019-12-08T22:05:36.9701848Z   ::: /checkout/src/test/ui/consts/offset_from_ub.rs:36:1
2019-12-08T22:05:36.9701890Z    |
2019-12-08T22:05:36.9701948Z LL | / pub const OFFSET_FROM_NULL: isize = {
2019-12-08T22:05:36.9701992Z LL | |     //~^ NOTE
2019-12-08T22:05:36.9702035Z LL | |     let ptr = 0 as *const u8;
2019-12-08T22:05:36.9702095Z LL | |     unsafe { ptr.offset_from(ptr) }
2019-12-08T22:05:36.9702356Z    | |__-
2019-12-08T22:05:36.9702386Z 
2019-12-08T22:05:36.9702446Z error: any use of this value will cause an error
2019-12-08T22:05:36.9702687Z   --> /checkout/src/libcore/ptr/const_ptr.rs:292:9
2019-12-08T22:05:36.9702687Z   --> /checkout/src/libcore/ptr/const_ptr.rs:292:9
2019-12-08T22:05:36.9702734Z    |
2019-12-08T22:05:36.9702793Z LL |           intrinsics::ptr_offset_from(self, origin)
2019-12-08T22:05:36.9702882Z    |           |
2019-12-08T22:05:36.9702944Z    |           a memory access tried to interpret some bytes as a pointer
2019-12-08T22:05:36.9703003Z    |           inside call to `std::ptr::const_ptr::<impl *const u8>::offset_from` at /checkout/src/test/ui/consts/offset_from_ub.rs:46:14
2019-12-08T22:05:36.9703051Z    | 
2019-12-08T22:05:36.9703051Z    | 
2019-12-08T22:05:36.9703109Z   ::: /checkout/src/test/ui/consts/offset_from_ub.rs:42:1
2019-12-08T22:05:36.9703151Z    |
2019-12-08T22:05:36.9703280Z LL | / pub const DIFFERENT_INT: isize = { // offset_from with two different integers: like DIFFERENT_ALLOC
2019-12-08T22:05:36.9703348Z LL | |     //~^ NOTE
2019-12-08T22:05:36.9703693Z LL | |     let ptr1 = 8 as *const u8;
2019-12-08T22:05:36.9703737Z LL | |     let ptr2 = 16 as *const u8;
2019-12-08T22:05:36.9703782Z LL | |     unsafe { ptr2.offset_from(ptr1) }
2019-12-08T22:05:36.9704128Z    | |__-
2019-12-08T22:05:36.9704159Z 
2019-12-08T22:05:36.9704202Z error: aborting due to 5 previous errors
2019-12-08T22:05:36.9704245Z 
---
2019-12-08T22:05:36.9705475Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:537:22
2019-12-08T22:05:36.9705552Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-12-08T22:05:36.9705584Z 
2019-12-08T22:05:36.9705609Z 
2019-12-08T22:05:36.9707140Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/ui" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "ui" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-7/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "7.0.0\n" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
2019-12-08T22:05:36.9707368Z 
2019-12-08T22:05:36.9707397Z 
2019-12-08T22:05:36.9707442Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2019-12-08T22:05:36.9707506Z Build completed unsuccessfully in 1:06:39
2019-12-08T22:05:36.9707506Z Build completed unsuccessfully in 1:06:39
2019-12-08T22:05:36.9740905Z == clock drift check ==
2019-12-08T22:05:36.9760784Z   local time: Sun Dec  8 22:05:36 UTC 2019
2019-12-08T22:05:37.1328556Z   network time: Sun, 08 Dec 2019 22:05:37 GMT
2019-12-08T22:05:37.1329144Z == end clock drift check ==
2019-12-08T22:05:37.8598181Z 
2019-12-08T22:05:37.8776426Z ##[error]Bash exited with code '1'.
2019-12-08T22:05:37.8821149Z ##[section]Starting: Checkout
2019-12-08T22:05:37.8822939Z ==============================================================================
2019-12-08T22:05:37.8822993Z Task         : Get sources
2019-12-08T22:05:37.8823040Z 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)

@TheSamsa TheSamsa force-pushed the split-up-ptr-mod branch 3 times, most recently from 0ab9569 to 5282170 Compare December 9, 2019 08:07
@bors
Copy link
Contributor

bors commented Dec 10, 2019

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

@TheSamsa TheSamsa force-pushed the split-up-ptr-mod branch 3 times, most recently from 5c0c6fa to 3259a0d Compare December 14, 2019 10:42
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-7 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-12-14T10:43:30.6893603Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-12-14T10:43:30.7064963Z ##[command]git config gc.auto 0
2019-12-14T10:43:30.7143478Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-12-14T10:43:30.7193848Z ##[command]git config --get-all http.proxy
2019-12-14T10:43:30.7329775Z ##[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/67163/merge:refs/remotes/pull/67163/merge
---
2019-12-14T11:40:39.1626067Z .................................................................................................... 1600/9375
2019-12-14T11:40:43.3002641Z ....................................................................................F............... 1700/9375
2019-12-14T11:40:54.9387689Z ................................................................i................................... 1800/9375
2019-12-14T11:41:02.5432556Z .................................................................................................... 1900/9375
2019-12-14T11:41:17.0880475Z .................................................iiiii.............................................. 2000/9375
2019-12-14T11:41:27.3586009Z .................................................................................................... 2200/9375
2019-12-14T11:41:29.6084068Z .................................................................................................... 2300/9375
2019-12-14T11:41:32.8859199Z .................................................................................................... 2400/9375
2019-12-14T11:41:54.6578437Z .................................................................................................... 2500/9375
---
2019-12-14T11:44:26.1592547Z .................................................................................................... 4700/9375
2019-12-14T11:44:31.3298823Z .........................................................i...............i.......................... 4800/9375
2019-12-14T11:44:39.2314157Z .................................................................................................... 4900/9375
2019-12-14T11:44:47.4084208Z .................................................................................................... 5000/9375
2019-12-14T11:44:52.5138355Z .i.................................................................................................. 5100/9375
2019-12-14T11:45:02.8343051Z ...................................................................ii.ii...........i................ 5200/9375
2019-12-14T11:45:11.6280456Z ...i................................................................................................ 5400/9375
2019-12-14T11:45:22.0025100Z .................................................................................................... 5500/9375
2019-12-14T11:45:28.3389193Z .................................................i.................................................. 5600/9375
2019-12-14T11:45:35.4637599Z .................................................................................................... 5700/9375
2019-12-14T11:45:35.4637599Z .................................................................................................... 5700/9375
2019-12-14T11:45:45.6882973Z .................................................................................................... 5800/9375
2019-12-14T11:45:55.6153428Z .....................................ii...i..ii...........i......................................... 5900/9375
2019-12-14T11:46:14.3688672Z .................................................................................................... 6100/9375
2019-12-14T11:46:22.3917388Z .................................................................................................... 6200/9375
2019-12-14T11:46:22.3917388Z .................................................................................................... 6200/9375
2019-12-14T11:46:32.0335219Z .............................................................i..ii.................................. 6300/9375
2019-12-14T11:46:59.1242700Z .................................................................................................... 6500/9375
2019-12-14T11:47:01.1281798Z .................................i.................................................................. 6600/9375
2019-12-14T11:47:03.3390496Z .................................................................................................... 6700/9375
2019-12-14T11:47:05.6052471Z .........................i.......................................................................... 6800/9375
---
2019-12-14T11:48:40.8244505Z .................................................................................................... 7400/9375
2019-12-14T11:48:45.8219009Z .................................................................................................... 7500/9375
2019-12-14T11:48:51.2196881Z .................................................................................................... 7600/9375
2019-12-14T11:49:00.3452840Z .................................................................................................... 7700/9375
2019-12-14T11:49:08.6771438Z ...............................................iiii................................................. 7800/9375
2019-12-14T11:49:22.6422832Z .................................................................................................... 8000/9375
2019-12-14T11:49:30.7366775Z .................................................................................................... 8100/9375
2019-12-14T11:49:44.4753706Z .................................................................................................... 8200/9375
2019-12-14T11:49:52.4883781Z .................................................................................................... 8300/9375
---
2019-12-14T11:51:51.1871281Z 
2019-12-14T11:51:51.1871860Z ---- [ui] ui/consts/offset_from_ub.rs stdout ----
2019-12-14T11:51:51.1872085Z diff of stderr:
2019-12-14T11:51:51.1872117Z 
2019-12-14T11:51:51.1872179Z 1 error: any use of this value will cause an error
2019-12-14T11:51:51.1872427Z -   --> $SRC_DIR/libcore/ptr/mod.rs:LL:COL
2019-12-14T11:51:51.1872637Z +   --> $SRC_DIR/libcore/ptr/const_ptr.rs:LL:COL
2019-12-14T11:51:51.1872681Z 3    |
2019-12-14T11:51:51.1872743Z 4 LL |           intrinsics::ptr_offset_from(self, origin)
2019-12-14T11:51:51.1873028Z 
2019-12-14T11:51:51.1873088Z 6    |           |
2019-12-14T11:51:51.1873138Z 7    |           ptr_offset_from cannot compute offset of pointers into different allocations.
2019-12-14T11:51:51.1873138Z 7    |           ptr_offset_from cannot compute offset of pointers into different allocations.
2019-12-14T11:51:51.1873466Z -    |           inside call to `std::ptr::<impl *const Struct>::offset_from` at $DIR/offset_from_ub.rs:19:27
2019-12-14T11:51:51.1873545Z +    |           inside call to `std::ptr::const_ptr::<impl *const Struct>::offset_from` at $DIR/offset_from_ub.rs:19:27
2019-12-14T11:51:51.1873592Z 9    | 
2019-12-14T11:51:51.1873634Z 10   ::: $DIR/offset_from_ub.rs:13:1
2019-12-14T11:51:51.1873718Z 
2019-12-14T11:51:51.1873760Z 21    = note: `#[deny(const_err)]` on by default
2019-12-14T11:51:51.1873819Z 22 
2019-12-14T11:51:51.1873863Z 23 error: any use of this value will cause an error
2019-12-14T11:51:51.1873863Z 23 error: any use of this value will cause an error
2019-12-14T11:51:51.1874067Z -   --> $SRC_DIR/libcore/ptr/mod.rs:LL:COL
2019-12-14T11:51:51.1874278Z +   --> $SRC_DIR/libcore/ptr/const_ptr.rs:LL:COL
2019-12-14T11:51:51.1874385Z 25    |
2019-12-14T11:51:51.1874430Z 26 LL |           intrinsics::ptr_offset_from(self, origin)
2019-12-14T11:51:51.1874681Z 
2019-12-14T11:51:51.1874719Z 28    |           |
2019-12-14T11:51:51.1874927Z 29    |           a memory access tried to interpret some bytes as a pointer
2019-12-14T11:51:51.1874927Z 29    |           a memory access tried to interpret some bytes as a pointer
2019-12-14T11:51:51.1875205Z -    |           inside call to `std::ptr::<impl *const u8>::offset_from` at $DIR/offset_from_ub.rs:25:14
2019-12-14T11:51:51.1875261Z +    |           inside call to `std::ptr::const_ptr::<impl *const u8>::offset_from` at $DIR/offset_from_ub.rs:25:14
2019-12-14T11:51:51.1875304Z 31    | 
2019-12-14T11:51:51.1875342Z 32   ::: $DIR/offset_from_ub.rs:23:1
2019-12-14T11:51:51.1875419Z 
2019-12-14T11:51:51.1875578Z 38    | |__-
2019-12-14T11:51:51.1875630Z 39 
2019-12-14T11:51:51.1875671Z 40 error: any use of this value will cause an error
2019-12-14T11:51:51.1875671Z 40 error: any use of this value will cause an error
2019-12-14T11:51:51.1875862Z -   --> $SRC_DIR/libcore/ptr/mod.rs:LL:COL
2019-12-14T11:51:51.1877150Z +   --> $SRC_DIR/libcore/ptr/const_ptr.rs:LL:COL
2019-12-14T11:51:51.1877235Z 42    |
2019-12-14T11:51:51.1877280Z 43 LL |           intrinsics::ptr_offset_from(self, origin)
2019-12-14T11:51:51.1877381Z 
2019-12-14T11:51:51.1877421Z 45    |           |
2019-12-14T11:51:51.1877421Z 45    |           |
2019-12-14T11:51:51.1877471Z 46    |           exact_div: 1 cannot be divided by 2 without remainder
2019-12-14T11:51:51.1877839Z -    |           inside call to `std::ptr::<impl *const u16>::offset_from` at $DIR/offset_from_ub.rs:33:14
2019-12-14T11:51:51.1877903Z +    |           inside call to `std::ptr::const_ptr::<impl *const u16>::offset_from` at $DIR/offset_from_ub.rs:33:14
2019-12-14T11:51:51.1877951Z 48    | 
2019-12-14T11:51:51.1878011Z 49   ::: $DIR/offset_from_ub.rs:28:1
2019-12-14T11:51:51.1878082Z 
2019-12-14T11:51:51.1878394Z 58    | |__-
2019-12-14T11:51:51.1878479Z 59 
2019-12-14T11:51:51.1878526Z 60 error: any use of this value will cause an error
2019-12-14T11:51:51.1878526Z 60 error: any use of this value will cause an error
2019-12-14T11:51:51.1878779Z -   --> $SRC_DIR/libcore/ptr/mod.rs:LL:COL
2019-12-14T11:51:51.1878997Z +   --> $SRC_DIR/libcore/ptr/const_ptr.rs:LL:COL
2019-12-14T11:51:51.1879058Z 62    |
2019-12-14T11:51:51.1879105Z 63 LL |           intrinsics::ptr_offset_from(self, origin)
2019-12-14T11:51:51.1879202Z 
2019-12-14T11:51:51.1879243Z 65    |           |
2019-12-14T11:51:51.1879290Z 66    |           invalid use of NULL pointer
2019-12-14T11:51:51.1879290Z 66    |           invalid use of NULL pointer
2019-12-14T11:51:51.1879589Z -    |           inside call to `std::ptr::<impl *const u8>::offset_from` at $DIR/offset_from_ub.rs:39:14
2019-12-14T11:51:51.1879652Z +    |           inside call to `std::ptr::const_ptr::<impl *const u8>::offset_from` at $DIR/offset_from_ub.rs:39:14
2019-12-14T11:51:51.1879703Z 68    | 
2019-12-14T11:51:51.1879764Z 69   ::: $DIR/offset_from_ub.rs:36:1
2019-12-14T11:51:51.1879932Z 
2019-12-14T11:51:51.1880144Z 76    | |__-
2019-12-14T11:51:51.1880205Z 77 
2019-12-14T11:51:51.1880252Z 78 error: any use of this value will cause an error
2019-12-14T11:51:51.1880252Z 78 error: any use of this value will cause an error
2019-12-14T11:51:51.1880463Z -   --> $SRC_DIR/libcore/ptr/mod.rs:LL:COL
2019-12-14T11:51:51.1881032Z +   --> $SRC_DIR/libcore/ptr/const_ptr.rs:LL:COL
2019-12-14T11:51:51.1881247Z 80    |
2019-12-14T11:51:51.1881286Z 81 LL |           intrinsics::ptr_offset_from(self, origin)
2019-12-14T11:51:51.1881375Z 
2019-12-14T11:51:51.1881413Z 83    |           |
2019-12-14T11:51:51.1881457Z 84    |           a memory access tried to interpret some bytes as a pointer
2019-12-14T11:51:51.1881457Z 84    |           a memory access tried to interpret some bytes as a pointer
2019-12-14T11:51:51.1881731Z -    |           inside call to `std::ptr::<impl *const u8>::offset_from` at $DIR/offset_from_ub.rs:46:14
2019-12-14T11:51:51.1881796Z +    |           inside call to `std::ptr::const_ptr::<impl *const u8>::offset_from` at $DIR/offset_from_ub.rs:46:14
2019-12-14T11:51:51.1882007Z 86    | 
2019-12-14T11:51:51.1882061Z 87   ::: $DIR/offset_from_ub.rs:42:1
2019-12-14T11:51:51.1882120Z 
2019-12-14T11:51:51.1882143Z 
2019-12-14T11:51:51.1882183Z The actual stderr differed from the expected stderr.
2019-12-14T11:51:51.1882183Z The actual stderr differed from the expected stderr.
2019-12-14T11:51:51.1882466Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/consts/offset_from_ub/offset_from_ub.stderr
2019-12-14T11:51:51.1882850Z To update references, rerun the tests and pass the `--bless` flag
2019-12-14T11:51:51.1883081Z To only update this specific test, also pass `--test-args consts/offset_from_ub.rs`
2019-12-14T11:51:51.1883168Z error: 1 errors occurred comparing output.
2019-12-14T11:51:51.1883208Z status: exit code: 1
2019-12-14T11:51:51.1883208Z status: exit code: 1
2019-12-14T11:51:51.1883911Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/consts/offset_from_ub.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/consts/offset_from_ub" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/consts/offset_from_ub/auxiliary" "-A" "unused"
2019-12-14T11:51:51.1884205Z ------------------------------------------
2019-12-14T11:51:51.1884236Z 
2019-12-14T11:51:51.1884428Z ------------------------------------------
2019-12-14T11:51:51.1884483Z stderr:
2019-12-14T11:51:51.1884483Z stderr:
2019-12-14T11:51:51.1884670Z ------------------------------------------
2019-12-14T11:51:51.1884714Z error: any use of this value will cause an error
2019-12-14T11:51:51.1884915Z   --> /checkout/src/libcore/ptr/const_ptr.rs:294:9
2019-12-14T11:51:51.1884972Z    |
2019-12-14T11:51:51.1885174Z LL |           intrinsics::ptr_offset_from(self, origin)
2019-12-14T11:51:51.1885602Z    |           |
2019-12-14T11:51:51.1885653Z    |           ptr_offset_from cannot compute offset of pointers into different allocations.
2019-12-14T11:51:51.1885718Z    |           inside call to `std::ptr::const_ptr::<impl *const Struct>::offset_from` at /checkout/src/test/ui/consts/offset_from_ub.rs:19:27
2019-12-14T11:51:51.1885789Z    | 
2019-12-14T11:51:51.1885789Z    | 
2019-12-14T11:51:51.1885837Z   ::: /checkout/src/test/ui/consts/offset_from_ub.rs:13:1
2019-12-14T11:51:51.1885900Z    |
2019-12-14T11:51:51.1885945Z LL | / pub const DIFFERENT_ALLOC: usize = {
2019-12-14T11:51:51.1885991Z LL | |     //~^ NOTE
2019-12-14T11:51:51.1886039Z LL | |     let uninit = std::mem::MaybeUninit::<Struct>::uninit();
2019-12-14T11:51:51.1886111Z LL | |     let base_ptr: *const Struct = &uninit as *const _ as *const Struct;
2019-12-14T11:51:51.1886199Z LL | |     offset as usize
2019-12-14T11:51:51.1886262Z LL | | };
2019-12-14T11:51:51.1886512Z    | |__-
2019-12-14T11:51:51.1886636Z    |
2019-12-14T11:51:51.1886636Z    |
2019-12-14T11:51:51.1886699Z    = note: `#[deny(const_err)]` on by default
2019-12-14T11:51:51.1886731Z 
2019-12-14T11:51:51.1886775Z error: any use of this value will cause an error
2019-12-14T11:51:51.1887033Z   --> /checkout/src/libcore/ptr/const_ptr.rs:294:9
2019-12-14T11:51:51.1887098Z    |
2019-12-14T11:51:51.1887145Z LL |           intrinsics::ptr_offset_from(self, origin)
2019-12-14T11:51:51.1887257Z    |           |
2019-12-14T11:51:51.1887306Z    |           a memory access tried to interpret some bytes as a pointer
2019-12-14T11:51:51.1887367Z    |           inside call to `std::ptr::const_ptr::<impl *const u8>::offset_from` at /checkout/src/test/ui/consts/offset_from_ub.rs:25:14
2019-12-14T11:51:51.1887435Z    | 
2019-12-14T11:51:51.1887435Z    | 
2019-12-14T11:51:51.1887482Z   ::: /checkout/src/test/ui/consts/offset_from_ub.rs:23:1
2019-12-14T11:51:51.1887525Z    |
2019-12-14T11:51:51.1887576Z LL | / pub const NOT_PTR: usize = {
2019-12-14T11:51:51.1887646Z LL | |     //~^ NOTE
2019-12-14T11:51:51.1887694Z LL | |     unsafe { (42 as *const u8).offset_from(&5u8) as usize }
2019-12-14T11:51:51.1887937Z    | |__-
2019-12-14T11:51:51.1887966Z 
2019-12-14T11:51:51.1888010Z error: any use of this value will cause an error
2019-12-14T11:51:51.1888232Z   --> /checkout/src/libcore/ptr/const_ptr.rs:294:9
2019-12-14T11:51:51.1888232Z   --> /checkout/src/libcore/ptr/const_ptr.rs:294:9
2019-12-14T11:51:51.1888293Z    |
2019-12-14T11:51:51.1888338Z LL |           intrinsics::ptr_offset_from(self, origin)
2019-12-14T11:51:51.1888450Z    |           |
2019-12-14T11:51:51.1888450Z    |           |
2019-12-14T11:51:51.1888497Z    |           exact_div: 1 cannot be divided by 2 without remainder
2019-12-14T11:51:51.1888557Z    |           inside call to `std::ptr::const_ptr::<impl *const u16>::offset_from` at /checkout/src/test/ui/consts/offset_from_ub.rs:33:14
2019-12-14T11:51:51.1888680Z   ::: /checkout/src/test/ui/consts/offset_from_ub.rs:28:1
2019-12-14T11:51:51.1888731Z    |
2019-12-14T11:51:51.1888731Z    |
2019-12-14T11:51:51.1889226Z LL | / pub const NOT_MULTIPLE_OF_SIZE: isize = {
2019-12-14T11:51:51.1889269Z LL | |     //~^ NOTE
2019-12-14T11:51:51.1889473Z LL | |     let data = [5u8, 6, 7];
2019-12-14T11:51:51.1889531Z LL | |     let base_ptr = data.as_ptr();
2019-12-14T11:51:51.1889574Z LL | |     let field_ptr = &data[1] as *const u8 as *const u16;
2019-12-14T11:51:51.1889618Z LL | |     unsafe { field_ptr.offset_from(base_ptr as *const u16) }
2019-12-14T11:51:51.1889843Z    | |__-
2019-12-14T11:51:51.1889870Z 
2019-12-14T11:51:51.1889907Z error: any use of this value will cause an error
2019-12-14T11:51:51.1890113Z   --> /checkout/src/libcore/ptr/const_ptr.rs:294:9
2019-12-14T11:51:51.1890113Z   --> /checkout/src/libcore/ptr/const_ptr.rs:294:9
2019-12-14T11:51:51.1890152Z    |
2019-12-14T11:51:51.1890190Z LL |           intrinsics::ptr_offset_from(self, origin)
2019-12-14T11:51:51.1890366Z    |           |
2019-12-14T11:51:51.1890412Z    |           invalid use of NULL pointer
2019-12-14T11:51:51.1890462Z    |           inside call to `std::ptr::const_ptr::<impl *const u8>::offset_from` at /checkout/src/test/ui/consts/offset_from_ub.rs:39:14
2019-12-14T11:51:51.1890520Z    | 
2019-12-14T11:51:51.1890520Z    | 
2019-12-14T11:51:51.1890559Z   ::: /checkout/src/test/ui/consts/offset_from_ub.rs:36:1
2019-12-14T11:51:51.1890596Z    |
2019-12-14T11:51:51.1890646Z LL | / pub const OFFSET_FROM_NULL: isize = {
2019-12-14T11:51:51.1890685Z LL | |     //~^ NOTE
2019-12-14T11:51:51.1890746Z LL | |     let ptr = 0 as *const u8;
2019-12-14T11:51:51.1890786Z LL | |     unsafe { ptr.offset_from(ptr) }
2019-12-14T11:51:51.1891029Z    | |__-
2019-12-14T11:51:51.1891055Z 
2019-12-14T11:51:51.1891094Z error: any use of this value will cause an error
2019-12-14T11:51:51.1891290Z   --> /checkout/src/libcore/ptr/const_ptr.rs:294:9
2019-12-14T11:51:51.1891290Z   --> /checkout/src/libcore/ptr/const_ptr.rs:294:9
2019-12-14T11:51:51.1891346Z    |
2019-12-14T11:51:51.1891392Z LL |           intrinsics::ptr_offset_from(self, origin)
2019-12-14T11:51:51.1891563Z    |           |
2019-12-14T11:51:51.1891604Z    |           a memory access tried to interpret some bytes as a pointer
2019-12-14T11:51:51.1891657Z    |           inside call to `std::ptr::const_ptr::<impl *const u8>::offset_from` at /checkout/src/test/ui/consts/offset_from_ub.rs:46:14
2019-12-14T11:51:51.1891718Z    | 
2019-12-14T11:51:51.1891718Z    | 
2019-12-14T11:51:51.1891758Z   ::: /checkout/src/test/ui/consts/offset_from_ub.rs:42:1
2019-12-14T11:51:51.1891795Z    |
2019-12-14T11:51:51.1891838Z LL | / pub const DIFFERENT_INT: isize = { // offset_from with two different integers: like DIFFERENT_ALLOC
2019-12-14T11:51:51.1891900Z LL | |     //~^ NOTE
2019-12-14T11:51:51.1891938Z LL | |     let ptr1 = 8 as *const u8;
2019-12-14T11:51:51.1891977Z LL | |     let ptr2 = 16 as *const u8;
2019-12-14T11:51:51.1892033Z LL | |     unsafe { ptr2.offset_from(ptr1) }
2019-12-14T11:51:51.1892269Z    | |__-
2019-12-14T11:51:51.1939731Z 
2019-12-14T11:51:51.1939862Z error: aborting due to 5 previous errors
2019-12-14T11:51:51.1939892Z 
---
2019-12-14T11:51:51.1941321Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:537:22
2019-12-14T11:51:51.1941375Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-12-14T11:51:51.1967308Z 
2019-12-14T11:51:51.1967420Z 
2019-12-14T11:51:51.1969857Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/ui" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "ui" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-7/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "7.0.0\n" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
2019-12-14T11:51:51.1970145Z 
2019-12-14T11:51:51.1970176Z 
2019-12-14T11:51:51.1975844Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2019-12-14T11:51:51.1975915Z Build completed unsuccessfully in 1:02:36
2019-12-14T11:51:51.1975915Z Build completed unsuccessfully in 1:02:36
2019-12-14T11:51:51.2038448Z == clock drift check ==
2019-12-14T11:51:51.2058592Z   local time: Sat Dec 14 11:51:51 UTC 2019
2019-12-14T11:51:51.5403681Z   network time: Sat, 14 Dec 2019 11:51:51 GMT
2019-12-14T11:51:51.5404112Z == end clock drift check ==
2019-12-14T11:51:52.3271733Z 
2019-12-14T11:51:52.3383114Z ##[error]Bash exited with code '1'.
2019-12-14T11:51:52.3427538Z ##[section]Starting: Checkout
2019-12-14T11:51:52.3429540Z ==============================================================================
2019-12-14T11:51:52.3429701Z Task         : Get sources
2019-12-14T11:51:52.3429753Z 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)

@bors
Copy link
Contributor

bors commented Dec 14, 2019

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

@Mark-Simulacrum
Copy link
Member

r=me with a rebase

@Mark-Simulacrum
Copy link
Member

@bors r+

Thanks!

@bors
Copy link
Contributor

bors commented Dec 16, 2019

📌 Commit 40e9e3c8f1d6f38e8cb868afdb4e0626f4e89ac4 has been approved by Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Dec 16, 2019

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

@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 Dec 16, 2019
@Mark-Simulacrum
Copy link
Member

Oh, it looks like you've actually included a few submodule updates in that rebase, presumably by accident? -- @bors r-

@bors bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Dec 16, 2019
@rust-highfive
Copy link
Collaborator

The job mingw-check 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-12-16T16:59:19.4005229Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-12-16T16:59:19.4238653Z ##[command]git config gc.auto 0
2019-12-16T16:59:19.4329858Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-12-16T16:59:19.4432892Z ##[command]git config --get-all http.proxy
2019-12-16T16:59:19.4583695Z ##[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/67163/merge:refs/remotes/pull/67163/merge
---
2019-12-16T17:04:23.8548558Z     Checking core v0.0.0 (/checkout/src/libcore)
2019-12-16T17:04:23.9275383Z error: expected identifier, found `<<`
2019-12-16T17:04:23.9276398Z     --> src/libcore/ptr/mod.rs:1039:1
2019-12-16T17:04:23.9276827Z      |
2019-12-16T17:04:23.9277690Z 1039 | <<<<<<< HEAD
2019-12-16T17:04:23.9278063Z      | ^^ expected identifier
2019-12-16T17:04:23.9303258Z error: aborting due to previous error
2019-12-16T17:04:23.9303606Z 
2019-12-16T17:04:23.9304023Z error: could not compile `core`.
2019-12-16T17:04:23.9304512Z warning: build failed, waiting for other jobs to finish...
---
2019-12-16T17:04:28.7279897Z   local time: Mon Dec 16 17:04:28 UTC 2019
2019-12-16T17:04:28.8053378Z   network time: Mon, 16 Dec 2019 17:04:28 GMT
2019-12-16T17:04:28.8059078Z == end clock drift check ==
2019-12-16T17:04:43.6673159Z 
2019-12-16T17:04:43.6781902Z ##[error]Bash exited with code '1'.
2019-12-16T17:04:43.6813808Z ##[section]Starting: Checkout
2019-12-16T17:04:43.6815486Z ==============================================================================
2019-12-16T17:04:43.6815554Z Task         : Get sources
2019-12-16T17:04:43.6815598Z 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)

@Mark-Simulacrum
Copy link
Member

No worries! Happens to all of us.

@bors r+

@bors
Copy link
Contributor

bors commented Dec 16, 2019

📌 Commit 5fe2c65e5f099185d4117907744a325bc329425a has been approved by Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Dec 16, 2019

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

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 16, 2019
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-7 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-12-16T17:33:59.2614354Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-12-16T17:33:59.2633102Z ##[command]git config gc.auto 0
2019-12-16T17:33:59.2642389Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-12-16T17:33:59.2646506Z ##[command]git config --get-all http.proxy
2019-12-16T17:33:59.2648793Z ##[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/67163/merge:refs/remotes/pull/67163/merge
---
2019-12-16T18:04:05.3629797Z   local time: Mon Dec 16 18:04:05 UTC 2019
2019-12-16T18:04:05.6616715Z   network time: Mon, 16 Dec 2019 18:04:05 GMT
2019-12-16T18:04:05.6620030Z == end clock drift check ==
2019-12-16T18:04:08.1561764Z 
2019-12-16T18:04:08.1685963Z ##[error]Bash exited with code '1'.
2019-12-16T18:04:08.1719500Z ##[section]Starting: Checkout
2019-12-16T18:04:08.1721912Z ==============================================================================
2019-12-16T18:04:08.1721971Z Task         : Get sources
2019-12-16T18:04:08.1722037Z 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)

@Mark-Simulacrum
Copy link
Member

Looks like we've edited the files and presumably rebasing lost those changes? @bors r-

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 16, 2019
@TheSamsa
Copy link
Contributor Author

Looks like we've edited the files and presumably rebasing lost those changes? @bors r-

Yeah, i messed that one up! I redid my changes now, should contain the last and correct changes now.
Really stupid mistake on my side...

@bors
Copy link
Contributor

bors commented Dec 19, 2019

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

@rust-highfive
Copy link
Collaborator

The job mingw-check 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-12-19T07:23:07.5135151Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-12-19T07:23:07.5302552Z ##[command]git config gc.auto 0
2019-12-19T07:23:07.5369569Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-12-19T07:23:07.5430834Z ##[command]git config --get-all http.proxy
2019-12-19T07:23:07.5569374Z ##[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/67163/merge:refs/remotes/pull/67163/merge
---
2019-12-19T07:28:34.2898013Z Successfully built e559ce28d3d8
2019-12-19T07:28:34.4356546Z Successfully tagged rust-ci:latest
2019-12-19T07:28:34.4992310Z Built container sha256:e559ce28d3d8eae685794f24b7974f0d16b9141e5425e077f25e214422c0941d
2019-12-19T07:28:34.5013036Z Uploading finished image to https://rust-lang-ci-sccache2.s3.amazonaws.com/docker/a4e8b7e8bb02ac2100a242c404ec9cad308c2d13ab7005efa7a2f5ca462ea44fe3b309afeb06c439a0091371f6a14487ea26f96e8916366f1b586cbeecbe4c35
2019-12-19T07:29:35.3690010Z upload failed: - to s3://rust-lang-ci-sccache2/docker/a4e8b7e8bb02ac2100a242c404ec9cad308c2d13ab7005efa7a2f5ca462ea44fe3b309afeb06c439a0091371f6a14487ea26f96e8916366f1b586cbeecbe4c35 An error occurred (InvalidAccessKeyId) when calling the CreateMultipartUpload operation: The AWS Access Key Id you provided does not exist in our records.
2019-12-19T07:29:36.4019490Z [CI_JOB_NAME=mingw-check]
2019-12-19T07:29:36.4047631Z == clock drift check ==
2019-12-19T07:29:36.4050908Z   local time: Thu Dec 19 07:29:36 UTC 2019
2019-12-19T07:29:36.9382972Z   network time: Thu, 19 Dec 2019 07:29:36 GMT
---
2019-12-19T07:31:00.9063798Z     Checking core v0.0.0 (/checkout/src/libcore)
2019-12-19T07:31:04.5150685Z error[E0547]: missing 'issue'
2019-12-19T07:31:04.5151889Z    --> src/libcore/ptr/const_ptr.rs:284:27
2019-12-19T07:31:04.5152311Z     |
2019-12-19T07:31:04.5152988Z 284 |     #[cfg_attr(bootstrap, rustc_const_unstable(feature = "const_ptr_offset_from"))]
2019-12-19T07:31:04.5153598Z 
2019-12-19T07:31:04.5169212Z error[E0547]: missing 'issue'
2019-12-19T07:31:04.5169815Z    --> src/libcore/ptr/mut_ptr.rs:322:27
2019-12-19T07:31:04.5170449Z     |
2019-12-19T07:31:04.5170449Z     |
2019-12-19T07:31:04.5170944Z 322 |     #[cfg_attr(bootstrap, rustc_const_unstable(feature = "const_ptr_offset_from"))]
2019-12-19T07:31:04.5171557Z 
2019-12-19T07:31:08.6632331Z    Compiling build_helper v0.1.0 (/checkout/src/build_helper)
2019-12-19T07:31:10.2010228Z    Compiling libc v0.2.64
2019-12-19T07:31:10.9905855Z error: aborting due to 2 previous errors
---
2019-12-19T07:31:11.0859447Z   local time: Thu Dec 19 07:31:11 UTC 2019
2019-12-19T07:31:11.3616231Z   network time: Thu, 19 Dec 2019 07:31:11 GMT
2019-12-19T07:31:11.3620645Z == end clock drift check ==
2019-12-19T07:31:25.4102292Z 
2019-12-19T07:31:25.4202557Z ##[error]Bash exited with code '1'.
2019-12-19T07:31:25.4266326Z ##[section]Starting: Checkout
2019-12-19T07:31:25.4268319Z ==============================================================================
2019-12-19T07:31:25.4268375Z Task         : Get sources
2019-12-19T07:31:25.4268443Z 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)

@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=never

Thank you! Going to mark this so as to not roll it up as it's somewhat prone to rebase failure.

@bors
Copy link
Contributor

bors commented Dec 19, 2019

📌 Commit 12d65c2 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 19, 2019
@TheSamsa
Copy link
Contributor Author

Thank you, for your patience. I am new to rebases, so I am sorry for my mixups.

@Centril
Copy link
Contributor

Centril commented Dec 20, 2019

@bors rollup=maybe

Centril added a commit to Centril/rust that referenced this pull request Dec 20, 2019
…imulacrum

Split up ptr/mod.rs in libcore...

...one with implementation detail for const ptr and the other with mut ptr

I am not sure if the "stable since 1.0.0" flags are the correct choice for the two additional mods.
Also, is it necessary for them to be "pub"? If so, there should be a good description for them.

Closes rust-lang#66891
Centril added a commit to Centril/rust that referenced this pull request Dec 20, 2019
…imulacrum

Split up ptr/mod.rs in libcore...

...one with implementation detail for const ptr and the other with mut ptr

I am not sure if the "stable since 1.0.0" flags are the correct choice for the two additional mods.
Also, is it necessary for them to be "pub"? If so, there should be a good description for them.

Closes rust-lang#66891
bors added a commit that referenced this pull request Dec 21, 2019
Rollup of 6 pull requests

Successful merges:

 - #67130 (Const prop should finish propagation into user defined variables)
 - #67163 (Split up ptr/mod.rs in libcore...)
 - #67314 (Don't suppress move errors for union fields)
 - #67392 (Fix unresolved type span inside async object)
 - #67404 (Separate region inference logic from error handling better)
 - #67428 (`is_binding_pat`: use explicit match & include or-pats in grammar)

Failed merges:

r? @ghost
@bors bors merged commit 12d65c2 into rust-lang:master Dec 21, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

Break up libcore/ptr/mod.rs into multiple files
6 participants