diff options
| author | Graydon Hoare <[email protected]> | 2010-10-14 12:41:48 -0700 |
|---|---|---|
| committer | Graydon Hoare <[email protected]> | 2010-10-14 12:41:48 -0700 |
| commit | f234750d802fde35f6607fd1599f805e490f3dd2 (patch) | |
| tree | 8cc749712920857e9a348e72b8a7855085b893c6 /src/boot/me/semant.ml | |
| parent | Move the friendly-names table to semant, reuse it in the name mangler. (diff) | |
| download | rust-f234750d802fde35f6607fd1599f805e490f3dd2.tar.xz rust-f234750d802fde35f6607fd1599f805e490f3dd2.zip | |
Fix crasher in rustc.
Diffstat (limited to 'src/boot/me/semant.ml')
| -rw-r--r-- | src/boot/me/semant.ml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/boot/me/semant.ml b/src/boot/me/semant.ml index 010494b4..1e568df0 100644 --- a/src/boot/me/semant.ml +++ b/src/boot/me/semant.ml @@ -2219,9 +2219,10 @@ let rec closure_box_rty r (Array.init n_ty_params (fun _ -> tydesc)) in let bound_args = r (Array.map (slot_referent_type cx) bs) in - (* First tydesc is the one describing bound_args; second tydesc is the one - * to pass to targ when invoking it. *) - r [| rc; r [| tydesc; targ; ty_param_rtys; bound_args |] |] + (* First tydesc is the one describing bound_args; second tydesc cluster + * are those to pass to targ when invoking it, along with the merged + * bound args. *) + r [| rc; r [| tydesc; targ; bound_args; ty_param_rtys |] |] and fn_rty (cx:ctxt) (opaque_box_body:bool) : Il.referent_ty = let s t = Il.ScalarTy t in |