Auto merge of #35014 - vadimcn:travis-test, r=alexcrichton

bors · web-flow · commit b541f5f0cc34 · 2016-07-26T17:07:08.000-07:00
Fix Travis tests r? @vadimcn
diff --git a/src/libpanic_unwind/dwarf/eh.rs b/src/libpanic_unwind/dwarf/eh.rs
@@ -108,10 +108,9 @@ pub unsafe fn find_eh_action(lsda: *const u8, context: &EHContext) -> EHAction {
                 }
             }
         }
-        // If ip is not present in the table, call terminate.  This is for
-        // a destructor inside a cleanup, or a library routine the compiler
-        // was not expecting to throw
-        EHAction::Terminate
+        // Ip is not present in the table.  This should not hapen... but it does: issie #35011.
+        // So rather than returning EHAction::Terminate, we do this.
+        EHAction::None
     } else {
         // SjLj version:
         // The "IP" is an index into the call-site table, with two exceptions:

Original file line number	Diff line number	Diff line change
`@@ -108,10 +108,9 @@ pub unsafe fn find_eh_action(lsda: *const u8, context: &EHContext) -> EHAction {`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`	`}`
`111`		`- // If ip is not present in the table, call terminate. This is for`
`112`		`- // a destructor inside a cleanup, or a library routine the compiler`
`113`		`- // was not expecting to throw`
`114`		`- EHAction::Terminate`
	`111`	`+ // Ip is not present in the table. This should not hapen... but it does: issie #35011.`
	`112`	`+ // So rather than returning EHAction::Terminate, we do this.`
	`113`	`+ EHAction::None`
`115`	`114`	`} else {`
`116`	`115`	`// SjLj version:`
`117`	`116`	`// The "IP" is an index into the call-site table, with two exceptions:`