From 41d5094a8e0f58221b470a2676a9a1dae287102d Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Thu, 10 Mar 2011 14:31:15 -0800 Subject: rustc: Fix off-by-one error and logic error regarding type parameters in the translation of bind expressions. Un-XFAIL bind-obj-ctor.rs. --- src/Makefile | 1 - src/comp/middle/trans.rs | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'src') diff --git a/src/Makefile b/src/Makefile index 929be490..f96ad040 100644 --- a/src/Makefile +++ b/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/src/comp/middle/trans.rs b/src/comp/middle/trans.rs index f69834d3..51e8fb56 100644 --- a/src/comp/middle/trans.rs +++ b/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 = -- cgit v1.2.3