---

yaml
---
r: 15648
b: refs/heads/try
c: fa6c68a
h: refs/heads/master
v: v3

Author: graydon

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: a2f04efd593a6da5b9368ec85e02ed46631cb594
+refs/heads/try: fa6c68a025337072fd61fe3d5f71e7f079ce0652
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rustc/back/upcall.rs

@@ -38,7 +38,11 @@ fn declare_upcalls(targ_cfg: @session::config,
         let mut arg_tys: [TypeRef] = [];
         for tys.each {|t| arg_tys += [t]; }
         let fn_ty = T_fn(arg_tys, rv);
-        ret base::decl_cdecl_fn(llmod, prefix + name, fn_ty);
+        let f = base::decl_cdecl_fn(llmod, prefix + name, fn_ty);
+        if name != "fail" {
+            base::set_no_unwind(f);
+        }
+        ret f;
     }
     let d = bind decl(llmod, "upcall_", _, _, _);
     let dv = bind decl(llmod, "upcall_", _, _, T_void());

branches/try/src/rustc/middle/trans/base.rs

@@ -393,6 +393,11 @@ fn set_no_inline(f: ValueRef) {
                               0u as c_uint);
 }
 
+fn set_no_unwind(f: ValueRef) {
+    llvm::LLVMAddFunctionAttr(f, lib::llvm::NoUnwindAttribute as c_uint,
+                              0u as c_uint);
+}
+
 // Tell LLVM to emit the information necessary to unwind the stack for the
 // function f.
 fn set_uwtable(f: ValueRef) {