Remove assumption from recovery code

[estebank]

Fix #60115.

[rust-highfive]

r? @eddyb

(rust_highfive has picked a reviewer for you, use r? to override)

[estebank]

r? @davidtwco

[davidtwco]

@bors r+ rollup

[bors]

📌 Commit 30b779f has been approved by davidtwco

[bors]

⌛ Testing commit 30b779f with merge 21b777238f65434b66ae973835aa6a433e133340...

[bors]

💔 Test failed - checks-travis

[rust-highfive]

The job arm-android of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

[01:52:17] test string::test_str_truncate ... ok
[01:52:17] test string::test_str_truncate_invalid_len ... ok
[01:52:17] test string::test_str_add ... ok
[01:52:17] test string::test_str_truncate_split_codepoint ... ok
[01:52:17] died due to signal 11
[01:52:17] 
[01:52:17] 
[01:52:17] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "--target" "arm-linux-androideabi" "-j" "4" "--release" "--locked" "--color" "always" "--features" "panic-unwind backtrace" "--manifest-path" "/checkout/src/libstd/Cargo.toml" "-p" "alloc" "--"
[01:52:17] expected success, got: exit code: 3
---
travis_time:end:022d104d:start=1555831140299442079,finish=1555831140316834116,duration=17392037
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:27bc3d3e
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:0c6223ec
travis_time:start:0c6223ec
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:0779de66
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

[davidtwco]

@bors retry #55861

[bors]

⌛ Testing commit 30b779f with merge 06a271a...

[bors]

☀️ Test successful - checks-travis, status-appveyor
Approved by: davidtwco
Pushing 06a271a to master...