Move pointee_info_at from rustc_codegen_llvm to rustc_target. #60237

saleemjaffer · 2019-04-24T15:01:33Z

Makes progress towards #56166.

This is a continuation of #57150.

@oli-obk Should I close the older PR?

rust-highfive · 2019-04-24T15:01:36Z

r? @matthewjasper

(rust_highfive has picked a reviewer for you, use r? to override)

saleemjaffer · 2019-04-24T15:02:03Z

r? @eddyb

rust-highfive · 2019-04-24T15:21:54Z

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (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.

travis_time:end:16ea328d:start=1556118243011137315,finish=1556118367342870921,duration=124331733606
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
$ export AWS_ACCESS_KEY_ID=AKIA46X5W6CZEJZ6XT55
---

[00:03:45] travis_fold:start:tidy
travis_time:start:tidy
tidy check
[00:03:45] tidy error: /checkout/src/librustc_target/abi/mod.rs:961: line longer than 100 chars
[00:03:45] tidy error: /checkout/src/librustc_target/abi/mod.rs:961: trailing whitespace
[00:03:47] some tidy checks failed
[00:03:47] 
[00:03:47] 
[00:03:47] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor" "--quiet"
[00:03:47] 
[00:03:47] 
[00:03:47] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:03:47] Build completed unsuccessfully in 0:00:42
[00:03:47] Build completed unsuccessfully in 0:00:42
[00:03:47] make: *** [tidy] Error 1
[00:03:47] Makefile:67: recipe for target 'tidy' failed
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:0782dccc
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Wed Apr 24 15:10:04 UTC 2019
---
travis_time:end:0147239e:start=1556118605034713655,finish=1556118605039181324,duration=4467669
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:21d25584
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:02aa37fd
travis_time:start:02aa37fd
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:0754baa6
$ dmesg | grep -i kill

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)

saleemjaffer · 2019-04-24T15:48:25Z

Creating a new PR as I do not have push rights to @wildarch 's repo

oli-obk · 2019-04-24T15:56:20Z

There are still some points unresolved from the last PR. I think something about the associated types and creating a new trait?On 24 Apr 2019 17:49, Saleem Jaffer <[email protected]> wrote:Resolves #56166. This is a continuation of #60237. @oli-obk Should I close the older PR? You can view, comment on, or merge this pull request online at: #60237 Commit Summary Move pointee_info_at to TyLayoutMethods.Fix typo in src/librustc/ty/layout.rsReturn instead of collecting to mut result.Remove old pointee_info_at body.Add param_env parameter to pointee_info_at.Make line fit within 100 character limit.impl `pointee_info_at` in TyLayout.resolving conflicts File Changes M src/librustc/ty/layout.rs (136) M src/librustc_codegen_llvm/abi.rs (8) M src/librustc_codegen_llvm/context.rs (3) M src/librustc_codegen_llvm/type_of.rs (134) M src/librustc_target/abi/mod.rs (34) Patch Links: https://github.com/rust-lang/rust/pull/60237.patchhttps://github.com/rust-lang/rust/pull/60237.diff —You are receiving this because you were mentioned.Reply to this email directly, view it on GitHub, or mute the thread.

saleemjaffer · 2019-04-24T15:57:24Z

@oli-obk Yeah, I have not yet fixed any issues. I just rebased on top of master.

Will start fixing them.

src/librustc/ty/layout.rs

rust-highfive · 2019-04-25T13:05:01Z

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (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.

travis_time:end:095a77c0:start=1556196840215455735,finish=1556196928156953855,duration=87941498120
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
$ export AWS_ACCESS_KEY_ID=AKIA46X5W6CZEJZ6XT55
---
[00:06:27]    Compiling rustc_macros v0.1.0 (/checkout/src/librustc_macros)
[00:06:34]    Compiling syntax_pos v0.0.0 (/checkout/src/libsyntax_pos)
[00:06:38]    Compiling rustc_errors v0.0.0 (/checkout/src/librustc_errors)
[00:07:40]    Compiling syntax_ext v0.0.0 (/checkout/src/libsyntax_ext)
[00:07:51] error[E0207]: the type parameter `E` is not constrained by the impl trait, self type, or predicates
[00:07:51]      |
[00:07:51]      |
[00:07:51] 1614 | impl<'a, 'tcx, C, E> TyLayoutMethods<'tcx, C> for Ty<'tcx>
[00:07:51]      |                   ^ unconstrained type parameter
[00:07:51] error: aborting due to previous error
[00:07:51] 
[00:07:51] For more information about this error, try `rustc --explain E0207`.
[00:07:51] error: Could not compile `rustc`.
---
travis_time:end:1902fb06:start=1556197423866236068,finish=1556197423871700808,duration=5464740
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:16f3020d
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:3dae5ba6
travis_time:start:3dae5ba6
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:0eabe6f8
$ dmesg | grep -i kill

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)

saleemjaffer · 2019-04-29T10:09:33Z

@oli-obk This is the fallout:

error[E0277]: the trait bound `std::result::Result<rustc_target::abi::TyLayout<'_, &ty::TyS<'_>>, ty::layout::LayoutError<'_>>: ty::layout::MaybeResult<rustc_target::abi::TyLayout<'_, &ty::TyS<'_>>, !>` is not satisfied
    --> src/librustc/ty/layout.rs:1245:30
     |
1245 |                 match layout.field(self, i) {
     |                              ^^^^^ the trait `ty::layout::MaybeResult<rustc_target::abi::TyLayout<'_, &ty::TyS<'_>>, !>` is not implemented for `std::result::Result<rustc_target::abi::TyLayout<'_, &ty::TyS<'_>>, ty::layout::LayoutError<'_>>`
     |
     = help: the following implementations were found:
               <std::result::Result<T, E> as ty::layout::MaybeResult<T, E>>
     = note: required because of the requirements on the impl of `rustc_target::abi::TyLayoutMethods<'_, ty::layout::LayoutCx<'_, ty::context::TyCtxt<'_, 'tcx, 'tcx>>>` for `&ty::TyS<'_>`

error[E0277]: the trait bound `std::result::Result<rustc_target::abi::TyLayout<'_, &ty::TyS<'_>>, ty::layout::LayoutError<'_>>: ty::layout::MaybeResult<rustc_target::abi::TyLayout<'_, &ty::TyS<'_>>, !>` is not satisfied
    --> src/librustc/ty/layout.rs:1312:51
     |
1312 |                                            layout.for_variant(self, i))
     |                                                   ^^^^^^^^^^^ the trait `ty::layout::MaybeResult<rustc_target::abi::TyLayout<'_, &ty::TyS<'_>>, !>` is not implemented for `std::result::Result<rustc_target::abi::TyLayout<'_, &ty::TyS<'_>>, ty::layout::LayoutError<'_>>`
     |
     = help: the following implementations were found:
               <std::result::Result<T, E> as ty::layout::MaybeResult<T, E>>
     = note: required because of the requirements on the impl of `rustc_target::abi::TyLayoutMethods<'_, ty::layout::LayoutCx<'_, ty::context::TyCtxt<'_, 'tcx, 'tcx>>>` for `&ty::TyS<'_>`

error[E0277]: the trait bound `std::result::Result<rustc_target::abi::TyLayout<'_, &ty::TyS<'_>>, ty::layout::LayoutError<'_>>: ty::layout::MaybeResult<rustc_target::abi::TyLayout<'_, &ty::TyS<'_>>, !>` is not satisfied
    --> src/librustc/ty/layout.rs:1998:47
     |
1998 |                 return self.find_niche(layout.field(self, 0)?);
     |                                               ^^^^^ the trait `ty::layout::MaybeResult<rustc_target::abi::TyLayout<'_, &ty::TyS<'_>>, !>` is not implemented for `std::result::Result<rustc_target::abi::TyLayout<'_, &ty::TyS<'_>>, ty::layout::LayoutError<'_>>`
     |
     = help: the following implementations were found:
               <std::result::Result<T, E> as ty::layout::MaybeResult<T, E>>
     = note: required because of the requirements on the impl of `rustc_target::abi::TyLayoutMethods<'_, ty::layout::LayoutCx<'_, ty::context::TyCtxt<'_, 'tcx, 'tcx>>>` for `&ty::TyS<'_>`

error[E0277]: the trait bound `std::result::Result<rustc_target::abi::TyLayout<'_, &ty::TyS<'_>>, ty::layout::LayoutError<'_>>: ty::layout::MaybeResult<rustc_target::abi::TyLayout<'_, &ty::TyS<'_>>, !>` is not satisfied
    --> src/librustc/ty/layout.rs:2006:57
     |
2006 |             if let Some(mut c) = self.find_niche(layout.field(self, i)?)? {
     |                                                         ^^^^^ the trait `ty::layout::MaybeResult<rustc_target::abi::TyLayout<'_, &ty::TyS<'_>>, !>` is not implemented for `std::result::Result<rustc_target::abi::TyLayout<'_, &ty::TyS<'_>>, ty::layout::LayoutError<'_>>`
     |
     = help: the following implementations were found:
               <std::result::Result<T, E> as ty::layout::MaybeResult<T, E>>
     = note: required because of the requirements on the impl of `rustc_target::abi::TyLayoutMethods<'_, ty::layout::LayoutCx<'_, ty::context::TyCtxt<'_, 'tcx, 'tcx>>>` for `&ty::TyS<'_>`

rust-highfive · 2019-04-29T10:19:31Z

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (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.

travis_time:end:132611ec:start=1556532561205224736,finish=1556532645711079738,duration=84505855002
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
$ export AWS_ACCESS_KEY_ID=AKIA46X5W6CZEJZ6XT55
---
[00:06:32]    Compiling rustc_macros v0.1.0 (/checkout/src/librustc_macros)
[00:06:44]    Compiling syntax_pos v0.0.0 (/checkout/src/libsyntax_pos)
[00:06:48]    Compiling rustc_errors v0.0.0 (/checkout/src/librustc_errors)
[00:07:55]    Compiling syntax_ext v0.0.0 (/checkout/src/libsyntax_ext)
[00:08:28] error[E0277]: the trait bound `std::result::Result<rustc_target::abi::TyLayout<'_, &ty::TyS<'_>>, ty::layout::LayoutError<'_>>: ty::layout::MaybeResult<rustc_target::abi::TyLayout<'_, &ty::TyS<'_>>, !>` is not satisfied
[00:08:28]      |
[00:08:28]      |
[00:08:28] 1246 |                 match layout.field(self, i) {
[00:08:28]      |                              ^^^^^ the trait `ty::layout::MaybeResult<rustc_target::abi::TyLayout<'_, &ty::TyS<'_>>, !>` is not implemented for `std::result::Result<rustc_target::abi::TyLayout<'_, &ty::TyS<'_>>, ty::layout::LayoutError<'_>>`
[00:08:28]      = help: the following implementations were found:
[00:08:28]      = help: the following implementations were found:
[00:08:28]                <std::result::Result<T, E> as ty::layout::MaybeResult<T, E>>
[00:08:28]      = note: required because of the requirements on the impl of `rustc_target::abi::TyLayoutMethods<'_, ty::layout::LayoutCx<'_, ty::context::TyCtxt<'_, 'tcx, 'tcx>>>` for `&ty::TyS<'_>`
[00:08:28] 
[00:08:28] error[E0277]: the trait bound `std::result::Result<rustc_target::abi::TyLayout<'_, &ty::TyS<'_>>, ty::layout::LayoutError<'_>>: ty::layout::MaybeResult<rustc_target::abi::TyLayout<'_, &ty::TyS<'_>>, !>` is not satisfied
[00:08:28]      |
[00:08:28]      |
[00:08:28] 1313 |                                            layout.for_variant(self, i))
[00:08:28]      |                                                   ^^^^^^^^^^^ the trait `ty::layout::MaybeResult<rustc_target::abi::TyLayout<'_, &ty::TyS<'_>>, !>` is not implemented for `std::result::Result<rustc_target::abi::TyLayout<'_, &ty::TyS<'_>>, ty::layout::LayoutError<'_>>`
[00:08:28]      = help: the following implementations were found:
[00:08:28]      = help: the following implementations were found:
[00:08:28]                <std::result::Result<T, E> as ty::layout::MaybeResult<T, E>>
[00:08:28]      = note: required because of the requirements on the impl of `rustc_target::abi::TyLayoutMethods<'_, ty::layout::LayoutCx<'_, ty::context::TyCtxt<'_, 'tcx, 'tcx>>>` for `&ty::TyS<'_>`
[00:08:28] 
[00:08:28] error[E0277]: the trait bound `std::result::Result<rustc_target::abi::TyLayout<'_, &ty::TyS<'_>>, ty::layout::LayoutError<'_>>: ty::layout::MaybeResult<rustc_target::abi::TyLayout<'_, &ty::TyS<'_>>, !>` is not satisfied
[00:08:28]      |
[00:08:28]      |
[00:08:28] 1999 |                 return self.find_niche(layout.field(self, 0)?);
[00:08:28]      |                                               ^^^^^ the trait `ty::layout::MaybeResult<rustc_target::abi::TyLayout<'_, &ty::TyS<'_>>, !>` is not implemented for `std::result::Result<rustc_target::abi::TyLayout<'_, &ty::TyS<'_>>, ty::layout::LayoutError<'_>>`
[00:08:28]      = help: the following implementations were found:
[00:08:28]      = help: the following implementations were found:
[00:08:28]                <std::result::Result<T, E> as ty::layout::MaybeResult<T, E>>
[00:08:28]      = note: required because of the requirements on the impl of `rustc_target::abi::TyLayoutMethods<'_, ty::layout::LayoutCx<'_, ty::context::TyCtxt<'_, 'tcx, 'tcx>>>` for `&ty::TyS<'_>`
[00:08:28] 
[00:08:28] error[E0277]: the trait bound `std::result::Result<rustc_target::abi::TyLayout<'_, &ty::TyS<'_>>, ty::layout::LayoutError<'_>>: ty::layout::MaybeResult<rustc_target::abi::TyLayout<'_, &ty::TyS<'_>>, !>` is not satisfied
[00:08:28]      |
[00:08:28]      |
[00:08:28] 2007 |             if let Some(mut c) = self.find_niche(layout.field(self, i)?)? {
[00:08:28]      |                                                         ^^^^^ the trait `ty::layout::MaybeResult<rustc_target::abi::TyLayout<'_, &ty::TyS<'_>>, !>` is not implemented for `std::result::Result<rustc_target::abi::TyLayout<'_, &ty::TyS<'_>>, ty::layout::LayoutError<'_>>`
[00:08:28]      = help: the following implementations were found:
[00:08:28]      = help: the following implementations were found:
[00:08:28]                <std::result::Result<T, E> as ty::layout::MaybeResult<T, E>>
[00:08:28]      = note: required because of the requirements on the impl of `rustc_target::abi::TyLayoutMethods<'_, ty::layout::LayoutCx<'_, ty::context::TyCtxt<'_, 'tcx, 'tcx>>>` for `&ty::TyS<'_>`
[00:08:32] error: aborting due to 4 previous errors
[00:08:32] 
[00:08:32] For more information about this error, try `rustc --explain E0277`.
[00:08:32] error: Could not compile `rustc`.
---
travis_time:end:0134fd90:start=1556533168379644068,finish=1556533168383790814,duration=4146746
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0b8940e0
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:3cbd0073
travis_time:start:3cbd0073
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i

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

oli-obk · 2019-04-29T12:55:23Z

src/librustc/ty/layout.rs

@@ -1490,27 +1492,40 @@ impl<'gcx, 'tcx, T: HasTyCtxt<'gcx>> HasTyCtxt<'gcx> for LayoutCx<'tcx, T> {
    }
 }

-pub trait MaybeResult<T> {
+pub trait MaybeResult<T, E>: From<Result<T, E>> {


So... apparently doing it this way is blocked on lazy normalization: https://play.rust-lang.org/?version=stable&mode=debug&edition=2018&gist=e6956340922d4df0087baa36b02b1ce3

Let's go with your original suggestion and add a from(r: Result<T, Self::item>) method to MaybeResult

rust-highfive · 2019-04-30T07:00:41Z

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (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.

travis_time:end:1f330945:start=1556607076633602957,finish=1556607162008355166,duration=85374752209
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
$ export AWS_ACCESS_KEY_ID=AKIA46X5W6CZEJZ6XT55
---
[00:07:12]    Compiling syntax_ext v0.0.0 (/checkout/src/libsyntax_ext)
[00:07:42] error[E0308]: mismatched types
[00:07:42]     --> src/librustc/ty/layout.rs:1634:21
[00:07:42]      |
[00:07:42] 1634 | /                     cx.layout_of(this.ty).to_result().map(|layout| {
[00:07:42] 1635 | |                         assert_eq!(layout.variants, Variants::Single { index });layout
[00:07:42]      | |______________________^ expected enum `std::result::Result`, found struct `rustc_target::abi::TyLayout`
[00:07:42]      |
[00:07:42]      |
[00:07:42]      = note: expected type `std::result::Result<std::result::Result<rustc_target::abi::TyLayout<'tcx, &'tcx ty::TyS<'tcx>>, !>, !>`
[00:07:42]                 found type `std::result::Result<rustc_target::abi::TyLayout<'_, &ty::TyS<'_>>, <<C as rustc_target::abi::LayoutOf>::TyLayout as ty::layout::MaybeResult<rustc_target::abi::TyLayout<'tcx, &'tcx ty::TyS<'tcx>>>>::Item>`
[00:07:46] error: aborting due to previous error
[00:07:46] 
[00:07:46] For more information about this error, try `rustc --explain E0308`.
Tue, 30 Apr 2019 07:00:37 GMT
---
travis_time:end:068ed6c0:start=1556607638200813248,finish=1556607638205254819,duration=4441571
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:08f903f7
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:28dc8c50
travis_time:start:28dc8c50
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i3

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)

saleemjaffer · 2019-05-02T08:41:25Z

src/librustc/ty/layout.rs

@@ -1694,10 +1686,11 @@ impl<'a, 'tcx, C> TyLayoutMethods<'tcx, C> for Ty<'tcx>
                    } else {
                        tcx.mk_mut_ref(tcx.types.re_static, nil)
                    };
-                    return cx.layout_of(ptr_ty).map_same(|mut ptr_layout| {
+                    let ptr_layout: C::TyLayout = cx.layout_of(ptr_ty);


@oli-obk I get this error here:

error[E0308]: mismatched types==============================> ] 118/137: rustc --> src/librustc/ty/layout.rs:1692:32 | 1656 | fn field(this: TyLayout<'tcx>, cx: &C, i: usize) -> C::TyLayout { | ----------- expected `<C as rustc_target::abi::LayoutOf>::TyLayout` because of return type ... 1692 | return ptr_layout; | ^^^^^^^^^^ expected associated type, found struct `rustc_target::abi::TyLayout` | = note: expected type `<C as rustc_target::abi::LayoutOf>::TyLayout` found type `rustc_target::abi::TyLayout<'_, &ty::TyS<'_>>`

Why is to_result changing the type here?

The error is sadly not telling you what the actual issue is. What you want here is to convert the result back to a MaybeResult after mapping it

return MaybeResult::from(cx.layout_of(ptr_ty).to_result().map(|mut ptr_layout| { ptr_layout.ty = this.ty; ptr_layout }));

@oli-obk Should this be raised as an issue? :o

I think we used to have some more aggressive suggestions around that. If you can create a small example, then a diagnostics issue would be great, yes.

rust-highfive · 2019-05-02T08:51:22Z

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (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.

travis_time:end:0b19f870:start=1556786471469241895,finish=1556786562520184786,duration=91050942891
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
$ export AWS_ACCESS_KEY_ID=AKIA46X5W6CZEJZ6XT55
---
[00:07:48]    Compiling syntax_ext v0.0.0 (/checkout/src/libsyntax_ext)
[00:08:19] error[E0308]: mismatched types
[00:08:19]     --> src/librustc/ty/layout.rs:1693:32
[00:08:19]      |
[00:08:19] 1657 |     fn field(this: TyLayout<'tcx>, cx: &C, i: usize) -> C::TyLayout {
[00:08:19]      |                                                         ----------- expected `<C as rustc_target::abi::LayoutOf>::TyLayout` because of return type
[00:08:19] ...
[00:08:19] 1693 |                         return ptr_layout;
[00:08:19]      |                                ^^^^^^^^^^ expected associated type, found struct `rustc_target::abi::TyLayout`
[00:08:19]      |
[00:08:19]      = note: expected type `<C as rustc_target::abi::LayoutOf>::TyLayout`
[00:08:19]                 found type `rustc_target::abi::TyLayout<'_, &ty::TyS<'_>>`
[00:08:23] error: aborting due to previous error
[00:08:23] 
[00:08:23] For more information about this error, try `rustc --explain E0308`.
[00:08:23] error: Could not compile `rustc`.
---
travis_time:end:204b235a:start=1556787076116641990,finish=1556787076121473966,duration=4831976
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:04ec3c8a
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:1577ead9
travis_time:start:1577ead9
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:082fdfca
$ dmesg | grep -i kill

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)

src/librustc/ty/layout.rs

oli-obk · 2019-05-02T09:43:40Z

src/librustc/ty/layout.rs

@@ -1694,10 +1686,11 @@ impl<'a, 'tcx, C> TyLayoutMethods<'tcx, C> for Ty<'tcx>
                    } else {
                        tcx.mk_mut_ref(tcx.types.re_static, nil)
                    };
-                    return cx.layout_of(ptr_ty).map_same(|mut ptr_layout| {
+                    let ptr_layout: C::TyLayout = cx.layout_of(ptr_ty);


The error is sadly not telling you what the actual issue is. What you want here is to convert the result back to a MaybeResult after mapping it

return MaybeResult::from(cx.layout_of(ptr_ty).to_result().map(|mut ptr_layout| { ptr_layout.ty = this.ty; ptr_layout }));

saleemjaffer · 2019-05-03T07:40:06Z

#57150 (comment)

@oli-obk @eddyb I have added the is_freeze. Not sure if this is right as you guys were mentioning about not passing ParamEnv separately, but I am still passing ParamEnv as a parameter.

oli-obk · 2019-05-03T09:06:15Z

src/librustc/ty/layout.rs

+        cx: &C,
+        param_env: Self::ParamEnv,
+    )-> bool {
+        this.ty.is_freeze(cx.tcx(), param_env, DUMMY_SP)


@eddyb what do you think about making is_freeze take TyCtxtAt and make HasTyCtxt::tcx return a TyCtxtAt?

I don't think we should bother, for now.
If you want, you can just make it not a method of Ty.

eddyb · 2019-05-03T15:59:29Z

src/librustc_target/abi/mod.rs

+    fn is_freeze(
+        this: TyLayout<'a, Self>,
+        cx: &C,
+        param_env: Self::ParamEnv,


You can remove this, it's always part of cx, because all implementors need it in order to implement layout_of anyway!

rust-highfive · 2019-05-04T11:15:03Z

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (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.

travis_time:end:002c507c:start=1556967571444332310,finish=1556967573515335533,duration=2071003223
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
$ export AWS_ACCESS_KEY_ID=AKIA46X5W6CZEJZ6XT55
---

[00:04:44] travis_fold:start:tidy
travis_time:start:tidy
tidy check
[00:04:45] tidy error: /checkout/src/librustc_codegen_llvm/context.rs:18: line longer than 100 chars
[00:04:49] some tidy checks failed
[00:04:49] 
[00:04:49] 
[00:04:49] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor" "--quiet"
[00:04:49] 
[00:04:49] 
[00:04:49] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:04:49] Build completed unsuccessfully in 0:01:08
[00:04:49] Build completed unsuccessfully in 0:01:08
[00:04:49] make: *** [tidy] Error 1
[00:04:49] Makefile:67: recipe for target 'tidy' failed
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:06400260
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Sat May  4 11:04:33 UTC 2019
---
travis_time:end:31c9fee1:start=1556967874777764550,finish=1556967874782790410,duration=5025860
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0e75de70
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:23d7e1f0
travis_time:start:23d7e1f0
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:09734417
$ dmesg | grep -i kill

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)

src/librustc/ty/layout.rs

eddyb · 2019-05-05T12:13:13Z

src/librustc/ty/layout.rs

-                        ptr_layout
-                    });
+                    return MaybeResult::from(
+                        cx.layout_of(ptr_ty).to_result().map(|mut ptr_layout| {


Even with this much indentation, rustfmt will keep return MaybeResult::from(cx.layout_of(ptr_ty).to_result().map( on one line and just have the closure expression indented by itself, e.g.:

return MaybeResult::from(cx.layout_of(ptr_ty).to_result().map( |mut ptr_layout| { ptr_layout.ty = this.ty; ptr_layout }, ));

@eddyb actually rustfmt does this

return MaybeResult::from(cx.layout_of(ptr_ty).to_result().map(|mut ptr_layout| { ptr_layout.ty = this.ty; ptr_layout }));

Only if you have less indentation than you actually do here.

eddyb · 2019-05-05T12:16:51Z

src/librustc_target/abi/mod.rs

@@ -969,10 +964,6 @@ impl<'a, Ty> TyLayout<'a, Ty> {
    where Ty: TyLayoutMethods<'a, C>, C: LayoutOf<Ty = Ty> {
        Ty::pointee_info_at(self, cx, offset, param_env)
    }
-    pub fn is_freeze<C>(self, cx: &C, param_env: Ty::ParamEnv) -> bool


Huh, was this actually not needed? Only pointee_info_at?
Or was my original plan to implement pointee_info_at in rustc_target instead?
I guess I had forgotten about the special-cases in it? A bit surprising, still, though.

@eddyb You did suggest this first, and that's what i tried to do, but then you said this

I was referring to the param_env argument, not is_freeze.
But I think in your first link, I did forget that you can't implement pointee_info_at in rustc_target anyway.

src/librustc_codegen_ssa/traits/mod.rs

eddyb · 2019-05-05T18:19:50Z

@bors r+

bors · 2019-05-05T18:19:51Z

📌 Commit 968eb7f has been approved by eddyb

bors · 2019-05-05T18:25:19Z

⌛ Testing commit 968eb7f with merge d628c2e...

@oli-obk

…ng, r=eddyb Move pointee_info_at from rustc_codegen_llvm to rustc_target. Makes progress towards #56166. This is a continuation of #57150. @oli-obk Should I close the older PR?

bors · 2019-05-05T21:11:41Z

☀️ Test successful - checks-travis, status-appveyor
Approved by: eddyb
Pushing d628c2e to master...

rust-highfive assigned matthewjasper Apr 24, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 24, 2019

rust-highfive assigned eddyb and unassigned matthewjasper Apr 24, 2019

saleemjaffer closed this Apr 24, 2019

saleemjaffer reopened this Apr 24, 2019

saleemjaffer changed the title ~~Issue 56166 miri fntype arg passing~~ [WIP] Issue 56166 miri fntype arg passing Apr 24, 2019

saleemjaffer commented Apr 25, 2019

View reviewed changes

src/librustc/ty/layout.rs Outdated Show resolved Hide resolved

oli-obk reviewed Apr 25, 2019

View reviewed changes

src/librustc/ty/layout.rs Outdated Show resolved Hide resolved

saleemjaffer force-pushed the issue-56166-miri-fntype-arg-passing branch from 76fa80d to f2935a3 Compare April 26, 2019 07:50

oli-obk reviewed Apr 29, 2019

View reviewed changes

saleemjaffer force-pushed the issue-56166-miri-fntype-arg-passing branch from 5298959 to 738f9c3 Compare April 30, 2019 06:50

saleemjaffer force-pushed the issue-56166-miri-fntype-arg-passing branch from 738f9c3 to bafa063 Compare May 2, 2019 08:40

saleemjaffer commented May 2, 2019

View reviewed changes

oli-obk reviewed May 2, 2019

View reviewed changes

saleemjaffer force-pushed the issue-56166-miri-fntype-arg-passing branch from bafa063 to e983574 Compare May 2, 2019 12:41

oli-obk reviewed May 3, 2019

View reviewed changes

eddyb reviewed May 3, 2019

View reviewed changes

wildarch and others added 8 commits May 4, 2019 15:17

impl pointee_info_at in TyLayout.

82410e8

resolving conflicts

199ff02

tidy fixes

35bd58b

add to_result to ty::MaybeResult

8e3d9f1

removing map_same from MaybeResult

852dd49

adding is_freeze to TyLayoutMethods

8802dc0

adding HasParamEnv trait

18679cd

resolving conflicts

94a4892

saleemjaffer force-pushed the issue-56166-miri-fntype-arg-passing branch from 11d3504 to 94a4892 Compare May 4, 2019 10:57

removing param_env from pointee_info_at

80d5478

eddyb reviewed May 5, 2019

View reviewed changes

src/librustc/ty/layout.rs Outdated Show resolved Hide resolved

eddyb reviewed May 5, 2019

View reviewed changes

src/librustc/ty/layout.rs Outdated Show resolved Hide resolved

eddyb reviewed May 5, 2019

View reviewed changes

src/librustc/ty/layout.rs Outdated Show resolved Hide resolved

eddyb reviewed May 5, 2019

View reviewed changes

src/librustc_codegen_ssa/traits/mod.rs Outdated Show resolved Hide resolved

code review fixes

968eb7f

eddyb approved these changes May 5, 2019

View reviewed changes

eddyb changed the title ~~[WIP] Issue 56166 miri fntype arg passing~~ Move pointee_info_at from rustc_codegen_llvm to rustc_target. May 5, 2019

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 May 5, 2019

bors added the merged-by-bors This PR was explicitly merged by bors. label May 5, 2019

bors merged commit 968eb7f into rust-lang:master May 5, 2019

Centril mentioned this pull request May 18, 2019

[WIP] Move pointee_info_at to TyLayoutMethods. #57150

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Move pointee_info_at from rustc_codegen_llvm to rustc_target. #60237

Move pointee_info_at from rustc_codegen_llvm to rustc_target. #60237

saleemjaffer commented Apr 24, 2019 •

edited by eddyb

Loading

rust-highfive commented Apr 24, 2019

saleemjaffer commented Apr 24, 2019

rust-highfive commented Apr 24, 2019

saleemjaffer commented Apr 24, 2019

oli-obk commented Apr 24, 2019 via email

saleemjaffer commented Apr 24, 2019 •

edited

Loading

rust-highfive commented Apr 25, 2019

saleemjaffer commented Apr 29, 2019

rust-highfive commented Apr 29, 2019

oli-obk Apr 29, 2019

rust-highfive commented Apr 30, 2019

saleemjaffer May 2, 2019

oli-obk May 2, 2019

saleemjaffer May 2, 2019

oli-obk May 2, 2019

rust-highfive commented May 2, 2019

oli-obk May 2, 2019

saleemjaffer commented May 3, 2019 •

edited

Loading

oli-obk May 3, 2019

eddyb May 3, 2019

eddyb May 3, 2019

rust-highfive commented May 4, 2019

eddyb May 5, 2019

saleemjaffer May 5, 2019 •

edited

Loading

eddyb May 5, 2019

eddyb May 5, 2019

saleemjaffer May 5, 2019

eddyb May 5, 2019

eddyb commented May 5, 2019

bors commented May 5, 2019

bors commented May 5, 2019

bors commented May 5, 2019

Move pointee_info_at from rustc_codegen_llvm to rustc_target. #60237

Move pointee_info_at from rustc_codegen_llvm to rustc_target. #60237

Conversation

saleemjaffer commented Apr 24, 2019 • edited by eddyb Loading

rust-highfive commented Apr 24, 2019

saleemjaffer commented Apr 24, 2019

rust-highfive commented Apr 24, 2019

saleemjaffer commented Apr 24, 2019

oli-obk commented Apr 24, 2019 via email

saleemjaffer commented Apr 24, 2019 • edited Loading

rust-highfive commented Apr 25, 2019

saleemjaffer commented Apr 29, 2019

rust-highfive commented Apr 29, 2019

Choose a reason for hiding this comment

rust-highfive commented Apr 30, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rust-highfive commented May 2, 2019

Choose a reason for hiding this comment

saleemjaffer commented May 3, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rust-highfive commented May 4, 2019

Choose a reason for hiding this comment

saleemjaffer May 5, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

eddyb commented May 5, 2019

bors commented May 5, 2019

bors commented May 5, 2019

bors commented May 5, 2019

saleemjaffer commented Apr 24, 2019 •

edited by eddyb

Loading

saleemjaffer commented Apr 24, 2019 •

edited

Loading

saleemjaffer commented May 3, 2019 •

edited

Loading

saleemjaffer May 5, 2019 •

edited

Loading