aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPatrick Walton <[email protected]>2011-03-10 14:31:15 -0800
committerPatrick Walton <[email protected]>2011-03-10 14:38:06 -0800
commit41d5094a8e0f58221b470a2676a9a1dae287102d (patch)
tree7a892255e206b778e752eafa9bd819a067eb47b2 /src
parentUpdate the current id when we create sub parsers. (diff)
downloadrust-41d5094a8e0f58221b470a2676a9a1dae287102d.tar.xz
rust-41d5094a8e0f58221b470a2676a9a1dae287102d.zip
rustc: Fix off-by-one error and logic error regarding type parameters in the translation of bind expressions. Un-XFAIL bind-obj-ctor.rs.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile1
-rw-r--r--src/comp/middle/trans.rs2
2 files changed, 1 insertions, 2 deletions
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 =