Skip to content

Commit

Permalink
Auto merge of #35014 - vadimcn:travis-test, r=alexcrichton
Browse files Browse the repository at this point in the history
Fix Travis tests

r? @vadimcn
  • Loading branch information
bors committed Jul 25, 2016
2 parents 9316ae5 + 5fbcf08 commit 9c396d8
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions src/libpanic_unwind/dwarf/eh.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 9c396d8

Please sign in to comment.