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

Fix Travis tests

r? @vadimcn

1 files changed, 3 insertions, 4 deletions

diff --git a/src/libpanic_unwind/dwarf/eh.rs b/src/libpanic_unwind/dwarf/eh.rs
index 32fdf5c2048..1e9e9e30f5c 100644
--- 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: