---

nikomatsakis · nikomatsakis · commit 837ccec730cd · 2012-09-07T09:32:56.000-07:00
yaml --- r: 32448 b: refs/heads/dist-snap c: cd3cc6d h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: cb5362334134f1d0d8b2c5557c49ee6534526474
+refs/heads/dist-snap: cd3cc6d17b68ef18199a54372963b00ba8a0a84f
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/dist-snap/src/rustc/middle/trans/datum.rs b/branches/dist-snap/src/rustc/middle/trans/datum.rs
@@ -177,8 +177,8 @@ fn scratch_datum(bcx: block, ty: ty::t, zero: bool) -> Datum {
      * returns a by-ref Datum pointing to it.  You must arrange
      * any cleanups etc yourself! */
 
-    let scratch = alloc_ty(bcx, ty);
-    if zero { zero_mem(bcx, scratch, ty); }
+    let llty = type_of::type_of(bcx.ccx(), ty);
+    let scratch = alloca_maybe_zeroed(bcx, llty, zero);
     Datum { val: scratch, ty: ty, mode: ByRef, source: FromRvalue }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -177,8 +177,8 @@ fn scratch_datum(bcx: block, ty: ty::t, zero: bool) -> Datum {`
`177`	`177`	`* returns a by-ref Datum pointing to it. You must arrange`
`178`	`178`	`* any cleanups etc yourself! */`
`179`	`179`
`180`		`- let scratch = alloc_ty(bcx, ty);`
`181`		`- if zero { zero_mem(bcx, scratch, ty); }`
	`180`	`+ let llty = type_of::type_of(bcx.ccx(), ty);`
	`181`	`+ let scratch = alloca_maybe_zeroed(bcx, llty, zero);`
`182`	`182`	`Datum { val: scratch, ty: ty, mode: ByRef, source: FromRvalue }`
`183`	`183`	`}`
`184`	`184`