2021 week 29: rebase off upstream

[adpaco-aws]

No description provided.

[adpaco-aws]

Got a conflict when rebasing in Cargo.lock

Applying: Use num::BigInt instead of i128 in constants, as constants can be of arbitrary size. (#141)
Using index info to reconstruct a base tree...
M       Cargo.lock
Falling back to patching base and 3-way merge...
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
error: Failed to merge in the changes.
Patch failed at 0034 Use num::BigInt instead of i128 in constants, as constants can be of arbitrary size. (#141)

[adpaco-aws]

This conflict appears because of our changes to Cargo.lock in #141 . Now it fails because ntapi dependency has been added. Action: Accept both changes and add [[package]] marker and closing bracket to keep both ntapi and num.

[adpaco-aws]

If we proceed to run the regression, we get 9 errors:

   Compiling rustc_codegen_llvm v0.0.0 (/home/ubuntu/rmc-rebase-2/compiler/rustc_codegen_llvm)
warning: unused import: `rustc_middle::ty::subst::InternalSubsts`
  --> compiler/rustc_codegen_llvm/src/gotoc/rvalue.rs:13:5
   |
13 | use rustc_middle::ty::subst::InternalSubsts;
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
   = note: `#[warn(unused_imports)]` on by default

warning: unused imports: `Binder`, `GenericParamDefKind`, `TraitRef`
  --> compiler/rustc_codegen_llvm/src/gotoc/rvalue.rs:15:11
   |
15 |     self, Binder, GenericParamDefKind, Instance, IntTy, TraitRef, Ty, UintTy, VtblEntry,
   |           ^^^^^^  ^^^^^^^^^^^^^^^^^^^                   ^^^^^^^^

error[E0308]: mismatched types
   --> compiler/rustc_codegen_llvm/src/gotoc/monomorphize/collector.rs:228:22
    |
228 |                 for &((), id) in alloc.relocations().values() {
    |                      ^^^^^^^^    ---------------------------- this expression has type `&AllocId`
    |                      |
    |                      expected struct `AllocId`, found tuple
    |
    = note: expected struct `AllocId`
                found tuple `(_, _)`

error[E0023]: this pattern has 2 fields, but the corresponding tuple variant has 1 field
   --> compiler/rustc_codegen_llvm/src/gotoc/monomorphize/collector.rs:818:21
    |
818 |                     VtblEntry::Method(def_id, substs) => ty::Instance::resolve_for_vtable(
    |                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected 1 field, found 2
    | 
   ::: /home/ubuntu/rmc-rebase-2/compiler/rustc_middle/src/ty/vtable.rs:19:5
    |
19  |     Method(Instance<'tcx>),
    |     ---------------------- tuple variant defined here

error[E0308]: mismatched types
    --> compiler/rustc_codegen_llvm/src/gotoc/monomorphize/collector.rs:1042:18
     |
1042 |             for &((), inner) in alloc.relocations().values() {
     |                  ^^^^^^^^^^^    ---------------------------- this expression has type `&AllocId`
     |                  |
     |                  expected struct `AllocId`, found tuple
     |
     = note: expected struct `AllocId`
                 found tuple `(_, _)`

error[E0023]: this pattern has 1 field, but the corresponding tuple variant has 2 fields
    --> compiler/rustc_codegen_llvm/src/gotoc/monomorphize/collector.rs:1076:28
     |
1076 |         ConstValue::Scalar(Scalar::Ptr(ptr)) => collect_miri(tcx, ptr.alloc_id, output),
     |                            ^^^^^^^^^^^^^^^^ expected 2 fields, found 1
     | 
    ::: /home/ubuntu/rmc-rebase-2/compiler/rustc_middle/src/mir/interpret/value.rs:135:5
     |
135  |     Ptr(Pointer<Tag>, u8),
     |     --------------------- tuple variant defined here
     |
help: use `_` to explicitly ignore each field
     |
1076 |         ConstValue::Scalar(Scalar::Ptr(ptr, _)) => collect_miri(tcx, ptr.alloc_id, output),
     |                                           ^^^

error[E0308]: mismatched types
    --> compiler/rustc_codegen_llvm/src/gotoc/monomorphize/collector.rs:1078:18
     |
1078 |             for &((), id) in alloc.relocations().values() {
     |                  ^^^^^^^^    ---------------------------- this expression has type `&AllocId`
     |                  |
     |                  expected struct `AllocId`, found tuple
     |
     = note: expected struct `AllocId`
                 found tuple `(_, _)`

error[E0023]: this pattern has 1 field, but the corresponding tuple variant has 2 fields
   --> compiler/rustc_codegen_llvm/src/gotoc/operand.rs:268:14
    |
268 |             (Scalar::Ptr(ptr), _) => {
    |              ^^^^^^^^^^^^^^^^ expected 2 fields, found 1
    | 
   ::: /home/ubuntu/rmc-rebase-2/compiler/rustc_middle/src/mir/interpret/value.rs:135:5
    |
135 |     Ptr(Pointer<Tag>, u8),
    |     --------------------- tuple variant defined here
    |
help: use `_` to explicitly ignore each field
    |
268 |             (Scalar::Ptr(ptr, _), _) => {
    |                             ^^^

error[E0308]: mismatched types
   --> compiler/rustc_codegen_llvm/src/gotoc/operand.rs:385:23
    |
385 |         for &(offset, ((), alloc_id)) in alloc.relocations().iter() {
    |                       ^^^^^^^^^^^^^^     -------------------------- this expression has type `&(rustc_target::abi::Size, AllocId)`
    |                       |
    |                       expected struct `AllocId`, found tuple
    |
    = note: expected struct `AllocId`
                found tuple `(_, _)`

error[E0023]: this pattern has 2 fields, but the corresponding tuple variant has 1 field
   --> compiler/rustc_codegen_llvm/src/gotoc/rvalue.rs:861:25
    |
861 |                         VtblEntry::Method(def_id, substs) => {
    |                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected 1 field, found 2
    | 
   ::: /home/ubuntu/rmc-rebase-2/compiler/rustc_middle/src/ty/vtable.rs:19:5
    |
19  |     Method(Instance<'tcx>),
    |     ---------------------- tuple variant defined here

error[E0023]: this pattern has 2 fields, but the corresponding tuple variant has 1 field
   --> compiler/rustc_codegen_llvm/src/gotoc/typ.rs:201:25
    |
201 |                         VtblEntry::Method(def_id, substs) => {
    |                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected 1 field, found 2
    | 
   ::: /home/ubuntu/rmc-rebase-2/compiler/rustc_middle/src/ty/vtable.rs:19:5
    |
19  |     Method(Instance<'tcx>),
    |     ---------------------- tuple variant defined here

error: aborting due to 9 previous errors; 2 warnings emitted

Some errors have detailed explanations: E0023, E0308.
For more information about an error, try `rustc --explain E0023`.
error: could not compile `rustc_codegen_llvm`

To learn more, run the command again with --verbose.
warning: build failed, waiting for other jobs to finish...
warning: 1 warning emitted

error: build failed
Build completed unsuccessfully in 0:04:38

The failing branch has been pushed to main-153-2021-07-26. We will get a PR to fix these issues as we have been doing for the past weeks.

[adpaco-aws]

#361 has added the fixes required for the candidate branch to work.

[adpaco-aws]

main-153-2021-07-26 is now the default branch.