---

graydon · graydon · commit e69a116eb3a2 · 2012-07-04T14:07:03.000-07:00
yaml --- r: 24557 b: refs/heads/try2 c: 195dd54 h: refs/heads/master i: 24555: ff5c48a v: v3
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: db355082e1ec2d5ed4a78f6d281eba55cf444cb5
+refs/heads/try2: 195dd54d61c32ca983b1f81237570e9b0e70abbd
 refs/heads/incoming: 05543fd04dfb3f63b453a331e239ceb1a9a219f9
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
diff --git a/branches/try2/src/rustc/middle/trans/base.rs b/branches/try2/src/rustc/middle/trans/base.rs
@@ -1547,7 +1547,7 @@ fn trans_addr_of(cx: block, e: @ast::expr, dest: dest) -> block {
     let ety = expr_ty(cx, e);
     let is_immediate = ty::type_is_immediate(ety);
     if (kind == temporary && is_immediate) || kind == owned_imm {
-        val = do_spill(cx, val, ety);
+        val = do_spill(bcx, val, ety);
     }
     ret store_in_dest(bcx, val, dest);
 }

Original file line number	Diff line number	Diff line change
`@@ -1547,7 +1547,7 @@ fn trans_addr_of(cx: block, e: @ast::expr, dest: dest) -> block {`
`1547`	`1547`	`let ety = expr_ty(cx, e);`
`1548`	`1548`	`let is_immediate = ty::type_is_immediate(ety);`
`1549`	`1549`	`if (kind == temporary && is_immediate) \|\| kind == owned_imm {`
`1550`		`- val = do_spill(cx, val, ety);`
	`1550`	`+ val = do_spill(bcx, val, ety);`
`1551`	`1551`	`}`
`1552`	`1552`	`ret store_in_dest(bcx, val, dest);`
`1553`	`1553`	`}`