---

yaml
---
r: 39833
b: refs/heads/incoming
c: ea53c48
h: refs/heads/master
i:
  39831: 9eece94
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: 1b4f3fad1e6036b3d7cb17cc80ac1c204e1f11a2
+refs/heads/incoming: ea53c48ca23ec4e46454d48936c209d2a67cf892
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/librustc/lib/llvm.rs

@@ -1330,9 +1330,10 @@ fn type_to_str_inner(names: type_names, +outer0: ~[TypeRef], ty: TypeRef) ->
             let mut s: ~str = ~"{";
             let n_elts = llvm::LLVMCountStructElementTypes(ty) as uint;
             let mut elts = vec::from_elem(n_elts, 0 as TypeRef);
-            llvm::LLVMGetStructElementTypes(ty,
-                                            ptr::to_mut_unsafe_ptr(
-                                                &mut elts[0]));
+            if elts.len() > 0 {
+                llvm::LLVMGetStructElementTypes(
+                    ty, ptr::to_mut_unsafe_ptr(&mut elts[0]));
+            }
             s += tys_str(names, outer, elts);
             s += ~"}";
             return s;
@@ -1398,8 +1399,10 @@ fn struct_element_types(struct_ty: TypeRef) -> ~[TypeRef] {
         let mut buf: ~[TypeRef] =
             vec::from_elem(count as uint,
                            cast::transmute::<uint,TypeRef>(0));
-        llvm::LLVMGetStructElementTypes(struct_ty,
-                                        ptr::to_mut_unsafe_ptr(&mut buf[0]));
+        if buf.len() > 0 {
+            llvm::LLVMGetStructElementTypes(
+                struct_ty, ptr::to_mut_unsafe_ptr(&mut buf[0]));
+        }
         return move buf;
     }
 }