Renamed "undef" -> "uninit"

[hbina]

1. InvalidUndefBytes -> InvalidUninitBytes
2. ScalarMaybeUndef -> ScalarMaybeUninit
3. UndefMask -> InitMask

Related issue #71193

[rust-highfive]

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @cramertj (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

[rust-highfive]

The job x86_64-gnu-llvm-8 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.

2020-04-22T07:24:29.5463976Z ========================== Starting Command Output =========================== 2020-04-22T07:24:29.5468393Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/a9ee79a4-0ac3-4a11-9e74-7d740681a92a.sh 2020-04-22T07:24:29.5468801Z 2020-04-22T07:24:29.5472954Z ##[section]Finishing: Disable git automatic line ending conversion 2020-04-22T07:24:29.5492768Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/71418/merge to s 2020-04-22T07:24:29.5496071Z Task : Get sources 2020-04-22T07:24:29.5496321Z Description : Get sources from a repository. Supports Git, TfsVC, and SVN repositories. 2020-04-22T07:24:29.5496583Z Version : 1.0.0 2020-04-22T07:24:29.5496751Z Author : Microsoft --- 2020-04-22T07:24:30.7278530Z ##[command]git remote add origin https://github.com/rust-lang/rust 2020-04-22T07:24:30.7285666Z ##[command]git config gc.auto 0 2020-04-22T07:24:30.7289665Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader 2020-04-22T07:24:30.7293311Z ##[command]git config --get-all http.proxy 2020-04-22T07:24:30.7305388Z ##[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/71418/merge:refs/remotes/pull/71418/merge --- 2020-04-22T07:26:56.3049605Z ---> 318032b5f0e2 2020-04-22T07:26:56.3050421Z Step 5/8 : ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu --llvm-root=/usr/lib/llvm-8 --enable-llvm-link-shared --set rust.thin-lto-import-instr-limit=10 2020-04-22T07:26:56.3051066Z ---> Using cache 2020-04-22T07:26:56.3051414Z ---> d44a858fd1ce 2020-04-22T07:26:56.3052469Z Step 6/8 : ENV SCRIPT python2.7 ../x.py test --exclude src/tools/tidy && python2.7 ../x.py test src/test/mir-opt --pass=build --target=armv5te-unknown-linux-gnueabi && python2.7 ../x.py test src/tools/tidy 2020-04-22T07:26:56.3053627Z ---> 58b910f50f5a 2020-04-22T07:26:56.3053852Z Step 7/8 : ENV NO_DEBUG_ASSERTIONS=1 2020-04-22T07:26:56.3054579Z ---> Using cache 2020-04-22T07:26:56.3054946Z ---> ee7702aadba1 --- 2020-04-22T07:26:56.3418445Z Looks like docker image is the same as before, not uploading 2020-04-22T07:27:03.1344534Z [CI_JOB_NAME=x86_64-gnu-llvm-8] 2020-04-22T07:27:03.1683468Z [CI_JOB_NAME=x86_64-gnu-llvm-8] 2020-04-22T07:27:03.1725430Z == clock drift check == 2020-04-22T07:27:03.1736284Z local time: Wed Apr 22 07:27:03 UTC 2020 2020-04-22T07:27:03.4678594Z network time: Wed, 22 Apr 2020 07:27:03 GMT 2020-04-22T07:27:03.4711148Z Starting sccache server... 2020-04-22T07:27:03.5688808Z configure: processing command line 2020-04-22T07:27:03.5689076Z configure: 2020-04-22T07:27:03.5690010Z configure: rust.dist-src := False --- 2020-04-22T07:32:51.6466451Z Compiling rustc_feature v0.0.0 (/checkout/src/librustc_feature) 2020-04-22T07:32:53.2674675Z Compiling fmt_macros v0.0.0 (/checkout/src/libfmt_macros) 2020-04-22T07:32:54.9781479Z Compiling rustc_ast_pretty v0.0.0 (/checkout/src/librustc_ast_pretty) 2020-04-22T07:32:56.6869413Z Compiling rustc_hir v0.0.0 (/checkout/src/librustc_hir) 2020-04-22T07:33:06.1133346Z Compiling rustc_query_system v0.0.0 (/checkout/src/librustc_query_system) 2020-04-22T07:33:09.1268998Z Compiling rustc_hir_pretty v0.0.0 (/checkout/src/librustc_hir_pretty) 2020-04-22T07:33:13.9101948Z Compiling rustc_attr v0.0.0 (/checkout/src/librustc_attr) 2020-04-22T07:33:18.3695675Z Compiling rustc_parse v0.0.0 (/checkout/src/librustc_parse) 2020-04-22T07:33:29.4075635Z Compiling rustc_ast_lowering v0.0.0 (/checkout/src/librustc_ast_lowering) --- 2020-04-22T07:58:27.4446328Z Compiling rustc_feature v0.0.0 (/checkout/src/librustc_feature) 2020-04-22T07:58:29.2827495Z Compiling fmt_macros v0.0.0 (/checkout/src/libfmt_macros) 2020-04-22T07:58:31.3164460Z Compiling rustc_ast_pretty v0.0.0 (/checkout/src/librustc_ast_pretty) 2020-04-22T07:58:33.4265839Z Compiling rustc_hir v0.0.0 (/checkout/src/librustc_hir) 2020-04-22T07:58:42.7443553Z Compiling rustc_query_system v0.0.0 (/checkout/src/librustc_query_system) 2020-04-22T07:58:47.4477232Z Compiling rustc_hir_pretty v0.0.0 (/checkout/src/librustc_hir_pretty) 2020-04-22T07:58:52.6490586Z Compiling rustc_attr v0.0.0 (/checkout/src/librustc_attr) 2020-04-22T07:58:57.4297709Z Compiling rustc_parse v0.0.0 (/checkout/src/librustc_parse) 2020-04-22T07:59:07.2585098Z Compiling rustc_ast_lowering v0.0.0 (/checkout/src/librustc_ast_lowering) --- 2020-04-22T08:24:29.4654017Z .................................................................................................... 1600/9912 2020-04-22T08:24:36.0167529Z .................................................................................................... 1700/9912 2020-04-22T08:24:40.3425883Z .................................................................................................... 1800/9912 2020-04-22T08:24:49.2009377Z .................................................................................................... 1900/9912 2020-04-22T08:24:57.5152558Z ..i................................................................................................. 2000/9912 2020-04-22T08:25:04.0396223Z ............................................................................................iiiii... 2100/9912 2020-04-22T08:25:24.6898478Z .................................................................................................... 2300/9912 2020-04-22T08:25:26.9821300Z .................................................................................................... 2400/9912 2020-04-22T08:25:29.2850652Z .................................................................................................... 2500/9912 2020-04-22T08:25:35.1841444Z .................................................................................................... 2600/9912 --- 2020-04-22T08:28:46.5758808Z .................................................................................................... 5100/9912 2020-04-22T08:28:54.0614507Z .................................................................................................... 5200/9912 2020-04-22T08:28:59.2365534Z ...............i.................................................................................... 5300/9912 2020-04-22T08:29:09.2863053Z .....i.............................................................................................. 5400/9912 2020-04-22T08:29:14.5423575Z .....ii.ii........i...i............................................................................. 5500/9912 2020-04-22T08:29:22.4459505Z ....................................................i............................................... 5700/9912 2020-04-22T08:29:31.7983060Z ....................................................................................ii.............. 5800/9912 2020-04-22T08:29:38.8503452Z .......................i............................................................................ 5900/9912 2020-04-22T08:29:44.4199881Z .................................................................................................... 6000/9912 2020-04-22T08:29:44.4199881Z .................................................................................................... 6000/9912 2020-04-22T08:29:55.3712789Z .................................................................................................... 6100/9912 2020-04-22T08:30:05.5953567Z .................ii...i..ii...........i............................................................. 6200/9912 2020-04-22T08:30:21.9961698Z .................................................................................................... 6400/9912 2020-04-22T08:30:29.0817674Z .................................................................................................... 6500/9912 2020-04-22T08:30:29.0817674Z .................................................................................................... 6500/9912 2020-04-22T08:30:44.6513531Z ...............................................i..ii................................................ 6600/9912 2020-04-22T08:31:08.1758653Z .................................................................................................... 6800/9912 2020-04-22T08:31:10.5555823Z ................................................i................................................... 6900/9912 2020-04-22T08:31:12.7147012Z .................................................................................................... 7000/9912 2020-04-22T08:31:14.8472400Z ........................................................................................i........... 7100/9912 --- 2020-04-22T08:32:56.7442380Z .................................................................................................... 7900/9912 2020-04-22T08:33:03.4030636Z .................................................................................................... 8000/9912 2020-04-22T08:33:09.4621256Z ......................................................i............................................. 8100/9912 2020-04-22T08:33:19.6363129Z .................................................................................................... 8200/9912 2020-04-22T08:33:25.1593028Z ...iiiiii.iiiii.i................................................................................... 8300/9912 2020-04-22T08:33:39.0084884Z .................................................................................................... 8500/9912 2020-04-22T08:33:47.0098207Z .................................................................................................... 8600/9912 2020-04-22T08:34:00.9810673Z .................................................................................................... 8700/9912 2020-04-22T08:34:07.7358285Z .................................................................................................... 8800/9912 --- 2020-04-22T08:36:27.8999864Z ................F............................F................FF................F..F...... 2020-04-22T08:36:27.9011802Z failures: 2020-04-22T08:36:27.9016474Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:348:22 2020-04-22T08:36:27.9016806Z 2020-04-22T08:36:27.9017367Z ---- [mir-opt] mir-opt/const_prop/control-flow-simplification.rs stdout ---- 2020-04-22T08:36:27.9018288Z 51 // + literal: Const { ty: fn(&str) -> ! {std::rt::begin_panic::<&str>}, val: Value(Scalar(<ZST>)) } 2020-04-22T08:36:27.9018906Z 52 // ty::Const 2020-04-22T08:36:27.9020625Z 53 // + ty: &str 2020-04-22T08:36:27.9022651Z - // + val: Value(Slice { data: Allocation { bytes: [101, 120, 112, 108, 105, 99, 105, 116, 32, 112, 97, 110, 105, 99], relocations: Relocations(SortedMap { data: [] }), undef_mask: UndefMask { blocks: [16383], len: Size { raw: 14 } }, size: Size { raw: 14 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 14 }) 2020-04-22T08:36:27.9025185Z + // + val: Value(Slice { data: Allocation { bytes: [101, 120, 112, 108, 105, 99, 105, 116, 32, 112, 97, 110, 105, 99], relocations: Relocations(SortedMap { data: [] }), undef_mask: UninitMask { blocks: [16383], len: Size { raw: 14 } }, size: Size { raw: 14 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 14 }) 2020-04-22T08:36:27.9027843Z 55 // mir::Constant 2020-04-22T08:36:27.9028256Z 56 // + span: $SRC_DIR/libstd/macros.rs:LL:COL 2020-04-22T08:36:27.9031784Z - // + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [101, 120, 112, 108, 105, 99, 105, 116, 32, 112, 97, 110, 105, 99], relocations: Relocations(SortedMap { data: [] }), undef_mask: UndefMask { blocks: [16383], len: Size { raw: 14 } }, size: Size { raw: 14 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 14 }) } 2020-04-22T08:36:27.9034252Z + // + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [101, 120, 112, 108, 105, 99, 105, 116, 32, 112, 97, 110, 105, 99], relocations: Relocations(SortedMap { data: [] }), undef_mask: UninitMask { blocks: [16383], len: Size { raw: 14 } }, size: Size { raw: 14 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 14 }) } 2020-04-22T08:36:27.9035936Z 59 } 2020-04-22T08:36:27.9036098Z 60 2020-04-22T08:36:27.9036213Z 2020-04-22T08:36:27.9036213Z 2020-04-22T08:36:27.9037282Z thread '[mir-opt] mir-opt/const_prop/control-flow-simplification.rs' panicked at 'Actual MIR output differs from expected MIR output /checkout/src/test/mir-opt/const_prop/control-flow-simplification/rustc.hello.ConstProp.diff', src/tools/compiletest/src/runtest.rs:3165:25 2020-04-22T08:36:27.9038271Z 2020-04-22T08:36:27.9038730Z ---- [mir-opt] mir-opt/inline/inline-into-box-place.rs stdout ---- 2020-04-22T08:36:27.9038730Z ---- [mir-opt] mir-opt/inline/inline-into-box-place.rs stdout ---- 2020-04-22T08:36:27.9039525Z 24 - // + ty: fn() -> std::vec::Vec<u32> {std::vec::Vec::<u32>::new} 2020-04-22T08:36:27.9040284Z 25 - // + val: Value(Scalar(<ZST>)) 2020-04-22T08:36:27.9040731Z 26 + // + ty: alloc::raw_vec::RawVec<u32> 2020-04-22T08:36:27.9044003Z - + // + val: Value(ByRef { alloc: Allocation { bytes: [4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], relocations: Relocations(SortedMap { data: [] }), undef_mask: UndefMask { blocks: [65535], len: Size { raw: 16 } }, size: Size { raw: 16 }, align: Align { pow2: 3 }, mutability: Not, extra: () }, offset: Size { raw: 0 } }) 2020-04-22T08:36:27.9046416Z + + // + val: Value(ByRef { alloc: Allocation { bytes: [4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], relocations: Relocations(SortedMap { data: [] }), undef_mask: UninitMask { blocks: [65535], len: Size { raw: 16 } }, size: Size { raw: 16 }, align: Align { pow2: 3 }, mutability: Not, extra: () }, offset: Size { raw: 0 } }) 2020-04-22T08:36:27.9047779Z 28 // mir::Constant 2020-04-22T08:36:27.9048621Z 29 - // + span: $DIR/inline-into-box-place.rs:8:33: 8:41 2020-04-22T08:36:27.9049338Z 30 - // + user_ty: UserType(1) 2020-04-22T08:36:27.9049577Z 2020-04-22T08:36:27.9050195Z 41 - _0 = const (); // bb2[2]: scope 0 at $DIR/inline-into-box-place.rs:7:11: 9:2 2020-04-22T08:36:27.9050764Z 42 + // + span: $SRC_DIR/liballoc/vec.rs:LL:COL 2020-04-22T08:36:27.9051193Z 43 + // + user_ty: UserType(0) 2020-04-22T08:36:27.9053265Z - + // + literal: Const { ty: alloc::raw_vec::RawVec<u32>, val: Value(ByRef { alloc: Allocation { bytes: [4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], relocations: Relocations(SortedMap { data: [] }), undef_mask: UndefMask { blocks: [65535], len: Size { raw: 16 } }, size: Size { raw: 16 }, align: Align { pow2: 3 }, mutability: Not, extra: () }, offset: Size { raw: 0 } }) } 2020-04-22T08:36:27.9056104Z + + // + literal: Const { ty: alloc::raw_vec::RawVec<u32>, val: Value(ByRef { alloc: Allocation { bytes: [4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], relocations: Relocations(SortedMap { data: [] }), undef_mask: UninitMask { blocks: [65535], len: Size { raw: 16 } }, size: Size { raw: 16 }, align: Align { pow2: 3 }, mutability: Not, extra: () }, offset: Size { raw: 0 } }) } 2020-04-22T08:36:27.9057700Z 45 + ((*_4).1: usize) = const 0usize; // bb0[5]: scope 2 at $SRC_DIR/liballoc/vec.rs:LL:COL 2020-04-22T08:36:27.9058146Z 46 // ty::Const 2020-04-22T08:36:27.9058499Z 47 + // + ty: usize 2020-04-22T08:36:27.9058845Z 2020-04-22T08:36:27.9059903Z thread '[mir-opt] mir-opt/inline/inline-into-box-place.rs' panicked at 'Actual MIR output differs from expected MIR output /checkout/src/test/mir-opt/inline/inline-into-box-place/64bit/rustc.main.Inline.diff', src/tools/compiletest/src/runtest.rs:3165:25 2020-04-22T08:36:27.9060922Z ---- [mir-opt] mir-opt/no-drop-for-inactive-variant.rs stdout ---- 2020-04-22T08:36:27.9060922Z ---- [mir-opt] mir-opt/no-drop-for-inactive-variant.rs stdout ---- 2020-04-22T08:36:27.9061808Z 32 // + literal: Const { ty: fn(&str) -> ! {std::rt::begin_panic::<&str>}, val: Value(Scalar(<ZST>)) } 2020-04-22T08:36:27.9062404Z 33 // ty::Const 2020-04-22T08:36:27.9062724Z 34 // + ty: &str 2020-04-22T08:36:27.9064587Z - // + val: Value(Slice { data: Allocation { bytes: [101, 120, 112, 108, 105, 99, 105, 116, 32, 112, 97, 110, 105, 99], relocations: Relocations(SortedMap { data: [] }), undef_mask: UndefMask { blocks: [16383], len: Size { raw: 14 } }, size: Size { raw: 14 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 14 }) 2020-04-22T08:36:27.9066967Z + // + val: Value(Slice { data: Allocation { bytes: [101, 120, 112, 108, 105, 99, 105, 116, 32, 112, 97, 110, 105, 99], relocations: Relocations(SortedMap { data: [] }), undef_mask: UninitMask { blocks: [16383], len: Size { raw: 14 } }, size: Size { raw: 14 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 14 }) 2020-04-22T08:36:27.9068328Z 36 // mir::Constant 2020-04-22T08:36:27.9068741Z 37 // + span: $SRC_DIR/libstd/macros.rs:LL:COL 2020-04-22T08:36:27.9070927Z - // + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [101, 120, 112, 108, 105, 99, 105, 116, 32, 112, 97, 110, 105, 99], relocations: Relocations(SortedMap { data: [] }), undef_mask: UndefMask { blocks: [16383], len: Size { raw: 14 } }, size: Size { raw: 14 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 14 }) } 2020-04-22T08:36:27.9073450Z + // + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [101, 120, 112, 108, 105, 99, 105, 116, 32, 112, 97, 110, 105, 99], relocations: Relocations(SortedMap { data: [] }), undef_mask: UninitMask { blocks: [16383], len: Size { raw: 14 } }, size: Size { raw: 14 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 14 }) } 2020-04-22T08:36:27.9074934Z 40 2020-04-22T08:36:27.9075111Z 41 bb3: { 2020-04-22T08:36:27.9075247Z 2020-04-22T08:36:27.9075247Z 2020-04-22T08:36:27.9076319Z thread '[mir-opt] mir-opt/no-drop-for-inactive-variant.rs' panicked at 'Actual MIR output differs from expected MIR output /checkout/src/test/mir-opt/no-drop-for-inactive-variant/rustc.unwrap.SimplifyCfg-elaborate-drops.after.mir', src/tools/compiletest/src/runtest.rs:3165:25 2020-04-22T08:36:27.9077371Z ---- [mir-opt] mir-opt/no-spurious-drop-after-call.rs stdout ---- 2020-04-22T08:36:27.9077371Z ---- [mir-opt] mir-opt/no-spurious-drop-after-call.rs stdout ---- 2020-04-22T08:36:27.9078142Z 15 _4 = const ""; // bb0[4]: scope 0 at $DIR/no-spurious-drop-after-call.rs:9:20: 9:22 2020-04-22T08:36:27.9078649Z 16 // ty::Const 2020-04-22T08:36:27.9078964Z 17 // + ty: &str 2020-04-22T08:36:27.9080504Z - // + val: Value(Slice { data: Allocation { bytes: [], relocations: Relocations(SortedMap { data: [] }), undef_mask: UndefMask { blocks: [], len: Size { raw: 0 } }, size: Size { raw: 0 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 0 }) 2020-04-22T08:36:27.9082362Z + // + val: Value(Slice { data: Allocation { bytes: [], relocations: Relocations(SortedMap { data: [] }), undef_mask: UninitMask { blocks: [], len: Size { raw: 0 } }, size: Size { raw: 0 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 0 }) 2020-04-22T08:36:27.9083567Z 19 // mir::Constant 2020-04-22T08:36:27.9084320Z 20 // + span: $DIR/no-spurious-drop-after-call.rs:9:20: 9:22 2020-04-22T08:36:27.9086114Z - // + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [], relocations: Relocations(SortedMap { data: [] }), undef_mask: UndefMask { blocks: [], len: Size { raw: 0 } }, size: Size { raw: 0 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 0 }) } 2020-04-22T08:36:27.9088190Z + // + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [], relocations: Relocations(SortedMap { data: [] }), undef_mask: UninitMask { blocks: [], len: Size { raw: 0 } }, size: Size { raw: 0 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 0 }) } 2020-04-22T08:36:27.9089833Z 22 _3 = &(*_4); // bb0[5]: scope 0 at $DIR/no-spurious-drop-after-call.rs:9:20: 9:22 2020-04-22T08:36:27.9090882Z 23 _2 = const <str as std::string::ToString>::to_string(move _3) -> bb2; // bb0[6]: scope 0 at $DIR/no-spurious-drop-after-call.rs:9:20: 9:34 2020-04-22T08:36:27.9091466Z 24 // ty::Const 2020-04-22T08:36:27.9091679Z 2020-04-22T08:36:27.9092656Z thread '[mir-opt] mir-opt/no-spurious-drop-after-call.rs' panicked at 'Actual MIR output differs from expected MIR output /checkout/src/test/mir-opt/no-spurious-drop-after-call/rustc.main.ElaborateDrops.before.mir', src/tools/compiletest/src/runtest.rs:3165:25 2020-04-22T08:36:27.9093677Z ---- [mir-opt] mir-opt/storage_live_dead_in_statics.rs stdout ---- 2020-04-22T08:36:27.9093677Z ---- [mir-opt] mir-opt/storage_live_dead_in_statics.rs stdout ---- 2020-04-22T08:36:27.9094834Z 653 _2 = Foo { tup: const "hi", data: move _3 }; // bb0[94]: scope 0 at $DIR/storage_live_dead_in_statics.rs:5:29: 23:2 2020-04-22T08:36:27.9095422Z 654 // ty::Const 2020-04-22T08:36:27.9095745Z 655 // + ty: &str 2020-04-22T08:36:27.9097442Z - // + val: Value(Slice { data: Allocation { bytes: [104, 105], relocations: Relocations(SortedMap { data: [] }), undef_mask: UndefMask { blocks: [3], len: Size { raw: 2 } }, size: Size { raw: 2 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 2 }) 2020-04-22T08:36:27.9101304Z + // + val: Value(Slice { data: Allocation { bytes: [104, 105], relocations: Relocations(SortedMap { data: [] }), undef_mask: UninitMask { blocks: [3], len: Size { raw: 2 } }, size: Size { raw: 2 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 2 }) 2020-04-22T08:36:27.9102474Z 657 // mir::Constant 2020-04-22T08:36:27.9105163Z 658 // + span: $DIR/storage_live_dead_in_statics.rs:6:10: 6:14 2020-04-22T08:36:27.9107424Z - // + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [104, 105], relocations: Relocations(SortedMap { data: [] }), undef_mask: UndefMask { blocks: [3], len: Size { raw: 2 } }, size: Size { raw: 2 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 2 }) } 2020-04-22T08:36:27.9110105Z + // + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [104, 105], relocations: Relocations(SortedMap { data: [] }), undef_mask: UninitMask { blocks: [3], len: Size { raw: 2 } }, size: Size { raw: 2 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 2 }) } 2020-04-22T08:36:27.9111524Z 660 _1 = &_2; // bb0[95]: scope 0 at $DIR/storage_live_dead_in_statics.rs:5:28: 23:2 2020-04-22T08:36:27.9112354Z 661 _0 = &(*_1); // bb0[96]: scope 0 at $DIR/storage_live_dead_in_statics.rs:5:28: 23:2 2020-04-22T08:36:27.9113574Z 662 StorageDead(_5); // bb0[97]: scope 0 at $DIR/storage_live_dead_in_statics.rs:23:1: 23:2 2020-04-22T08:36:27.9114596Z 2020-04-22T08:36:27.9115724Z thread '[mir-opt] mir-opt/storage_live_dead_in_statics.rs' panicked at 'Actual MIR output differs from expected MIR output /checkout/src/test/mir-opt/storage_live_dead_in_statics/rustc.XXX.mir_map.0.mir', src/tools/compiletest/src/runtest.rs:3165:25 2020-04-22T08:36:27.9116744Z ---- [mir-opt] mir-opt/uninhabited_enum_branching.rs stdout ---- 2020-04-22T08:36:27.9116744Z ---- [mir-opt] mir-opt/uninhabited_enum_branching.rs stdout ---- 2020-04-22T08:36:27.9118509Z 27 _5 = const "C"; // bb1[1]: scope 0 at $DIR/uninhabited_enum_branching.rs:23:21: 23:24 2020-04-22T08:36:27.9119025Z 28 // ty::Const 2020-04-22T08:36:27.9119384Z 29 // + ty: &str 2020-04-22T08:36:27.9121128Z - // + val: Value(Slice { data: Allocation { bytes: [67], relocations: Relocations(SortedMap { data: [] }), undef_mask: UndefMask { blocks: [1], len: Size { raw: 1 } }, size: Size { raw: 1 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 1 }) 2020-04-22T08:36:27.9123273Z + // + val: Value(Slice { data: Allocation { bytes: [67], relocations: Relocations(SortedMap { data: [] }), undef_mask: UninitMask { blocks: [1], len: Size { raw: 1 } }, size: Size { raw: 1 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 1 }) 2020-04-22T08:36:27.9124403Z 31 // mir::Constant 2020-04-22T08:36:27.9124883Z 32 // + span: $DIR/uninhabited_enum_branching.rs:23:21: 23:24 2020-04-22T08:36:27.9126904Z - // + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [67], relocations: Relocations(SortedMap { data: [] }), undef_mask: UndefMask { blocks: [1], len: Size { raw: 1 } }, size: Size { raw: 1 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 1 }) } 2020-04-22T08:36:27.9130222Z + // + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [67], relocations: Relocations(SortedMap { data: [] }), undef_mask: UninitMask { blocks: [1], len: Size { raw: 1 } }, size: Size { raw: 1 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 1 }) } 2020-04-22T08:36:27.9132086Z 34 _1 = &(*_5); // bb1[2]: scope 0 at $DIR/uninhabited_enum_branching.rs:23:21: 23:24 2020-04-22T08:36:27.9132768Z 35 StorageDead(_5); // bb1[3]: scope 0 at $DIR/uninhabited_enum_branching.rs:23:23: 23:24 2020-04-22T08:36:27.9133830Z 36 goto -> bb4; // bb1[4]: scope 0 at $DIR/uninhabited_enum_branching.rs:20:5: 24:6 2020-04-22T08:36:27.9134198Z 2020-04-22T08:36:27.9134594Z 40 _1 = const "A(Empty)"; // bb2[0]: scope 0 at $DIR/uninhabited_enum_branching.rs:21:24: 21:34 2020-04-22T08:36:27.9141279Z 41 // ty::Const 2020-04-22T08:36:27.9141610Z 42 // + ty: &str 2020-04-22T08:36:27.9148872Z - // + val: Value(Slice { data: Allocation { bytes: [65, 40, 69, 109, 112, 116, 121, 41], relocations: Relocations(SortedMap { data: [] }), undef_mask: UndefMask { blocks: [255], len: Size { raw: 8 } }, size: Size { raw: 8 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 8 }) 2020-04-22T08:36:27.9151054Z + // + val: Value(Slice { data: Allocation { bytes: [65, 40, 69, 109, 112, 116, 121, 41], relocations: Relocations(SortedMap { data: [] }), undef_mask: UninitMask { blocks: [255], len: Size { raw: 8 } }, size: Size { raw: 8 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 8 }) 2020-04-22T08:36:27.9152474Z 44 // mir::Constant 2020-04-22T08:36:27.9152943Z 45 // + span: $DIR/uninhabited_enum_branching.rs:21:24: 21:34 2020-04-22T08:36:27.9155170Z - // + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [65, 40, 69, 109, 112, 116, 121, 41], relocations: Relocations(SortedMap { data: [] }), undef_mask: UndefMask { blocks: [255], len: Size { raw: 8 } }, size: Size { raw: 8 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 8 }) } 2020-04-22T08:36:27.9158067Z + // + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [65, 40, 69, 109, 112, 116, 121, 41], relocations: Relocations(SortedMap { data: [] }), undef_mask: UninitMask { blocks: [255], len: Size { raw: 8 } }, size: Size { raw: 8 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 8 }) } 2020-04-22T08:36:27.9159927Z 47 goto -> bb4; // bb2[1]: scope 0 at $DIR/uninhabited_enum_branching.rs:20:5: 24:6 2020-04-22T08:36:27.9160490Z 49 2020-04-22T08:36:27.9160605Z 2020-04-22T08:36:27.9160605Z 2020-04-22T08:36:27.9160994Z 52 _4 = const "B(Empty)"; // bb3[1]: scope 0 at $DIR/uninhabited_enum_branching.rs:22:24: 22:34 2020-04-22T08:36:27.9161551Z 53 // ty::Const 2020-04-22T08:36:27.9161881Z 54 // + ty: &str 2020-04-22T08:36:27.9163793Z - // + val: Value(Slice { data: Allocation { bytes: [66, 40, 69, 109, 112, 116, 121, 41], relocations: Relocations(SortedMap { data: [] }), undef_mask: UndefMask { blocks: [255], len: Size { raw: 8 } }, size: Size { raw: 8 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 8 }) 2020-04-22T08:36:27.9166307Z + // + val: Value(Slice { data: Allocation { bytes: [66, 40, 69, 109, 112, 116, 121, 41], relocations: Relocations(SortedMap { data: [] }), undef_mask: UninitMask { blocks: [255], len: Size { raw: 8 } }, size: Size { raw: 8 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 8 }) 2020-04-22T08:36:27.9167785Z 56 // mir::Constant 2020-04-22T08:36:27.9168248Z 57 // + span: $DIR/uninhabited_enum_branching.rs:22:24: 22:34 2020-04-22T08:36:27.9170358Z - // + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [66, 40, 69, 109, 112, 116, 121, 41], relocations: Relocations(SortedMap { data: [] }), undef_mask: UndefMask { blocks: [255], len: Size { raw: 8 } }, size: Size { raw: 8 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 8 }) } 2020-04-22T08:36:27.9172652Z + // + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [66, 40, 69, 109, 112, 116, 121, 41], relocations: Relocations(SortedMap { data: [] }), undef_mask: UninitMask { blocks: [255], len: Size { raw: 8 } }, size: Size { raw: 8 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 8 }) } 2020-04-22T08:36:27.9174789Z 59 _1 = &(*_4); // bb3[2]: scope 0 at $DIR/uninhabited_enum_branching.rs:22:24: 22:34 2020-04-22T08:36:27.9175448Z 60 StorageDead(_4); // bb3[3]: scope 0 at $DIR/uninhabited_enum_branching.rs:22:33: 22:34 2020-04-22T08:36:27.9176485Z 61 goto -> bb4; // bb3[4]: scope 0 at $DIR/uninhabited_enum_branching.rs:20:5: 24:6 2020-04-22T08:36:27.9176852Z 2020-04-22T08:36:27.9177247Z 76 _9 = const "E"; // bb5[1]: scope 0 at $DIR/uninhabited_enum_branching.rs:28:21: 28:24 2020-04-22T08:36:27.9177905Z 77 // ty::Const 2020-04-22T08:36:27.9178227Z 78 // + ty: &str 2020-04-22T08:36:27.9179874Z - // + val: Value(Slice { data: Allocation { bytes: [69], relocations: Relocations(SortedMap { data: [] }), undef_mask: UndefMask { blocks: [1], len: Size { raw: 1 } }, size: Size { raw: 1 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 1 }) 2020-04-22T08:36:27.9181776Z + // + val: Value(Slice { data: Allocation { bytes: [69], relocations: Relocations(SortedMap { data: [] }), undef_mask: UninitMask { blocks: [1], len: Size { raw: 1 } }, size: Size { raw: 1 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 1 }) 2020-04-22T08:36:27.9182939Z 80 // mir::Constant 2020-04-22T08:36:27.9183403Z 81 // + span: $DIR/uninhabited_enum_branching.rs:28:21: 28:24 2020-04-22T08:36:27.9186577Z - // + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [69], relocations: Relocations(SortedMap { data: [] }), undef_mask: UndefMask { blocks: [1], len: Size { raw: 1 } }, size: Size { raw: 1 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 1 }) } 2020-04-22T08:36:27.9188648Z + // + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [69], relocations: Relocations(SortedMap { data: [] }), undef_mask: UninitMask { blocks: [1], len: Size { raw: 1 } }, size: Size { raw: 1 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 1 }) } 2020-04-22T08:36:27.9190175Z 83 _6 = &(*_9); // bb5[2]: scope 0 at $DIR/uninhabited_enum_branching.rs:28:21: 28:24 2020-04-22T08:36:27.9190844Z 84 StorageDead(_9); // bb5[3]: scope 0 at $DIR/uninhabited_enum_branching.rs:28:23: 28:24 2020-04-22T08:36:27.9191834Z 85 goto -> bb7; // bb5[4]: scope 0 at $DIR/uninhabited_enum_branching.rs:26:5: 29:6 2020-04-22T08:36:27.9192198Z 2020-04-22T08:36:27.9192576Z 89 _6 = const "D"; // bb6[0]: scope 0 at $DIR/uninhabited_enum_branching.rs:27:21: 27:24 2020-04-22T08:36:27.9193080Z 90 // ty::Const 2020-04-22T08:36:27.9193403Z 91 // + ty: &str 2020-04-22T08:36:27.9194979Z - // + val: Value(Slice { data: Allocation { bytes: [68], relocations: Relocations(SortedMap { data: [] }), undef_mask: UndefMask { blocks: [1], len: Size { raw: 1 } }, size: Size { raw: 1 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 1 }) 2020-04-22T08:36:27.9196898Z + // + val: Value(Slice { data: Allocation { bytes: [68], relocations: Relocations(SortedMap { data: [] }), undef_mask: UninitMask { blocks: [1], len: Size { raw: 1 } }, size: Size { raw: 1 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 1 }) 2020-04-22T08:36:27.9198390Z 93 // mir::Constant 2020-04-22T08:36:27.9198854Z 94 // + span: $DIR/uninhabited_enum_branching.rs:27:21: 27:24 2020-04-22T08:36:27.9201019Z - // + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [68], relocations: Relocations(SortedMap { data: [] }), undef_mask: UndefMask { blocks: [1], len: Size { raw: 1 } }, size: Size { raw: 1 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 1 }) } 2020-04-22T08:36:27.9203401Z + // + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [68], relocations: Relocations(SortedMap { data: [] }), undef_mask: UninitMask { blocks: [1], len: Size { raw: 1 } }, size: Size { raw: 1 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 1 }) } 2020-04-22T08:36:27.9205572Z 96 goto -> bb7; // bb6[1]: scope 0 at $DIR/uninhabited_enum_branching.rs:26:5: 29:6 2020-04-22T08:36:27.9206113Z 98 2020-04-22T08:36:27.9206247Z 2020-04-22T08:36:27.9206247Z 2020-04-22T08:36:27.9207247Z thread '[mir-opt] mir-opt/uninhabited_enum_branching.rs' panicked at 'Actual MIR output differs from expected MIR output /checkout/src/test/mir-opt/uninhabited_enum_branching/rustc.main.UninhabitedEnumBranching.diff', src/tools/compiletest/src/runtest.rs:3165:25 2020-04-22T08:36:27.9207932Z 2020-04-22T08:36:27.9208076Z failures: 2020-04-22T08:36:27.9208538Z [mir-opt] mir-opt/const_prop/control-flow-simplification.rs 2020-04-22T08:36:27.9209064Z [mir-opt] mir-opt/inline/inline-into-box-place.rs --- 2020-04-22T08:36:27.9211804Z test result: FAILED. 84 passed; 6 failed; 0 ignored; 0 measured; 0 filtered out 2020-04-22T08:36:27.9212083Z 2020-04-22T08:36:27.9212258Z 2020-04-22T08:36:27.9212361Z 2020-04-22T08:36:27.9217112Z 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/mir-opt" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/mir-opt" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "mir-opt" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-8/bin/FileCheck" "--nodejs" "/usr/bin/node" "--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" "8.0.0" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always" 2020-04-22T08:36:27.9219888Z 2020-04-22T08:36:27.9219996Z 2020-04-22T08:36:27.9220667Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test --exclude src/tools/tidy 2020-04-22T08:36:27.9221056Z Build completed unsuccessfully in 1:07:37 2020-04-22T08:36:27.9221056Z Build completed unsuccessfully in 1:07:37 2020-04-22T08:36:27.9221317Z == clock drift check == 2020-04-22T08:36:27.9221591Z local time: Wed Apr 22 08:36:27 UTC 2020 2020-04-22T08:36:28.2105174Z network time: Wed, 22 Apr 2020 08:36:28 GMT 2020-04-22T08:36:30.4355933Z 2020-04-22T08:36:30.4355933Z 2020-04-22T08:36:30.4431076Z ##[error]Bash exited with code '1'. 2020-04-22T08:36:30.4443946Z ##[section]Finishing: Run build 2020-04-22T08:36:30.4517706Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/71418/merge to s 2020-04-22T08:36:30.4524506Z Task : Get sources 2020-04-22T08:36:30.4524836Z Description : Get sources from a repository. Supports Git, TfsVC, and SVN repositories. 2020-04-22T08:36:30.4525123Z Version : 1.0.0 2020-04-22T08:36:30.4525515Z Author : Microsoft 2020-04-22T08:36:30.4525515Z Author : Microsoft 2020-04-22T08:36:30.4525859Z Help : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199) 2020-04-22T08:36:30.4526227Z ============================================================================== 2020-04-22T08:36:30.8419346Z Cleaning any cached credential from repository: rust-lang/rust (GitHub) 2020-04-22T08:36:30.8462350Z ##[section]Finishing: Checkout rust-lang/rust@refs/pull/71418/merge to s 2020-04-22T08:36:30.8571980Z Cleaning up task key 2020-04-22T08:36:30.8573223Z Start cleaning up orphan processes. 2020-04-22T08:36:30.8809043Z Terminate orphan process: pid (4791) (python) 2020-04-22T08:36:30.9088851Z ##[section]Finishing: Finalize Job 

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 @rust-lang/infra. (Feature Requests)

[RalfJung]

@hbina run the tests with --bless to adjust the expected test output.

So, the full invocation would be something like

./x.py test src/test/mir-opt --stage 1 --bless 

(@oli-obk I hope this is right?)

[RalfJung]

Resolves #71193

This does not fully resolve the issue. Those three renames were just examples, I did not actually search for all identifiers that need renaming. Someone still needs to do that work. :)

It's a great start though, I am fine with doing this rename in steps.

[hbina]

I think I have implemented what you asked so far.

@RalfJung what about

rust/src/librustc_middle/mir/interpret/allocation.rs

Line 573 in db9b05a

pub struct AllocationDefinedness {

Is there such a thing as "undefined" variable? i.e. if I replace every instance of "undefined variable" to "uninitialized variable", will they all make sense?

[rust-highfive]

The job x86_64-gnu-llvm-8 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.

2020-04-23T02:36:56.8733402Z ========================== Starting Command Output =========================== 2020-04-23T02:36:56.8737187Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/b39b413d-6ed9-4ad6-982a-4889ca9e5f2e.sh 2020-04-23T02:36:56.8737557Z 2020-04-23T02:36:56.8740994Z ##[section]Finishing: Disable git automatic line ending conversion 2020-04-23T02:36:56.8757219Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/71418/merge to s 2020-04-23T02:36:56.8760212Z Task : Get sources 2020-04-23T02:36:56.8760450Z Description : Get sources from a repository. Supports Git, TfsVC, and SVN repositories. 2020-04-23T02:36:56.8760682Z Version : 1.0.0 2020-04-23T02:36:56.8760884Z Author : Microsoft --- 2020-04-23T02:36:58.1865123Z ##[command]git remote add origin https://github.com/rust-lang/rust 2020-04-23T02:36:58.1874805Z ##[command]git config gc.auto 0 2020-04-23T02:36:58.1880838Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader 2020-04-23T02:36:58.1885858Z ##[command]git config --get-all http.proxy 2020-04-23T02:36:58.1894956Z ##[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/71418/merge:refs/remotes/pull/71418/merge --- 2020-04-23T02:39:25.0444003Z ---> 318032b5f0e2 2020-04-23T02:39:25.0444975Z Step 5/8 : ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu --llvm-root=/usr/lib/llvm-8 --enable-llvm-link-shared --set rust.thin-lto-import-instr-limit=10 2020-04-23T02:39:25.0445455Z ---> Using cache 2020-04-23T02:39:25.0445721Z ---> d44a858fd1ce 2020-04-23T02:39:25.0446813Z Step 6/8 : ENV SCRIPT python2.7 ../x.py test --exclude src/tools/tidy && python2.7 ../x.py test src/test/mir-opt --pass=build --target=armv5te-unknown-linux-gnueabi && python2.7 ../x.py test src/tools/tidy 2020-04-23T02:39:25.0448177Z ---> 58b910f50f5a 2020-04-23T02:39:25.0448485Z Step 7/8 : ENV NO_DEBUG_ASSERTIONS=1 2020-04-23T02:39:25.0449201Z ---> Using cache 2020-04-23T02:39:25.0479816Z ---> ee7702aadba1 --- 2020-04-23T02:39:25.0824986Z Looks like docker image is the same as before, not uploading 2020-04-23T02:39:25.9728272Z [CI_JOB_NAME=x86_64-gnu-llvm-8] 2020-04-23T02:39:25.9994729Z [CI_JOB_NAME=x86_64-gnu-llvm-8] 2020-04-23T02:39:26.0018777Z == clock drift check == 2020-04-23T02:39:26.0029056Z local time: Thu Apr 23 02:39:26 UTC 2020 2020-04-23T02:39:26.0188351Z network time: Thu, 23 Apr 2020 02:39:26 GMT 2020-04-23T02:39:26.0210838Z Starting sccache server... 2020-04-23T02:39:26.0967966Z configure: processing command line 2020-04-23T02:39:26.0968567Z configure: 2020-04-23T02:39:26.0969772Z configure: rust.dist-src := False --- 2020-04-23T02:44:38.4759788Z Compiling rustc_feature v0.0.0 (/checkout/src/librustc_feature) 2020-04-23T02:44:40.0599852Z Compiling fmt_macros v0.0.0 (/checkout/src/libfmt_macros) 2020-04-23T02:44:41.7290134Z Compiling rustc_ast_pretty v0.0.0 (/checkout/src/librustc_ast_pretty) 2020-04-23T02:44:43.5669355Z Compiling rustc_hir v0.0.0 (/checkout/src/librustc_hir) 2020-04-23T02:44:52.1459708Z Compiling rustc_query_system v0.0.0 (/checkout/src/librustc_query_system) 2020-04-23T02:44:55.0995021Z Compiling rustc_hir_pretty v0.0.0 (/checkout/src/librustc_hir_pretty) 2020-04-23T02:44:59.6892465Z Compiling rustc_attr v0.0.0 (/checkout/src/librustc_attr) 2020-04-23T02:45:04.0043991Z Compiling rustc_parse v0.0.0 (/checkout/src/librustc_parse) 2020-04-23T02:45:13.1807394Z Compiling rustc_ast_lowering v0.0.0 (/checkout/src/librustc_ast_lowering) --- 2020-04-23T03:08:17.9858845Z Compiling rustc_feature v0.0.0 (/checkout/src/librustc_feature) 2020-04-23T03:08:19.7207398Z Compiling fmt_macros v0.0.0 (/checkout/src/libfmt_macros) 2020-04-23T03:08:21.5654974Z Compiling rustc_ast_pretty v0.0.0 (/checkout/src/librustc_ast_pretty) 2020-04-23T03:08:22.6577161Z Compiling rustc_hir v0.0.0 (/checkout/src/librustc_hir) 2020-04-23T03:08:32.5032485Z Compiling rustc_query_system v0.0.0 (/checkout/src/librustc_query_system) 2020-04-23T03:08:35.6405023Z Compiling rustc_hir_pretty v0.0.0 (/checkout/src/librustc_hir_pretty) 2020-04-23T03:08:40.4886594Z Compiling rustc_attr v0.0.0 (/checkout/src/librustc_attr) 2020-04-23T03:08:44.9952435Z Compiling rustc_parse v0.0.0 (/checkout/src/librustc_parse) 2020-04-23T03:08:54.8189320Z Compiling rustc_ast_lowering v0.0.0 (/checkout/src/librustc_ast_lowering) --- 2020-04-23T03:32:02.5671365Z .................................................................................................... 1700/9916 2020-04-23T03:32:06.7266476Z .................................................................................................... 1800/9916 2020-04-23T03:32:14.9287511Z .................................................................................................... 1900/9916 2020-04-23T03:32:22.7132302Z .....i.............................................................................................. 2000/9916 2020-04-23T03:32:28.8105114Z ...............................................................................................iiiii 2100/9916 2020-04-23T03:32:48.4534126Z .................................................................................................... 2300/9916 2020-04-23T03:32:50.6666496Z .................................................................................................... 2400/9916 2020-04-23T03:32:52.9323161Z .................................................................................................... 2500/9916 2020-04-23T03:32:58.5376189Z .................................................................................................... 2600/9916 --- 2020-04-23T03:35:52.9657382Z .................................................................................................... 5100/9916 2020-04-23T03:36:00.2142263Z .................................................................................................... 5200/9916 2020-04-23T03:36:04.7408337Z ..................i................................................................................. 5300/9916 2020-04-23T03:36:14.5059141Z ........i........................................................................................... 5400/9916 2020-04-23T03:36:19.9709604Z ........ii.ii........i...i.......................................................................... 5500/9916 2020-04-23T03:36:27.5498235Z .......................................................i............................................ 5700/9916 2020-04-23T03:36:36.2769197Z ........................................................................................ii.......... 5800/9916 2020-04-23T03:36:42.9873483Z ...........................i........................................................................ 5900/9916 2020-04-23T03:36:48.3916602Z .................................................................................................... 6000/9916 2020-04-23T03:36:48.3916602Z .................................................................................................... 6000/9916 2020-04-23T03:36:58.9451293Z .................................................................................................... 6100/9916 2020-04-23T03:37:08.8301397Z .....................ii...i..ii...........i......................................................... 6200/9916 2020-04-23T03:37:24.5220167Z .................................................................................................... 6400/9916 2020-04-23T03:37:31.1481728Z .................................................................................................... 6500/9916 2020-04-23T03:37:31.1481728Z .................................................................................................... 6500/9916 2020-04-23T03:37:50.3316422Z ...................................................i..ii............................................ 6600/9916 2020-04-23T03:38:11.4353322Z .................................................................................................... 6800/9916 2020-04-23T03:38:13.8258153Z ....................................................i............................................... 6900/9916 2020-04-23T03:38:15.8293134Z .................................................................................................... 7000/9916 2020-04-23T03:38:17.9604026Z ............................................................................................i....... 7100/9916 --- 2020-04-23T03:39:54.0296002Z .................................................................................................... 7900/9916 2020-04-23T03:40:00.1524016Z .................................................................................................... 8000/9916 2020-04-23T03:40:05.9169941Z ..........................................................i......................................... 8100/9916 2020-04-23T03:40:15.4001160Z .................................................................................................... 8200/9916 2020-04-23T03:40:20.5952048Z .......iiiiii.iiiii..i.............................................................................. 8300/9916 2020-04-23T03:40:33.9411539Z .................................................................................................... 8500/9916 2020-04-23T03:40:41.6169760Z .................................................................................................... 8600/9916 2020-04-23T03:40:54.3845866Z .................................................................................................... 8700/9916 2020-04-23T03:41:00.8200219Z .................................................................................................... 8800/9916 --- 2020-04-23T03:43:14.2548740Z Suite("src/test/codegen") not skipped for "bootstrap::test::Codegen" -- not in ["src/tools/tidy"] 2020-04-23T03:43:14.2739705Z Check compiletest suite=codegen mode=codegen (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu) 2020-04-23T03:43:14.4749475Z 2020-04-23T03:43:14.4749818Z running 186 tests 2020-04-23T03:43:17.6850876Z iiii......i.............ii.i..........i.............................i..i..................i....i.... 100/186 2020-04-23T03:43:19.9816255Z ........i.i.i...iii..iiiiiiiiiiiiiiii.......................iii...............ii...... 2020-04-23T03:43:19.9820030Z 2020-04-23T03:43:19.9820414Z finished in 5.707 2020-04-23T03:43:19.9821290Z Suite("src/test/codegen-units") not skipped for "bootstrap::test::CodegenUnits" -- not in ["src/tools/tidy"] 2020-04-23T03:43:19.9995622Z Check compiletest suite=codegen-units mode=codegen-units (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu) --- 2020-04-23T03:43:22.0677893Z Suite("src/test/assembly") not skipped for "bootstrap::test::Assembly" -- not in ["src/tools/tidy"] 2020-04-23T03:43:22.0860612Z Check compiletest suite=assembly mode=assembly (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu) 2020-04-23T03:43:22.2321516Z 2020-04-23T03:43:22.2321856Z running 9 tests 2020-04-23T03:43:22.2322786Z iiiiiiiii 2020-04-23T03:43:22.2323877Z 2020-04-23T03:43:22.2326912Z finished in 0.146 2020-04-23T03:43:22.2329356Z Suite("src/test/incremental") not skipped for "bootstrap::test::Incremental" -- not in ["src/tools/tidy"] 2020-04-23T03:43:22.2502085Z Check compiletest suite=incremental mode=incremental (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu) --- 2020-04-23T03:43:41.6096831Z Suite("src/test/debuginfo") not skipped for "bootstrap::test::Debuginfo" -- not in ["src/tools/tidy"] 2020-04-23T03:43:41.6303324Z Check compiletest suite=debuginfo mode=debuginfo (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu) 2020-04-23T03:43:41.8088135Z 2020-04-23T03:43:41.8088395Z running 115 tests 2020-04-23T03:43:54.8651262Z iiiii..i.....i..i...i..i.i.i..i..i..ii....i.i....ii..........iiii.........i.....i..i.......ii.i.ii.. 100/115 2020-04-23T03:43:56.6730986Z ...iiii.....ii. 2020-04-23T03:43:56.6736371Z 2020-04-23T03:43:56.6738286Z finished in 15.042 2020-04-23T03:43:56.6773364Z Suite("src/test/ui-fulldeps") not skipped for "bootstrap::test::UiFullDeps" -- not in ["src/tools/tidy"] 2020-04-23T03:43:56.6774794Z Uplifting stage1 rustc (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu) --- 2020-04-23T03:44:31.6696298Z ---- [ui] ui-fulldeps/undef_mask.rs stdout ---- 2020-04-23T03:44:31.6696580Z 2020-04-23T03:44:31.6697057Z error: test compilation failed although it shouldn't! 2020-04-23T03:44:31.6697412Z status: exit code: 1 2020-04-23T03:44:31.6698984Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui-fulldeps/undef_mask.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-C" "prefer-dynamic" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui-fulldeps/undef_mask/a" "-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-fulldeps/undef_mask/auxiliary" 2020-04-23T03:44:31.6700405Z ------------------------------------------ 2020-04-23T03:44:31.6700684Z 2020-04-23T03:44:31.6701107Z ------------------------------------------ 2020-04-23T03:44:31.6701393Z stderr: 2020-04-23T03:44:31.6701393Z stderr: 2020-04-23T03:44:31.6701841Z ------------------------------------------ 2020-04-23T03:44:31.6702238Z error[E0432]: unresolved import `rustc_middle::mir::interpret::UndefMask` 2020-04-23T03:44:31.6702837Z --> /checkout/src/test/ui-fulldeps/undef_mask.rs:10:5 2020-04-23T03:44:31.6703147Z | 2020-04-23T03:44:31.6703431Z LL | use rustc_middle::mir::interpret::UndefMask; 2020-04-23T03:44:31.6703856Z | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no `UndefMask` in `mir::interpret` 2020-04-23T03:44:31.6704410Z error: aborting due to previous error 2020-04-23T03:44:31.6704653Z 2020-04-23T03:44:31.6705133Z For more information about this error, try `rustc --explain E0432`. 2020-04-23T03:44:31.6705419Z --- 2020-04-23T03:44:31.6715296Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:348:22 2020-04-23T03:44:31.6715647Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace 2020-04-23T03:44:31.6723499Z 2020-04-23T03:44:31.6723624Z 2020-04-23T03:44:31.6729914Z 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-fulldeps" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui-fulldeps" "--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-8/bin/FileCheck" "--nodejs" "/usr/bin/node" "--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" "8.0.0" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always" 2020-04-23T03:44:31.6732400Z 2020-04-23T03:44:31.6732649Z 2020-04-23T03:44:31.6744131Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test --exclude src/tools/tidy 2020-04-23T03:44:31.6744672Z Build completed unsuccessfully in 1:03:34 2020-04-23T03:44:31.6744672Z Build completed unsuccessfully in 1:03:34 2020-04-23T03:44:31.6826198Z == clock drift check == 2020-04-23T03:44:31.6851468Z local time: Thu Apr 23 03:44:31 UTC 2020 2020-04-23T03:44:31.7155301Z network time: Thu, 23 Apr 2020 03:44:31 GMT 2020-04-23T03:44:32.5796822Z 2020-04-23T03:44:32.5796822Z 2020-04-23T03:44:32.5872432Z ##[error]Bash exited with code '1'. 2020-04-23T03:44:32.5886812Z ##[section]Finishing: Run build 2020-04-23T03:44:32.5930720Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/71418/merge to s 2020-04-23T03:44:32.5936319Z Task : Get sources 2020-04-23T03:44:32.5936643Z Description : Get sources from a repository. Supports Git, TfsVC, and SVN repositories. 2020-04-23T03:44:32.5936919Z Version : 1.0.0 2020-04-23T03:44:32.5937120Z Author : Microsoft 2020-04-23T03:44:32.5937120Z Author : Microsoft 2020-04-23T03:44:32.5937452Z Help : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199) 2020-04-23T03:44:32.5937807Z ============================================================================== 2020-04-23T03:44:32.9305475Z Cleaning any cached credential from repository: rust-lang/rust (GitHub) 2020-04-23T03:44:32.9354109Z ##[section]Finishing: Checkout rust-lang/rust@refs/pull/71418/merge to s 2020-04-23T03:44:32.9458553Z Cleaning up task key 2020-04-23T03:44:32.9460186Z Start cleaning up orphan processes. 2020-04-23T03:44:32.9643968Z Terminate orphan process: pid (4706) (python) 2020-04-23T03:44:32.9897938Z ##[section]Finishing: Finalize Job 

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 @rust-lang/infra. (Feature Requests)

[RalfJung]

AllocationDefinedness also needs renaming, let's remember that for the next batch.

Is there such a thing as "undefined" variable? i.e. if I replace every instance of "undefined variable" to "uninitialized variable", will they all make sense?

I think I need some more context for this, could you point to some occurrences of this term that may have to be replaced?
But generally I don't think "undefined variable" in Miri is a thing. Outside of Miri, other terminology may be used.

[RalfJung]

r? @oli-obk

[RalfJung]

eh, wtf. r? @RalfJung

[oli-obk]

You also need to run ./x.py test src/test/mir-opt --stage 1 --bless --target i686-unknown-linux-gnu to update the 32 bit tests

[bors]

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

[RalfJung]

Also you have a whole bunch of merge conflicts... could you please rebase, and re---bless the tests?

[hbina]

I have since rebased to master, waiting for the test to finish. I had to resolve some merge conflicts so I cannot vouch if all i did was truly just renaming stuff - meaning there might be logic change. Namely, I had to remove a bunch of AllocId from Tags or something

[hbina]

it...checked out perfectly on my end. I did have to force push, could that be an issue?

hbina@hbinadesk:~/git/rust$ ./x.py check Updating only changed submodules Submodules updated in 0.04 seconds Finished dev [unoptimized] target(s) in 0.76s Checking rustdoc artifacts (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu) Checking clippy artifacts (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu) Checking std artifacts (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu) Finished release [optimized + debuginfo] target(s) in 0.28s Checking compiler artifacts (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu) Finished release [optimized + debuginfo] target(s) in 0.33s Checking rustdoc artifacts (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu) Finished release [optimized + debuginfo] target(s) in 0.21s Checking clippy artifacts (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu) Finished release [optimized + debuginfo] target(s) in 0.18s Build completed successfully in 0:00:03 hbina@hbinadesk:~/git/rust$ git status On branch rename_miri_undef Your branch is up to date with 'hbina/rename_miri_undef'. nothing to commit, working tree clean hbina@hbinadesk:~/git/rust$ 

[RalfJung]

Hm, maybe you need to rebase again?

[bors]

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

[RalfJung]

And there's another conflict. :/ Unfortunately renames tend to have that issue, as they touch code in many places. I'll review this ASAP when you are ready. Please don't forget about the 2 open conversations, though (in particular #71418 (comment)).

[RalfJung]

Also the conflicts are not resolved yet according to what GitHub says.

[RalfJung]

@hbina not sure if you are aware, there are still unresolved conflicts.

[hbina]

Sorry, it takes quite some time to run the bless

[RalfJung]

It's okay, just wanted to make sure you were not waiting for me. :)

Remember to always add --stage 1 to avoid building everything twice.

[RalfJung]

Looking good, thanks for enduring. :)
@bors r+ p=1
(higher priority due to all the conflicts we already had)

[bors]

📌 Commit b2a8b39 has been approved by RalfJung

[hbina]

thank you for the patience!

[bors]

⌛ Testing commit b2a8b39 with merge 0f9088f...

[bors]

☀️ Test successful - checks-actions, checks-azure
Approved by: RalfJung
Pushing 0f9088f to master...

[rust-highfive]

📣 Toolstate changed by #71418!

Tested on commit 0f9088f.
Direct link to PR: #71418

💔 miri on windows: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung).
💔 miri on linux: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung).