fix loops in unwind code in MSVC

arielb1 · arielb1 · commit 6548aefdeb42 · 2017-05-28T10:43:25.000+03:00
I'm not sure how well this works, but it's worth a try.
diff --git a/src/librustc_trans/mir/analyze.rs b/src/librustc_trans/mir/analyze.rs
@@ -260,7 +260,9 @@ pub fn cleanup_kinds<'a, 'tcx>(mir: &mir::Mir<'tcx>) -> IndexVec<mir::BasicBlock
                         result[succ] = CleanupKind::Internal { funclet: funclet };
                     }
                     CleanupKind::Funclet => {
-                        set_successor(funclet, succ);
+                        if funclet != succ {
+                            set_successor(funclet, succ);
+                        }
                     }
                     CleanupKind::Internal { funclet: succ_funclet } => {
                         if funclet != succ_funclet {

Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,9 @@ pub fn cleanup_kinds<'a, 'tcx>(mir: &mir::Mir<'tcx>) -> IndexVec<mir::BasicBlock`
`260`	`260`	`result[succ] = CleanupKind::Internal { funclet: funclet };`
`261`	`261`	`}`
`262`	`262`	`CleanupKind::Funclet => {`
`263`		`- set_successor(funclet, succ);`
	`263`	`+ if funclet != succ {`
	`264`	`+ set_successor(funclet, succ);`
	`265`	`+ }`
`264`	`266`	`}`
`265`	`267`	`CleanupKind::Internal { funclet: succ_funclet } => {`
`266`	`268`	`if funclet != succ_funclet {`