---

pcwalton · pcwalton · commit 42588424336d · 2011-03-10T14:38:06.000-08:00
yaml --- r: 1596 b: refs/heads/master c: 41d5094 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ca0259b20bfc2f33f23e8b82864908fbb3b8133
+refs/heads/master: 41d5094a8e0f58221b470a2676a9a1dae287102d
diff --git a/trunk/src/Makefile b/trunk/src/Makefile
@@ -443,7 +443,6 @@ TEST_XFAILS_RUSTC := $(addprefix test/run-pass/, \
                         basic-1.rs \
                         basic-2.rs \
                         basic.rs \
-                        bind-obj-ctor.rs \
                         child-outlives-parent.rs \
                         clone-with-exterior.rs \
                         comm.rs \
diff --git a/trunk/src/comp/middle/trans.rs b/trunk/src/comp/middle/trans.rs
@@ -3526,7 +3526,7 @@ fn trans_bind_thunk(@crate_ctxt cx,
         i += 1u;
     }
 
-    let uint a = 2u + i;    // retptr, task ptr, env come first
+    let uint a = 3u;    // retptr, task ptr, env come first
     let int b = 0;
     let uint outgoing_arg_index = 0u;
     let vec[TypeRef] llout_arg_tys =

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: 4ca0259b20bfc2f33f23e8b82864908fbb3b8133`
	`2`	`+refs/heads/master: 41d5094a8e0f58221b470a2676a9a1dae287102d`
Original file line number	Diff line number	Diff line change
`@@ -3526,7 +3526,7 @@ fn trans_bind_thunk(@crate_ctxt cx,`
`3526`	`3526`	`i += 1u;`
`3527`	`3527`	`}`
`3528`	`3528`
`3529`		`- let uint a = 2u + i; // retptr, task ptr, env come first`
	`3529`	`+ let uint a = 3u; // retptr, task ptr, env come first`
`3530`	`3530`	`let int b = 0;`
`3531`	`3531`	`let uint outgoing_arg_index = 0u;`
`3532`	`3532`	`let vec[TypeRef] llout_arg_tys =`