---

graydon · graydon · commit 76d0843c7388 · 2011-05-20T14:50:57.000-07:00
yaml --- r: 2668 b: refs/heads/master c: 67b8501 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 381ba1d0babaee0def296cdd337dc911322234af
+refs/heads/master: 67b8501eb88d5d5e4b3c839e9e1a78b4f3fbedfc
diff --git a/trunk/src/comp/middle/trans.rs b/trunk/src/comp/middle/trans.rs
@@ -3053,7 +3053,7 @@ fn call_cmp_glue(&@block_ctxt cx,
 }
 
 fn take_ty(&@block_ctxt cx, ValueRef v, ty::t t) -> result {
-    if (!ty::type_is_scalar(cx.fcx.lcx.ccx.tcx, t)) {
+    if (ty::type_has_pointers(cx.fcx.lcx.ccx.tcx, t)) {
         ret call_tydesc_glue(cx, v, t, false, abi::tydesc_field_take_glue);
     }
     ret res(cx, C_nil());

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: 381ba1d0babaee0def296cdd337dc911322234af`
	`2`	`+refs/heads/master: 67b8501eb88d5d5e4b3c839e9e1a78b4f3fbedfc`
Original file line number	Diff line number	Diff line change
`@@ -3053,7 +3053,7 @@ fn call_cmp_glue(&@block_ctxt cx,`
`3053`	`3053`	`}`
`3054`	`3054`
`3055`	`3055`	`fn take_ty(&@block_ctxt cx, ValueRef v, ty::t t) -> result {`
`3056`		`- if (!ty::type_is_scalar(cx.fcx.lcx.ccx.tcx, t)) {`
	`3056`	`+ if (ty::type_has_pointers(cx.fcx.lcx.ccx.tcx, t)) {`
`3057`	`3057`	`ret call_tydesc_glue(cx, v, t, false, abi::tydesc_field_take_glue);`
`3058`	`3058`	`}`
`3059`	`3059`	`ret res(cx, C_nil());`