---

bblum · bblum · commit 9eb0501cf2d6 · 2012-08-16T21:07:55.000-04:00
yaml --- r: 29892 b: refs/heads/incoming c: a076c28 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: f188d92dfe824ce45d7128940b8ac60741975cfb
+refs/heads/incoming: a076c287de55bd69328fbf542bf769ca20a12ab4
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/incoming/src/rt/rust_builtin.cpp b/branches/incoming/src/rt/rust_builtin.cpp
@@ -797,6 +797,8 @@ rust_dbg_call(dbg_callback cb, void *data) {
     return cb(data);
 }
 
+extern "C" CDECL void rust_dbg_do_nothing() { }
+
 extern "C" CDECL void
 rust_dbg_breakpoint() {
     BREAKPOINT_AWESOME;
diff --git a/branches/incoming/src/rt/rustrt.def.in b/branches/incoming/src/rt/rustrt.def.in
@@ -170,6 +170,7 @@ rust_dbg_lock_unlock
 rust_dbg_lock_wait
 rust_dbg_lock_signal
 rust_dbg_call
+rust_dbg_do_nothing
 rust_dbg_breakpoint
 rust_osmain_sched_id
 rust_compare_and_swap_ptr
diff --git a/branches/incoming/src/test/run-pass/issue-506.rs b/branches/incoming/src/test/run-pass/issue-506.rs
@@ -1,4 +1,3 @@
-// xfail-test
 /*
   A reduced test case for Issue #506, provided by Rob Arnold.
 
@@ -10,10 +9,9 @@ import task;
 
 #[abi = "cdecl"]
 extern mod rustrt {
-    fn get_task_id() -> libc::intptr_t;
+    fn rust_dbg_do_nothing();
 }
 
 fn main() {
-    let f: fn() -> libc::intptr_t = rustrt::get_task_id;
-    task::spawn(unsafe { unsafe::reinterpret_cast(f) });
+    task::spawn(rustrt::rust_dbg_do_nothing);
 }

Original file line number	Diff line number	Diff line change
`@@ -797,6 +797,8 @@ rust_dbg_call(dbg_callback cb, void *data) {`
`797`	`797`	`return cb(data);`
`798`	`798`	`}`
`799`	`799`
	`800`	`+extern "C" CDECL void rust_dbg_do_nothing() { }`
	`801`	`+`
`800`	`802`	`extern "C" CDECL void`
`801`	`803`	`rust_dbg_breakpoint() {`
`802`	`804`	`BREAKPOINT_AWESOME;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-// xfail-test`
`2`	`1`	`/*`
`3`	`2`	`A reduced test case for Issue #506, provided by Rob Arnold.`
`4`	`3`
`@@ -10,10 +9,9 @@ import task;`
`10`	`9`
`11`	`10`	`#[abi = "cdecl"]`
`12`	`11`	`extern mod rustrt {`
`13`		`- fn get_task_id() -> libc::intptr_t;`
	`12`	`+ fn rust_dbg_do_nothing();`
`14`	`13`	`}`
`15`	`14`
`16`	`15`	`fn main() {`
`17`		`- let f: fn() -> libc::intptr_t = rustrt::get_task_id;`
`18`		`- task::spawn(unsafe { unsafe::reinterpret_cast(f) });`
	`16`	`+ task::spawn(rustrt::rust_dbg_do_nothing);`
`19`	`17`	`}`