Merge remote-tracking branch 'origin/master' into rollup

diff --cc src/test/debuginfo/generic-struct.rs
index 0eb65f2d80f3d5f18b688e2f90887c1d3cabb91c,a81230599fa71376ca46290245a37b642d2eada9..696d2703bdef4ee04658a4f6aa9d59d0c40bbad4
--- 1/src/test/debuginfo/generic-struct.rs
--- 2/src/test/debuginfo/generic-struct.rs
+++ b/src/test/debuginfo/generic-struct.rs
@@@ -32,14 -32,14 +32,14 @@@
  // lldb-command:run
  
  // lldb-command:print int_int
--// lldb-check:[...]$0 = AGenericStruct<isize, isize> { key: 0, value: 1 }
++// lldb-check:[...]$0 = AGenericStruct<i32, i32> { key: 0, value: 1 }
  // lldb-command:print int_float
--// lldb-check:[...]$1 = AGenericStruct<isize, f64> { key: 2, value: 3.5 }
++// lldb-check:[...]$1 = AGenericStruct<i32, f64> { key: 2, value: 3.5 }
  // lldb-command:print float_int
--// lldb-check:[...]$2 = AGenericStruct<f64, isize> { key: 4.5, value: 5 }
++// lldb-check:[...]$2 = AGenericStruct<f64, i32> { key: 4.5, value: 5 }
  
  // lldb-command:print float_int_float
--// lldb-check:[...]$3 = AGenericStruct<f64, generic-struct::AGenericStruct<isize, f64>> { key: 6.5, value: AGenericStruct<isize, f64> { key: 7, value: 8.5 } }
++// lldb-check:[...]$3 = AGenericStruct<f64, generic-struct::AGenericStruct<i32, f64>> { key: 6.5, value: AGenericStruct<i32, f64> { key: 7, value: 8.5 } }
  
  
  #![omit_gdb_pretty_printer_section]