File tree Expand file tree Collapse file tree 1 file changed +9
-6
lines changed Expand file tree Collapse file tree 1 file changed +9
-6
lines changed Original file line number Diff line number Diff line change @@ -1093,12 +1093,15 @@ pure fn mach_sty(cfg: @session::config, t: t) -> sty {
1093
1093
}
1094
1094
1095
1095
fn default_arg_mode_for_ty ( tcx : ctxt , ty : ty:: t ) -> ast:: rmode {
1096
- return if type_is_fn ( ty) {
1097
- // ^^^^^^^^^^^^^^
1098
- // FIXME(#2202) --- We retain by-ref by default to workaround a memory
1099
- // leak that otherwise results when @fn is upcast to &fn.
1100
- ast:: by_ref
1101
- } else if tcx. legacy_modes {
1096
+ // FIXME(#2202) --- We retain by-ref for fn& things to workaround a
1097
+ // memory leak that otherwise results when @fn is upcast to &fn.
1098
+ if type_is_fn ( ty) {
1099
+ match ty_fn_proto ( ty) {
1100
+ proto_vstore( vstore_slice( _) ) => return ast:: by_ref,
1101
+ _ => ( )
1102
+ }
1103
+ }
1104
+ return if tcx. legacy_modes {
1102
1105
if type_is_borrowed ( ty) {
1103
1106
// the old mode default was ++ for things like &ptr, but to be
1104
1107
// forward-compatible with non-legacy, we should use +
You can’t perform that action at this time.
0 commit comments