---

yaml
---
r: 229184
b: refs/heads/try
c: 26f4ebe
h: refs/heads/master
v: v3

Author: pnkfelix

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: aca2057ed5fb7af3f8905b2bc01f72fa001c35c8
 refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
-refs/heads/try: 5a156190cb74ac92432e6ec8c91048ffa91a8a98
+refs/heads/try: 26f4ebe7a0b166cbfb04f6e8df16cb799f81058b
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/librustc_trans/trans/glue.rs

@@ -439,10 +439,12 @@ pub fn size_and_align_of_dst<'blk, 'tcx>(bcx: Block<'blk, 'tcx>, t: Ty<'tcx>, in
 
             let dbloc = DebugLoc::None;
 
-            // #27023 FIXME: We should be adding any necessary padding
+            // FIXME (#26403, #27023): We should be adding padding
             // to `sized_size` (to accommodate the `unsized_align`
             // required of the unsized field that follows) before
-            // summing it with `sized_size`.
+            // summing it with `sized_size`. (Note that since #26403
+            // is unfixed, we do not yet add the necessary padding
+            // here. But this is where the add would go.)
 
             // Return the sum of sizes and max of aligns.
             let mut size = Add(bcx, sized_size, unsized_size, dbloc);