Rollup merge of #26414 - alexcrichton:msvc-fix-build, r=brson

Currently all these do is cause linker errors as they try to lower to GNU-like
exception handling, none of which exists with MSVC.
This commit is contained in:
Manish Goregaokar 2015-06-19 17:41:09 +05:30
commit 812a3f044f

View File

@ -756,7 +756,12 @@ pub fn invoke<'blk, 'tcx>(bcx: Block<'blk, 'tcx>,
}
pub fn need_invoke(bcx: Block) -> bool {
if bcx.sess().no_landing_pads() {
// FIXME(#25869) currently unwinding is not implemented for MSVC and our
// normal unwinding infrastructure ends up just causing linker
// errors with the current LLVM implementation, so landing
// pads are disabled entirely for MSVC targets
if bcx.sess().no_landing_pads() ||
bcx.sess().target.target.options.is_like_msvc {
return false;
}