From baf474443a301b59f6a44b1dcbbf098f5eb1cef3 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Fri, 24 Jun 2011 17:34:54 -0400
Subject: [PATCH] rustc: Increment by the unit size in iter_structural_ty when
 iterating over interior vectors if the unit size is dynamic

---
 src/comp/middle/trans.rs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/comp/middle/trans.rs b/src/comp/middle/trans.rs
index fe4200826ed..59f7dd84073 100644
--- a/src/comp/middle/trans.rs
+++ b/src/comp/middle/trans.rs
@@ -2504,10 +2504,18 @@ fn iter_structural_ty_full(&@block_ctxt cx, ValueRef av, ValueRef bv,
                load_if_immediate(loop_body_cx, src_elem, unit_ty), unit_ty);
 
         loop_body_cx = rs.bcx;
+
+        auto increment;
+        if (ty::type_has_dynamic_size(bcx.fcx.lcx.ccx.tcx, unit_ty)) {
+            increment = unit_sz;
+        } else {
+            increment = C_int(1);
+        }
+
         loop_body_cx.build.Store(loop_body_cx.build.InBoundsGEP(dest_elem,
-            [C_int(1)]), dest_elem_ptr);
+            [increment]), dest_elem_ptr);
         loop_body_cx.build.Store(loop_body_cx.build.InBoundsGEP(src_elem,
-            [C_int(1)]), src_elem_ptr);
+            [increment]), src_elem_ptr);
         loop_body_cx.build.Br(loop_header_cx.llbb);
 
         ret rslt(next_cx, C_nil());