---

brson · brson · commit cafd50ab403a · 2011-12-11T14:35:18.000-08:00
yaml --- r: 6651 b: refs/heads/master c: b73caec h: refs/heads/master i: 6649: ecd52b9 6647: faaf15b v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5cd08586f6007325b50b697ce2ae175810637b0f
+refs/heads/master: b73caec3ced9e6588856f77f6a03319d3515f5ac
diff --git a/trunk/src/rt/rust_upcall.cpp b/trunk/src/rt/rust_upcall.cpp
@@ -63,10 +63,8 @@ extern "C" CDECL void
 upcall_fail(char const *expr,
             char const *file,
             size_t line) {
-    // FIXME: Need to fix the stack switching function to unwind properly
-    // in order to switch stacks here
     s_fail_args args = {expr,file,line};
-    upcall_s_fail(&args);
+    SWITCH_STACK(&args, upcall_s_fail);
 }
 
 struct s_malloc_args {

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: 5cd08586f6007325b50b697ce2ae175810637b0f`
	`2`	`+refs/heads/master: b73caec3ced9e6588856f77f6a03319d3515f5ac`