commit fd83b92b598219d74317406a25234d572de584e0
author James Miller <bladeon@gmail.com> Sat Jun 15 14:29:52 2013
committer James Miller <bladeon@gmail.com> Sat Jun 22 00:26:33 2013
tree 8c71a2810c0c6d6eacc30e67fc3fc81ccf1b2ccb
parent 1968622798ce565fe9f3905c972513393070a78e

More Type refactorings

src/librustc/middle/trans/cabi.rs

diff --git a/src/librustc/middle/trans/cabi.rs b/src/librustc/middle/trans/cabi.rs
index ced19ce..036f34b 100644
--- a/src/librustc/middle/trans/cabi.rs
+++ b/src/librustc/middle/trans/cabi.rs
@@ -26,7 +26,7 @@
 
 pub struct LLVMType {
     cast: bool,
-    ty: TypeRef
+    ty: Type
 }
 
 pub struct FnType {
@@ -37,10 +37,10 @@
 }
 
 impl FnType {
-    pub fn decl_fn(&self, decl: &fn(fnty: TypeRef) -> ValueRef) -> ValueRef {
+    pub fn decl_fn(&self, decl: &fn(fnty: Type) -> ValueRef) -> ValueRef {
         let atys = vec::map(self.arg_tys, |t| t.ty);
         let rty = self.ret_ty.ty;
-        let fnty = T_fn(atys, rty);
+        let fnty = Type::func(atys, rty);
         let llfn = decl(fnty);
 
         for self.attrs.iter().enumerate().advance |(i, a)| {
@@ -59,7 +59,7 @@
 
     pub fn build_shim_args(&self,
                            bcx: block,
-                           arg_tys: &[TypeRef],
+                           arg_tys: &[Type],
                            llargbundle: ValueRef)
                            -> ~[ValueRef] {
         let mut atys: &[LLVMType] = self.arg_tys;
@@ -96,7 +96,7 @@
 
     pub fn build_shim_ret(&self,
                           bcx: block,
-                          arg_tys: &[TypeRef],
+                          arg_tys: &[Type],
                           ret_def: bool,
                           llargbundle: ValueRef,
                           llretval: ValueRef) {
@@ -132,7 +132,7 @@
 
     pub fn build_wrap_args(&self,
                            bcx: block,
-                           ret_ty: TypeRef,
+                           ret_ty: Type,
                            llwrapfn: ValueRef,
                            llargbundle: ValueRef) {
         let mut atys: &[LLVMType] = self.arg_tys;
@@ -145,7 +145,7 @@
             get_param(llwrapfn, 0u)
         } else if self.ret_ty.cast {
             let retptr = alloca(bcx, self.ret_ty.ty);
-            BitCast(bcx, retptr, T_ptr(ret_ty))
+            BitCast(bcx, retptr, ret_ty.ptr_to())
         } else {
             alloca(bcx, ret_ty)
         };
@@ -182,14 +182,14 @@
         if bcx.fcx.llretptr.is_some() {
             let llretval = load_inbounds(bcx, llargbundle, [ 0, arg_tys.len() ]);
             let llretval = if self.ret_ty.cast {
-                let retptr = BitCast(bcx, llretval, T_ptr(self.ret_ty.ty));
+                let retptr = BitCast(bcx, llretval, self.ret_ty.ty.ptr_to());
                 Load(bcx, retptr)
             } else {
                 Load(bcx, llretval)
             };
             let llretptr = BitCast(bcx,
                                    bcx.fcx.llretptr.get(),
-                                   T_ptr(self.ret_ty.ty));
+                                   self.ret_ty.ty.ptr_to());
             Store(bcx, llretval, llretptr);
         }
     }