Skip to content

Commit 2f37dff

Browse files
committed
---
yaml --- r: 4880 b: refs/heads/master c: 4286437 h: refs/heads/master v: v3
1 parent d5c7c07 commit 2f37dff

File tree

4 files changed

+3
-22
lines changed

4 files changed

+3
-22
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 10269dfaeb223f28421eb4564b03aa31ef49c5a1
2+
refs/heads/master: 42864377a4a64e3d8258e6fdb788c5e322c1ca55

trunk/src/comp/middle/trans.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4553,7 +4553,7 @@ fn trans_arg_expr(cx: &@block_ctxt, arg: &ty::arg, lldestty0: TypeRef,
45534553
};
45544554
if !lv.is_mem && !is_ext_vec_plus {
45554555
// Do nothing for temporaries, just give them to callee
4556-
} else if ty::type_is_structural(ccx.tcx, e_ty) {
4556+
} else if type_is_structural_or_param(ccx.tcx, e_ty) {
45574557
let dst = alloc_ty(bcx, e_ty);
45584558
bcx = copy_val(dst.bcx, INIT, dst.val, val, e_ty);
45594559
val = dst.val;
@@ -5906,7 +5906,7 @@ fn copy_args_to_allocas(fcx: @fn_ctxt, scope: @block_ctxt,
59065906
ast::val. {
59075907
// Structural types are passed by pointer, and we use the
59085908
// pointed-to memory for the local.
5909-
if !ty::type_is_structural(fcx_tcx(fcx), arg_ty) {
5909+
if !type_is_structural_or_param(fcx_tcx(fcx), arg_ty) {
59105910
// Overwrite the llargs entry for this arg with its alloca.
59115911
let aval = bcx.fcx.llargs.get(aarg.id);
59125912
let addr = do_spill(bcx, aval);

trunk/src/comp/middle/typeck.rs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -593,16 +593,6 @@ mod collect {
593593
let ty_mode = ast_mode_to_mode(a.mode);
594594
let f = bind getter(cx, _);
595595
let tt = ast_ty_to_ty(cx.tcx, f, a.ty);
596-
if ty::type_has_dynamic_size(cx.tcx, tt) {
597-
alt ty_mode {
598-
mo_val. {
599-
cx.tcx.sess.span_err(a.ty.span,
600-
"Dynamically sized arguments \
601-
must be passed by alias");
602-
}
603-
_ { }
604-
}
605-
}
606596
ret {mode: ty_mode, ty: tt};
607597
}
608598
fn ty_of_method(cx: @ctxt, m: &@ast::method) -> ty::method {

trunk/src/test/compile-fail/item-name-overload.rs

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)