New upstream version 1.23.0+dfsg1

[rustc.git] / src / librustc_trans / declare.rs

diff --git a/src/librustc_trans/declare.rs b/src/librustc_trans/declare.rs
index 3c8ff45499780e5481ad8d4381da880340add6dc..f894bdf16e4de28c4c3233f622444aafda2882d2 100644 (file)
--- a/src/librustc_trans/declare.rs
+++ b/src/librustc_trans/declare.rs
@@ -24,6 +24,7 @@ use llvm::{self, ValueRef};
 use llvm::AttributePlace::Function;
 use rustc::ty::Ty;
 use rustc::session::config::Sanitizer;
+use rustc_back::PanicStrategy;
 use abi::{Abi, FnType};
 use attributes;
 use context::CrateContext;
@@ -98,6 +99,10 @@ fn declare_raw_fn(ccx: &CrateContext, name: &str, callconv: llvm::CallConv, ty:
         _ => {},
     }
 
+    if ccx.tcx().sess.panic_strategy() != PanicStrategy::Unwind {
+        attributes::unwind(llfn, false);
+    }
+
     llfn
 }