librustc: Bump the offset when translating const structs. Closes rust…

…-lang#6352.
pcwalton · May 31, 2013 · 40b4557 · 40b4557 · pcwalton · May 31, 2013
1 parent 3a3bf8b
commit 40b4557
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/src/librustc/middle/trans/adt.rs b/src/librustc/middle/trans/adt.rs
@@ -563,6 +563,7 @@ fn build_const_struct(ccx: @CrateContext, st: &Struct, vals: &[ValueRef])
             vals[i]
         };
         cfields.push(val);
+        offset += machine::llsize_of_alloc(ccx, llty) as u64
     }
 
     return cfields;

diff --git a/src/test/run-pass/const-struct-offsets.rs b/src/test/run-pass/const-struct-offsets.rs
@@ -0,0 +1,14 @@
+enum Foo {
+    IntVal(i32),
+    Int64Val(i64)
+}
+
+struct Bar {
+    i: i32,
+    v: Foo
+}
+
+static bar: Bar = Bar { i: 0, v: IntVal(0) };
+
+fn main() {}
+
-Original file line number
+Diff line change
@@ Expand Up @@
                 vals[i]
             };
             cfields.push(val);
+            offset += machine::llsize_of_alloc(ccx, llty) as u64
         }
         return cfields;
@@ Expand Down @@