---

yaml
---
r: 39832
b: refs/heads/incoming
c: 1b4f3fa
h: refs/heads/master
v: v3

Author: jld

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: cd01ecfe1329d90584d35d775f2a645abba61811
+refs/heads/incoming: 1b4f3fad1e6036b3d7cb17cc80ac1c204e1f11a2
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/librustc/middle/trans/foreign.rs

@@ -94,6 +94,9 @@ fn classify_ty(ty: TypeRef) -> ~[x86_64_reg_class] {
     fn struct_tys(ty: TypeRef) -> ~[TypeRef] {
         unsafe {
             let n = llvm::LLVMCountStructElementTypes(ty);
+        if (n == 0) {
+            return ~[];
+        }
             let mut elts = vec::from_elem(n as uint, ptr::null());
             llvm::LLVMGetStructElementTypes(ty,
                 ptr::to_mut_unsafe_ptr(&mut elts[0]));
@@ -111,7 +114,7 @@ fn classify_ty(ty: TypeRef) -> ~[x86_64_reg_class] {
                 Float => 4,
                 Double => 8,
                 Struct => {
-                  do vec::foldl(0, struct_tys(ty)) |a, t| {
+                  do vec::foldl(1, struct_tys(ty)) |a, t| {
                       uint::max(a, ty_align(*t))
                   }
                 }
@@ -184,15 +187,11 @@ fn classify_ty(ty: TypeRef) -> ~[x86_64_reg_class] {
     fn classify_struct(tys: &[TypeRef],
                        cls: &[mut x86_64_reg_class], i: uint,
                        off: uint) {
-        if vec::is_empty(tys) {
-            classify(T_i64(), cls, i, off);
-        } else {
-            let mut field_off = off;
-            for vec::each(tys) |ty| {
-                field_off = align(field_off, *ty);
-                classify(*ty, cls, i, field_off);
-                field_off += ty_size(*ty);
-            }
+        let mut field_off = off;
+        for vec::each(tys) |ty| {
+            field_off = align(field_off, *ty);
+            classify(*ty, cls, i, field_off);
+            field_off += ty_size(*ty);
         }
     }
 
@@ -378,13 +377,14 @@ fn x86_64_tys(atys: &[TypeRef],
     }
 
     fn is_pass_byval(cls: &[x86_64_reg_class]) -> bool {
-        return cls[0] == memory_class ||
-            cls[0] == x87_class ||
-            cls[0] == complex_x87_class;
+        return cls.len() > 0 &&
+            (cls[0] == memory_class ||
+             cls[0] == x87_class ||
+             cls[0] == complex_x87_class);
     }
 
     fn is_ret_bysret(cls: &[x86_64_reg_class]) -> bool {
-        return cls[0] == memory_class;
+        return cls.len() > 0 && cls[0] == memory_class;
     }
 
     fn x86_64_ty(ty: TypeRef,