[Step 2] Implement "small substs optimization" for substs of length 1 #59312

csmoe · 2019-03-20T10:55:50Z

Address #58310

rust-highfive · 2019-03-20T10:56:01Z

r? @oli-obk

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

src/librustc/infer/error_reporting/mod.rs

src/librustc/infer/opaque_types/mod.rs

oli-obk · 2019-03-20T11:44:45Z

src/librustc/ty/subst.rs

        } else {
-            folder.tcx().intern_substs(&params)
+            folder.tcx().intern_substs(&params).into()


intern_substs should directly return a SubstsRef

@oli-obk
As _intern_substs comes from slice_interners!, which returns a List, then should I implement a specific one for SubstsRef?

You should be able to just modify that method, too. I don't think it's used elsewhere.

bors · 2019-03-25T00:39:46Z

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

Centril · 2019-03-30T13:42:04Z

Ping from triage, @csmoe, you have some rebasing + review comments to address.

Change-Id: Idc024631af3ecbe352fb0d18c9184ab7f2d55a19

rust-highfive · 2019-04-27T17:18:43Z

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:23800e72:start=1556384972365871248,finish=1556384974736935568,duration=2371064320
$ 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:58]    Compiling syntax_ext v0.0.0 (/checkout/src/libsyntax_ext)
[00:08:36] error: lifetime may not live long enough
[00:08:36]    --> src/librustc/macros.rs:268:32
[00:08:36]     |
[00:08:36] 257 | / macro_rules! BraceStructLiftImpl {
[00:08:36] 258 | |     (impl<$($p:tt),*> Lift<$tcx:tt> for $s:path {
[00:08:36] 259 | |         type Lifted = $lifted:ty;
[00:08:36] 260 | |         $($field:ident),* $(,)?
[00:08:36] ...   |
[00:08:36] 268 | |                 $(let $field = tcx.lift(&self.$field)?;)*
[00:08:36]     | |                                ^^^^^^^^^^^^^^^^^^^^^^ argument requires that `'a` must outlive `'tcx`
[00:08:36] 272 | |     };
[00:08:36] 273 | | }
[00:08:36] 273 | | }
[00:08:36]     | |_- in this expansion of `BraceStructLiftImpl!`
[00:08:36]    ::: src/librustc/ty/subst.rs:737:1
[00:08:36]     |
[00:08:36]     |
[00:08:36] 737 | / BraceStructLiftImpl! {
[00:08:36] 738 | |     impl<'a, 'tcx> Lift<'tcx> for UserSubsts<'a> {
[00:08:36]     | |          --  ---- lifetime `'tcx` defined here
[00:08:36]     | |          lifetime `'a` defined here
[00:08:36]     | |          lifetime `'a` defined here
[00:08:36] 739 | |         type Lifted = UserSubsts<'tcx>;
[00:08:36] 741 | |         user_self_ty,
[00:08:36] 742 | |     }
[00:08:36] 743 | | }
[00:08:36]     | |_- in this macro invocation
[00:08:36]     | |_- in this macro invocation
[00:08:36] 
[00:08:36] error: lifetime may not live long enough
[00:08:36]    --> src/librustc/macros.rs:268:32
[00:08:36]     |
[00:08:36] 257 | / macro_rules! BraceStructLiftImpl {
[00:08:36] 258 | |     (impl<$($p:tt),*> Lift<$tcx:tt> for $s:path {
[00:08:36] 259 | |         type Lifted = $lifted:ty;
[00:08:36] 260 | |         $($field:ident),* $(,)?
[00:08:36] ...   |
[00:08:36] 268 | |                 $(let $field = tcx.lift(&self.$field)?;)*
[00:08:36]     | |                                ^^^^^^^^^^^^^^^^^^^^^^ argument requires that `'a` must outlive `'tcx`
[00:08:36] 272 | |     };
[00:08:36] 273 | | }
[00:08:36] 273 | | }
[00:08:36]     | |_- in this expansion of `BraceStructLiftImpl!`
[00:08:36]    ::: src/librustc/ty/structural_impls.rs:777:1
[00:08:36]     |
[00:08:36]     |
[00:08:36] 777 | / BraceStructLiftImpl! {
[00:08:36] 778 | |     impl<'a, 'tcx> Lift<'tcx> for ty::Instance<'a> {
[00:08:36]     | |          --  ---- lifetime `'tcx` defined here
[00:08:36]     | |          lifetime `'a` defined here
[00:08:36] 779 | |         type Lifted = ty::Instance<'tcx>;
[00:08:36] 780 | |         def, substs
[00:08:36] 781 | |     }
[00:08:36] 781 | |     }
[00:08:36] 782 | | }
[00:08:36]     | |_- in this macro invocation
[00:08:36] 
[00:08:44] error: lifetime may not live long enough
[00:08:44]     --> src/librustc/mir/mod.rs:2540:42
[00:08:44]      |
[00:08:44] 2475 | impl<'tcx> Debug for Rvalue<'tcx> {
[00:08:44]      |      ---- lifetime `'tcx` defined here
[00:08:44] ...
[00:08:44] 2540 |                             let substs = tcx.lift(&substs).expect("could not lift for printing");
[00:08:44]      |                                          ^^^^^^^^^^^^^^^^^ argument requires that `'tcx` must outlive `'static`
[00:08:46] error: lifetime may not live long enough
[00:08:46] error: lifetime may not live long enough
[00:08:46]    --> src/librustc/traits/fulfill.rs:467:31
[00:08:46]     |
[00:08:46] 237 | impl<'a, 'b, 'gcx, 'tcx> ObligationProcessor for FulfillProcessor<'a, 'b, 'gcx, 'tcx> {
[00:08:46]     |              ----  ---- lifetime `'tcx` defined here
[00:08:46]     |              |
[00:08:46]     |              lifetime `'gcx` defined here
[00:08:46] ...
[00:08:46] 467 |                         match self.selcx.tcx().lift_to_global(&substs) {
[00:08:46]     |                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ argument requires that `'tcx` must outlive `'gcx`
[00:08:46] error: lifetime may not live long enough
[00:08:46]    --> src/librustc/traits/project.rs:420:43
[00:08:46]     |
[00:08:46]     |
[00:08:46] 324 | impl<'a, 'b, 'gcx, 'tcx> TypeFolder<'gcx, 'tcx> for AssociatedTypeNormalizer<'a, 'b, 'gcx, 'tcx> {
[00:08:46]     |              ----  ---- lifetime `'tcx` defined here
[00:08:46]     |              |
[00:08:46]     |              lifetime `'gcx` defined here
[00:08:46] ...
[00:08:46] 420 |                     if let Some(substs) = self.tcx().lift_to_global(&substs) {
[00:08:46]     |                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ argument requires that `'tcx` must outlive `'gcx`
[00:08:46] error: lifetime may not live long enough
[00:08:46]    --> src/librustc/traits/select.rs:783:23
[00:08:46]     |
[00:08:46]     |
[00:08:46] 462 | impl<'cx, 'gcx, 'tcx> SelectionContext<'cx, 'gcx, 'tcx> {
[00:08:46]     |           ----  ---- lifetime `'tcx` defined here
[00:08:46]     |           |
[00:08:46]     |           lifetime `'gcx` defined here
[00:08:46] ...
[00:08:46] 783 |                 match tcx.lift_to_global(&(obligation.param_env, substs)) {
[00:08:46]     |                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ argument requires that `'tcx` must outlive `'gcx`
[00:08:47] error: lifetime may not live long enough
[00:08:47]    --> src/librustc/traits/specialize/mod.rs:129:26
[00:08:47]     |
[00:08:47] 112 | pub fn find_associated_item<'a, 'tcx>(
[00:08:47] 112 | pub fn find_associated_item<'a, 'tcx>(
[00:08:47]     |                             --  ---- lifetime `'tcx` defined here
[00:08:47]     |                             |
[00:08:47]     |                             lifetime `'a` defined here
[00:08:47] ...
[00:08:47] 129 |             let substs = tcx.infer_ctxt().enter(|infcx| {
[00:08:47]     |                          ^^^^^^^^^^^^^^^^ argument requires that `'a` must outlive `'tcx`
[00:08:47] error[E0716]: temporary value dropped while borrowed
[00:08:47]    --> src/librustc/traits/specialize/mod.rs:129:26
[00:08:47]     |
[00:08:47]     |
[00:08:47] 112 |   pub fn find_associated_item<'a, 'tcx>(
[00:08:47]     |                                   ---- lifetime `'tcx` defined here
[00:08:47] ...
[00:08:47] 129 |               let substs = tcx.infer_ctxt().enter(|infcx| {
[00:08:47]     |                            -^^^^^^^^^^^^^^^
[00:08:47]     |  __________________________creates a temporary which is freed while still in use
[00:08:47]     | |
[00:08:47]     | |
[00:08:47] 130 | |                 let param_env = param_env.with_reveal_all();
[00:08:47] 131 | |                 let substs = substs.rebase_onto(tcx, trait_def_id, impl_data.substs);
[00:08:47] 132 | |                 let substs = translate_substs(&infcx, param_env, impl_data.impl_def_id,
[00:08:47] 139 | |                 )
[00:08:47] 140 | |             });
[00:08:47]     | |              -- temporary value is freed at the end of this statement
[00:08:47]     | |______________|
[00:08:47]     | |______________|
[00:08:47]     |                argument requires that borrow lasts for `'tcx`
[00:08:47] 
[00:08:47] error: lifetime may not live long enough
[00:08:47]    --> src/librustc/traits/structural_impls.rs:586:19
[00:08:47]     |
[00:08:47] 578 | impl<'a, 'tcx> Lift<'tcx> for traits::Vtable<'a, ()> {
[00:08:47]     |      --  ---- lifetime `'tcx` defined here
[00:08:47]     |      lifetime `'a` defined here
[00:08:47] ...
[00:08:47] ...
[00:08:47] 586 |             }) => tcx.lift(&substs).map(|substs|
[00:08:47]     |                   ^^^^^^^^^^^^^^^^^ argument requires that `'a` must outlive `'tcx`
[00:08:47] error: lifetime may not live long enough
[00:08:47]    --> src/librustc/traits/query/normalize.rs:204:42
[00:08:47]     |
[00:08:47]     |
[00:08:47] 85  | impl<'cx, 'gcx, 'tcx> TypeFolder<'gcx, 'tcx> for QueryNormalizer<'cx, 'gcx, 'tcx> {
[00:08:47]     |           ----  ---- lifetime `'tcx` defined here
[00:08:47]     |           |
[00:08:47]     |           lifetime `'gcx` defined here
[00:08:47] ...
[00:08:47] 204 |                             let substs = tcx.lift_to_global(&substs).unwrap();
[00:08:47]     |                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^ argument requires that `'tcx` must outlive `'gcx`
[00:08:47] 
[00:08:47] error[E0515]: cannot return value referencing local data `closure_substs.substs`
[00:08:47]      |
[00:08:47]      |
[00:08:47] 1451 |                 WalkTysIter::Types(closure_substs.substs.types())
[00:08:47]      |                 |                  |
[00:08:47]      |                 |                  |
[00:08:47]      |                 |                  `closure_substs.substs` is borrowed here
[00:08:47] 
[00:08:47] error[E0515]: cannot return value referencing local variable `substs`
[00:08:47]     --> src/librustc/ty/mod.rs:1454:17
[00:08:47]      |
[00:08:47]      |
[00:08:47] 1454 |                 WalkTysIter::Types(substs.types())
[00:08:47]      |                 |                  |
[00:08:47]      |                 |                  `substs` is borrowed here
[00:08:47]      |                 returns a value referencing data owned by the current function
[00:08:47] 
[00:08:47] 
[00:08:48] error[E0515]: cannot return value referencing function parameter `substs`
[00:08:48]    --> src/librustc/ty/print/mod.rs:202:9
[00:08:48]     |
[00:08:48] 202 |         &substs[own_params]
[00:08:48]     |         ^------^^^^^^^^^^^^
[00:08:48]     |         ||
[00:08:48]     |         |`substs` is borrowed here
[00:08:48] 
[00:08:50] error: lifetime may not live long enough
[00:08:50]    --> src/librustc/ty/relate.rs:474:47
[00:08:50]     |
[00:08:50]     |
[00:08:50] 347 | pub fn super_relate_tys<'a, 'gcx, 'tcx, R>(relation: &mut R,
[00:08:50]     |                             ----  ---- lifetime `'tcx` defined here
[00:08:50]     |                             |
[00:08:50]     |                             lifetime `'gcx` defined here
[00:08:50] ...
[00:08:50] 474 |                         if let Some(substs) = tcx.lift_to_global(&substs) {
[00:08:50]     |                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^ argument requires that `'tcx` must outlive `'gcx`
[00:08:51] error[E0515]: cannot return value referencing local variable `substs`
[00:08:51]    --> src/librustc/ty/walk.rs:107:17
[00:08:51]     |
[00:08:51]     |
[00:08:51] 107 |                 substs.types().rev().chain(opt_ty)
[00:08:51]     |                 |
[00:08:51]     |                 returns a value referencing data owned by the current function
[00:08:51]     |                 `substs` is borrowed here
[00:08:51] 
[00:08:51] 
[00:08:51] error: lifetime may not live long enough
[00:08:51]    --> src/librustc/ty/instance.rs:178:26
[00:08:51]     |
[00:08:51] 175 | impl<'tcx> fmt::Display for Instance<'tcx> {
[00:08:51]     |      ---- lifetime `'tcx` defined here
[00:08:51] ...
[00:08:51] 178 |             let substs = tcx.lift(&self.substs).expect("could not lift for printing");
[00:08:51]     |                          ^^^^^^^^^^^^^^^^^^^^^^ argument requires that `'tcx` must outlive `'static`
[00:08:52] error: lifetime may not live long enough
[00:08:52]    --> src/librustc/ty/structural_impls.rs:420:9
[00:08:52]     |
[00:08:52]     |
[00:08:52] 417 | impl<'a, 'tcx> Lift<'tcx> for ty::TraitRef<'a> {
[00:08:52]     |      --  ---- lifetime `'tcx` defined here
[00:08:52]     |      lifetime `'a` defined here
[00:08:52] ...
[00:08:52] ...
[00:08:52] 420 |         tcx.lift(&self.substs).map(|substs| ty::TraitRef {
[00:08:52]     |         ^^^^^^^^^^^^^^^^^^^^^^ argument requires that `'a` must outlive `'tcx`
[00:08:52] error: lifetime may not live long enough
[00:08:52]    --> src/librustc/ty/structural_impls.rs:430:9
[00:08:52]     |
[00:08:52]     |
[00:08:52] 427 | impl<'a, 'tcx> Lift<'tcx> for ty::ExistentialTraitRef<'a> {
[00:08:52]     |      --  ---- lifetime `'tcx` defined here
[00:08:52]     |      lifetime `'a` defined here
[00:08:52] ...
[00:08:52] ...
[00:08:52] 430 |         tcx.lift(&self.substs).map(|substs| ty::ExistentialTraitRef {
[00:08:52]     |         ^^^^^^^^^^^^^^^^^^^^^^ argument requires that `'a` must outlive `'tcx`
[00:08:52] error: lifetime may not live long enough
[00:08:52]    --> src/librustc/ty/structural_impls.rs:487:9
[00:08:52]     |
[00:08:52]     |
[00:08:52] 483 | impl<'a, 'tcx> Lift<'tcx> for ty::ProjectionTy<'a> {
[00:08:52]     |      --  ---- lifetime `'tcx` defined here
[00:08:52]     |      lifetime `'a` defined here
[00:08:52] ...
[00:08:52] ...
[00:08:52] 487 |         tcx.lift(&self.substs).map(|substs| {
[00:08:52]     |         ^^^^^^^^^^^^^^^^^^^^^^ argument requires that `'a` must outlive `'tcx`
[00:08:52] error: lifetime may not live long enough
[00:08:52]    --> src/librustc/ty/structural_impls.rs:512:9
[00:08:52]     |
[00:08:52]     |
[00:08:52] 509 | impl<'a, 'tcx> Lift<'tcx> for ty::ExistentialProjection<'a> {
[00:08:52]     |      --  ---- lifetime `'tcx` defined here
[00:08:52]     |      lifetime `'a` defined here
[00:08:52] ...
[00:08:52] ...
[00:08:52] 512 |         tcx.lift(&self.substs).map(|substs| {
[00:08:52]     |         ^^^^^^^^^^^^^^^^^^^^^^ argument requires that `'a` must outlive `'tcx`
[00:08:52] error: lifetime may not live long enough
[00:08:52]    --> src/librustc/ty/structural_impls.rs:554:17
[00:08:52]     |
[00:08:52]     |
[00:08:52] 522 | impl<'a, 'tcx> Lift<'tcx> for ty::Predicate<'a> {
[00:08:52]     |      --  ---- lifetime `'tcx` defined here
[00:08:52]     |      lifetime `'a` defined here
[00:08:52] ...
[00:08:52] ...
[00:08:52] 554 |                 tcx.lift(&substs).map(|substs| {
[00:08:52]     |                 ^^^^^^^^^^^^^^^^^ argument requires that `'a` must outlive `'tcx`
[00:08:52] error: lifetime may not live long enough
[00:08:52]    --> src/librustc/ty/structural_impls.rs:599:9
[00:08:52]     |
[00:08:52]     |
[00:08:52] 596 | impl<'a, 'tcx> Lift<'tcx> for ty::ClosureSubsts<'a> {
[00:08:52]     |      --  ---- lifetime `'tcx` defined here
[00:08:52]     |      lifetime `'a` defined here
[00:08:52] ...
[00:08:52] ...
[00:08:52] 599 |         tcx.lift(&self.substs).map(|substs| {
[00:08:52]     |         ^^^^^^^^^^^^^^^^^^^^^^ argument requires that `'a` must outlive `'tcx`
[00:08:52] error: lifetime may not live long enough
[00:08:52]    --> src/librustc/ty/structural_impls.rs:608:9
[00:08:52]     |
[00:08:52]     |
[00:08:52] 605 | impl<'a, 'tcx> Lift<'tcx> for ty::GeneratorSubsts<'a> {
[00:08:52]     |      --  ---- lifetime `'tcx` defined here
[00:08:52]     |      lifetime `'a` defined here
[00:08:52] ...
[00:08:52] ...
[00:08:52] 608 |         tcx.lift(&self.substs).map(|substs| {
[00:08:52]     |         ^^^^^^^^^^^^^^^^^^^^^^ argument requires that `'a` must outlive `'tcx`
[00:08:52] 
[00:08:52] error[E0515]: cannot return value referencing local data `self.substs`
[00:08:52]    --> src/librustc/ty/sty.rs:335:9
[00:08:52]     |
[00:08:52] 335 | /         SplitClosureSubsts {
[00:08:52] 336 | |             closure_kind_ty: self.substs.type_at(parent_len),
[00:08:52] 337 | |             closure_sig_ty: self.substs.type_at(parent_len + 1),
[00:08:52] 338 | |             upvar_kinds: &self.substs[parent_len + 2..],
[00:08:52]     | |                           ----------- `self.substs` is borrowed here
[00:08:52]     | |_________^ returns a value referencing data owned by the current function
[00:08:52] 
[00:08:52] 
[00:08:52] error[E0515]: cannot return value referencing local data `self.substs`
[00:08:52]    --> src/librustc/ty/sty.rs:411:9
[00:08:52]     |
[00:08:52] 411 | /         SplitGeneratorSubsts {
[00:08:52] 412 | |             yield_ty: self.substs.type_at(parent_len),
[00:08:52] 413 | |             return_ty: self.substs.type_at(parent_len + 1),
[00:08:52] 414 | |             witness: self.substs.type_at(parent_len + 2),
[00:08:52] 415 | |             upvar_kinds: &self.substs[parent_len + 3..],
[00:08:52]     | |                           ----------- `self.substs` is borrowed here
[00:08:52]     | |_________^ returns a value referencing data owned by the current function
[00:08:52] 
[00:08:53] error: aborting due to 25 previous errors
[00:08:53] 
---
travis_time:end:19902e7e:start=1556385519928735097,finish=1556385519935715687,duration=6980590
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0510ea40
$ 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:3402cbd5
travis_time:start:3402cbd5
$ 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:052fb705
$ 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)

rust-highfive · 2019-04-28T08:15:14Z

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:1b686d09:start=1556438709734480174,finish=1556438798229096482,duration=88494616308
$ 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:29]    Compiling syntax_ext v0.0.0 (/checkout/src/libsyntax_ext)
[00:08:20] error[E0515]: cannot return value referencing local variable `substs`
[00:08:20]    --> src/librustc/ty/walk.rs:108:17
[00:08:20]     |
[00:08:20] 108 |                 substs.types().rev().chain(opt_ty)
[00:08:20]     |                 |
[00:08:20]     |                 returns a value referencing data owned by the current function
[00:08:20]     |                 `substs` is borrowed here
[00:08:20] 
[00:08:20] 
[00:08:21] error[E0515]: cannot return value referencing temporary value
[00:08:21]    --> src/librustc/ty/sty.rs:347:9
[00:08:21]     |
[00:08:21] 346 |           let SplitClosureSubsts { upvar_kinds, .. } = &self.split(def_id, tcx);
[00:08:21]     |                                                         ----------------------- temporary value created here
[00:08:21] 347 | /         upvar_kinds.iter().map(|t| {
[00:08:21] 348 | |             if let UnpackedKind::Type(ty) = t.unpack() {
[00:08:21] 349 | |                 ty.clone()
[00:08:21] 350 | |             } else {
[00:08:21] 351 | |                 bug!("upvar should be type")
[00:08:21] 353 | |         })
[00:08:21]     | |__________^ returns a value referencing data owned by the current function
[00:08:21] 
[00:08:21] error[E0515]: cannot return value referencing temporary value
[00:08:21] error[E0515]: cannot return value referencing temporary value
[00:08:21]    --> src/librustc/ty/sty.rs:433:9
[00:08:21]     |
[00:08:21] 433 |           upvar_kinds.clone().iter().map(|t| {
[00:08:21]     |           ^------------------
[00:08:21]     |  _________temporary value created here
[00:08:21]     | |
[00:08:21]     | |
[00:08:21] 434 | |             if let UnpackedKind::Type(ty) = t.unpack() {
[00:08:21] 435 | |                 ty.clone()
[00:08:21] 436 | |             } else {
[00:08:21] 437 | |                 bug!("upvar should be type")
[00:08:21] 439 | |         })
[00:08:21]     | |__________^ returns a value referencing data owned by the current function
[00:08:21] 
[00:08:21] 
[00:08:21] error[E0515]: cannot return value referencing local variable `upvar_kinds`
[00:08:21]    --> src/librustc/ty/sty.rs:518:9
[00:08:21]     |
[00:08:21] 518 |           upvar_kinds.iter().map(|t| {
[00:08:21]     |           ^----------
[00:08:21]     |           |
[00:08:21]     |  _________`upvar_kinds` is borrowed here
[00:08:21]     | |
[00:08:21] 519 | |             if let UnpackedKind::Type(ty) = t.unpack() {
[00:08:21] 520 | |                 ty.clone()
[00:08:21] 521 | |             } else {
[00:08:21] 522 | |                 bug!("upvar should be type")
[00:08:21] 524 | |         })
[00:08:21]     | |__________^ returns a value referencing data owned by the current function
[00:08:21] 
[00:08:21] error: aborting due to 4 previous errors
---
travis_time:end:00426c90:start=1556439310483137146,finish=1556439310488722888,duration=5585742
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:17e550d0
$ 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:0a25817c
travis_time:start:0a25817c
$ 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)

oli-obk · 2019-04-28T10:24:25Z

src/librustc/ty/print/mod.rs

@@ -199,7 +199,7 @@ pub trait Printer<'gcx: 'tcx, 'tcx>: Sized {
            }
        }).count();

-        &substs[own_params]
+        SubstsRef::from_slice(self.tcx(), &substs[own_params])


why does this take TyCtxt as an argument? Is there a method that will just pass through the reference if it already has the appropriate lifetime?

src/librustc/ty/structural_impls.rs

oli-obk · 2019-04-28T10:25:34Z

src/librustc/ty/sty.rs

        let generics = tcx.generics_of(def_id);
        let parent_len = generics.parent_count;
        SplitClosureSubsts {
            closure_kind_ty: self.substs.type_at(parent_len),
            closure_sig_ty: self.substs.type_at(parent_len + 1),
-            upvar_kinds: &self.substs[parent_len + 2..],
+            upvar_kinds: SubstsRef::from_slice(tcx, &self.substs[parent_len + 2..]),


same here, tcx isn't really necessary, the lifetimes should already fit

src/librustc/ty/sty.rs

bors · 2019-05-02T07:46:02Z

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

jonas-schievink · 2019-06-10T13:00:38Z

Triage ping @csmoe, there's merge conflicts waiting to be resolved, and also a few review comments

JohnCSimon · 2019-07-20T00:16:03Z

Triage pinging again @csmoe
merge conflicts waiting to be resolved

@nikomatsakis

Replace ClosureSubsts with SubstsRef Addresses rust-lang#42340 part 3 rust-lang#59312 might benefit from this clean up. r? @nikomatsakis

rust-highfive assigned oli-obk Mar 20, 2019

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

oli-obk reviewed Mar 20, 2019

View reviewed changes

Centril added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 30, 2019

csmoe force-pushed the substs2 branch 3 times, most recently from 5943ac9 to 8a62a32 Compare April 19, 2019 13:45

csmoe force-pushed the substs2 branch 2 times, most recently from 641a29a to e52b4c7 Compare April 27, 2019 16:35

csmoe marked this pull request as ready for review April 27, 2019 16:37

This comment has been minimized.

Sign in to view

csmoe force-pushed the substs2 branch from e52b4c7 to 360f643 Compare April 27, 2019 17:00

csmoe added 3 commits April 28, 2019 01:01

new struct substsref

aa53d09

impl hashstable for substsref

7f1eb7f

Change-Id: Idc024631af3ecbe352fb0d18c9184ab7f2d55a19

purge Kind slice with SubstsRef

ccabeca

csmoe force-pushed the substs2 branch from 360f643 to 04eeed2 Compare April 27, 2019 17:02

impl IntoIterator for SubstsRef

6a6887a

csmoe force-pushed the substs2 branch from 04eeed2 to 6a6887a Compare April 27, 2019 17:08

impl substsref instead of internalsubsts

27462a9

oli-obk reviewed Apr 28, 2019

View reviewed changes

csmoe closed this Jul 22, 2019

csmoe mentioned this pull request Sep 27, 2019

Replace ClosureSubsts with SubstsRef #64817

Merged

Centril added a commit to Centril/rust that referenced this pull request Oct 4, 2019

Rollup merge of rust-lang#64817 - csmoe:closure, r=nikomatsakis

17e1f23

Replace ClosureSubsts with SubstsRef Addresses rust-lang#42340 part 3 rust-lang#59312 might benefit from this clean up. r? @nikomatsakis

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Step 2] Implement "small substs optimization" for substs of length 1 #59312

[Step 2] Implement "small substs optimization" for substs of length 1 #59312

csmoe commented Mar 20, 2019

rust-highfive commented Mar 20, 2019

oli-obk Mar 20, 2019

csmoe Apr 27, 2019

oli-obk Apr 28, 2019

bors commented Mar 25, 2019

Centril commented Mar 30, 2019

This comment has been minimized.

This comment has been minimized.

rust-highfive commented Apr 27, 2019

rust-highfive commented Apr 28, 2019

oli-obk Apr 28, 2019

oli-obk Apr 28, 2019

bors commented May 2, 2019

jonas-schievink commented Jun 10, 2019

JohnCSimon commented Jul 20, 2019 •

edited

Loading

[Step 2] Implement "small substs optimization" for substs of length 1 #59312

[Step 2] Implement "small substs optimization" for substs of length 1 #59312

Conversation

csmoe commented Mar 20, 2019

rust-highfive commented Mar 20, 2019

oli-obk Mar 20, 2019

Choose a reason for hiding this comment

csmoe Apr 27, 2019

Choose a reason for hiding this comment

oli-obk Apr 28, 2019

Choose a reason for hiding this comment

bors commented Mar 25, 2019

Centril commented Mar 30, 2019

This comment has been minimized.

This comment has been minimized.

rust-highfive commented Apr 27, 2019

rust-highfive commented Apr 28, 2019

oli-obk Apr 28, 2019

Choose a reason for hiding this comment

oli-obk Apr 28, 2019

Choose a reason for hiding this comment

bors commented May 2, 2019

jonas-schievink commented Jun 10, 2019

JohnCSimon commented Jul 20, 2019 • edited Loading

JohnCSimon commented Jul 20, 2019 •

edited

Loading