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

Fix Travis tests

r? @vadimcn
This commit is contained in:
bors 2016-07-26 17:07:08 -07:00 committed by GitHub
commit b541f5f0cc

View File

@ -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: