Consolidate codes dealing with LLVM struct type

diff --git a/src/librustc/lib/llvm.rs b/src/librustc/lib/llvm.rs
index e42d3aeaf144cb9298b5fc9c8c58f85c81988b11..d2bb7c75a27f6225d2b688f972b5a12ddb75ced8 100644 (file)
--- a/src/librustc/lib/llvm.rs
+++ b/src/librustc/lib/llvm.rs
@@ -1379,12 +1379,7 @@ fn tys_str(names: @TypeNames, outer: &[TypeRef],
                         type_to_str_inner(names, outer, out_ty)).to_managed();
           }
           Struct => {
-            let n_elts = llvm::LLVMCountStructElementTypes(ty) as uint;
-            let mut elts = vec::from_elem(n_elts, 0 as TypeRef);
-            if !elts.is_empty() {
-                llvm::LLVMGetStructElementTypes(
-                    ty, ptr::to_mut_unsafe_ptr(&mut elts[0]));
-            }
+            let elts = struct_tys(ty);
             // See [Note at-str]
             return fmt!("{%s}", tys_str(names, outer, elts)).to_managed();
           }
@@ -1445,17 +1440,16 @@ pub fn fn_ty_param_tys(fn_ty: TypeRef) -> ~[TypeRef] {
     }
 }
 
-pub fn struct_element_types(struct_ty: TypeRef) -> ~[TypeRef] {
+pub fn struct_tys(struct_ty: TypeRef) -> ~[TypeRef] {
     unsafe {
-        let count = llvm::LLVMCountStructElementTypes(struct_ty);
-        let mut buf: ~[TypeRef] =
-            vec::from_elem(count as uint,
-                           cast::transmute::<uint,TypeRef>(0));
-        if buf.len() > 0 {
-            llvm::LLVMGetStructElementTypes(
-                struct_ty, ptr::to_mut_unsafe_ptr(&mut buf[0]));
+        let n_elts = llvm::LLVMCountStructElementTypes(struct_ty) as uint;
+        if n_elts == 0 {
+            return ~[];
         }
-        return buf;
+        let mut elts = vec::from_elem(n_elts, ptr::null());
+        llvm::LLVMGetStructElementTypes(
+            struct_ty, ptr::to_mut_unsafe_ptr(&mut elts[0]));
+        return elts;
     }
 }
 

diff --git a/src/librustc/middle/trans/base.rs b/src/librustc/middle/trans/base.rs
index cadbe1208ad2b37320a0a057874c2cab07ea1c91..d69ae8e1c7b7429bb01b5eb212f4c5d8ecbd8b0f 100644 (file)
--- a/src/librustc/middle/trans/base.rs
+++ b/src/librustc/middle/trans/base.rs
@@ -2150,11 +2150,6 @@ pub fn trans_mod(ccx: @CrateContext, m: ast::_mod) {
     }
 }
 
-pub fn get_pair_fn_ty(llpairty: TypeRef) -> TypeRef {
-    // Bit of a kludge: pick the fn typeref out of the pair.
-    return struct_elt(llpairty, 0u);
-}
-
 pub fn register_fn(ccx: @CrateContext,
                    sp: span,
                    +path: path,

diff --git a/src/librustc/middle/trans/cabi_x86_64.rs b/src/librustc/middle/trans/cabi_x86_64.rs
index 9f717682dae09d6f9429db71f62a3c94eb5f0527..df0f11eedae88743e492387b6333463015530127 100644 (file)
--- a/src/librustc/middle/trans/cabi_x86_64.rs
+++ b/src/librustc/middle/trans/cabi_x86_64.rs
@@ -14,6 +14,7 @@
 use lib::llvm::{llvm, TypeRef, ValueRef, Integer, Pointer, Float, Double};
 use lib::llvm::{Struct, Array, Attribute};
 use lib::llvm::{StructRetAttribute, ByValAttribute};
+use lib::llvm::struct_tys;
 use middle::trans::common::*;
 use middle::trans::cabi::*;
 
@@ -65,19 +66,6 @@ fn align(off: uint, ty: TypeRef) -> uint {
         return (off + a - 1u) / a * a;
     }
 
-    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]));
-            return elts;
-        }
-    }
-
     fn ty_align(ty: TypeRef) -> uint {
         unsafe {
             return match llvm::LLVMGetTypeKind(ty) {

diff --git a/src/librustc/middle/trans/callee.rs b/src/librustc/middle/trans/callee.rs
index c1dac70ae97d957a9574bf4ebaea80e6f29d07da..6924ccf3ab644f9f2ea052e724b20ea9d618b7c3 100644 (file)
--- a/src/librustc/middle/trans/callee.rs
+++ b/src/librustc/middle/trans/callee.rs
@@ -380,7 +380,7 @@ pub fn trans_rtcall_or_lang_call_with_type_params(bcx: block,
                                                     fty);
                     let mut llfnty = type_of::type_of(callee.bcx.ccx(),
                                                       substituted);
-                    llfnty = T_ptr(struct_elt(llfnty, 0));
+                    llfnty = lib::llvm::struct_tys(llfnty)[0];
                     new_llval = PointerCast(callee.bcx, fn_data.llfn, llfnty);
                 }
                 _ => fail!()

diff --git a/src/librustc/middle/trans/common.rs b/src/librustc/middle/trans/common.rs
index 8bd85be0f70824815dd41f7c68f29d7fb3560007..fe0c4243e35bafa7e3a57b060d6c53d3502856af 100644 (file)
--- a/src/librustc/middle/trans/common.rs
+++ b/src/librustc/middle/trans/common.rs
@@ -645,19 +645,6 @@ pub fn val_str(tn: @TypeNames, v: ValueRef) -> @str {
     return ty_str(tn, val_ty(v));
 }
 
-// Returns the nth element of the given LLVM structure type.
-pub fn struct_elt(llstructty: TypeRef, n: uint) -> TypeRef {
-    unsafe {
-        let elt_count = llvm::LLVMCountStructElementTypes(llstructty) as uint;
-        assert (n < elt_count);
-        let mut elt_tys = vec::from_elem(elt_count, T_nil());
-        llvm::LLVMGetStructElementTypes(
-            llstructty,
-            ptr::to_mut_unsafe_ptr(&mut elt_tys[0]));
-        return llvm::LLVMGetElementType(elt_tys[n]);
-    }
-}
-
 pub fn in_scope_cx(cx: block, f: &fn(&mut scope_info)) {
     let mut cur = cx;
     loop {