diff options
| author | Graydon Hoare <[email protected]> | 2010-06-30 00:55:04 -0700 |
|---|---|---|
| committer | Graydon Hoare <[email protected]> | 2010-06-30 00:55:04 -0700 |
| commit | 7e853457dfdb9b8d677444423fecf1abfeb6c136 (patch) | |
| tree | a65a03b959c1a3a321e53e5170417eb8ac35a59d /src/boot/me/trans.ml | |
| parent | Add logging to type and effect. (diff) | |
| download | rust-7e853457dfdb9b8d677444423fecf1abfeb6c136.tar.xz rust-7e853457dfdb9b8d677444423fecf1abfeb6c136.zip | |
Move simplified_ty from trans to semant and use it a few places.
Diffstat (limited to 'src/boot/me/trans.ml')
| -rw-r--r-- | src/boot/me/trans.ml | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/boot/me/trans.ml b/src/boot/me/trans.ml index e409602a..e33e3ed4 100644 --- a/src/boot/me/trans.ml +++ b/src/boot/me/trans.ml @@ -1887,12 +1887,12 @@ let trans_visitor in match expr with Ast.EXPR_binary (binop, a, b) -> - assert (is_prim_type (atom_type cx a)); - assert (is_prim_type (atom_type cx b)); + assert (is_prim_type (simplified_ty (atom_type cx a))); + assert (is_prim_type (simplified_ty (atom_type cx b))); trans_binary binop (trans_atom a) (trans_atom b) | Ast.EXPR_unary (unop, a) -> - assert (is_prim_type (atom_type cx a)); + assert (is_prim_type (simplified_ty (atom_type cx a))); let src = trans_atom a in let bits = Il.operand_bits word_bits src in let dst = Il.Reg (Il.next_vreg (emitter()), Il.ValTy bits) in @@ -2218,13 +2218,6 @@ let trans_visitor and exterior_rc_cell (cell:Il.cell) : Il.cell = exterior_ctrl_cell cell Abi.exterior_rc_slot_field_refcnt - and simplified_ty t = - match t with - Ast.TY_exterior t - | Ast.TY_mutable t - | Ast.TY_constrained (t, _) -> simplified_ty t - | _ -> t - and exterior_allocation_size (ty:Ast.ty) : Il.operand = @@ -4074,7 +4067,7 @@ let trans_visitor and trans_log id a = - match atom_type cx a with + match simplified_ty (atom_type cx a) with (* NB: If you extend this, be sure to update the * typechecking code in type.ml as well. *) Ast.TY_str -> trans_log_str a |