Update the compiler_builtins crate

[alexcrichton]

This updates to 0.1.13 for compiler_builtins, published to fix a few
issues. The feature changes here are updated because compiler_builtins
no longer enables the c feature by default but we want to do so
through our build still.

Closes #60747
Closes #60782

[rust-highfive]

r? @aidanhs

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

[alexcrichton]

r? @RalfJung

[rust-highfive]

The job x86_64-gnu-llvm-6.0 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.

travis_time:end:2d34fd00:start=1557870375433599379,finish=1557870376303972626,duration=870373247
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
$ export AWS_ACCESS_KEY_ID=AKIA46X5W6CZEJZ6XT55
---
####################                                                      29.1%
######################################################################## 100.0%
[00:01:56] extracting /checkout/obj/build/cache/2019-04-11/cargo-beta-x86_64-unknown-linux-gnu.tar.gz
[00:01:56]     Updating crates.io index
[00:02:13] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:13] Build completed unsuccessfully in 0:00:32
[00:02:13] make: *** [prepare] Error 1
[00:02:13] Makefile:69: recipe for target 'prepare' failed
[00:02:14] Command failed. Attempt 2/5:
[00:02:14] Command failed. Attempt 2/5:
[00:02:14]     Updating crates.io index
[00:02:15] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:15] Build completed unsuccessfully in 0:00:00
[00:02:15] Makefile:69: recipe for target 'prepare' failed
[00:02:15] make: *** [prepare] Error 1
[00:02:17] Command failed. Attempt 3/5:
[00:02:17] Command failed. Attempt 3/5:
[00:02:17]     Updating crates.io index
[00:02:17] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:17] Build completed unsuccessfully in 0:00:00
[00:02:17] make: *** [prepare] Error 1
[00:02:17] Makefile:69: recipe for target 'prepare' failed
[00:02:20] Command failed. Attempt 4/5:
[00:02:20] Command failed. Attempt 4/5:
[00:02:21]     Updating crates.io index
[00:02:21] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:21] Build completed unsuccessfully in 0:00:00
[00:02:21] make: *** [prepare] Error 1
[00:02:21] Makefile:69: recipe for target 'prepare' failed
[00:02:25] Command failed. Attempt 5/5:
[00:02:25] Command failed. Attempt 5/5:
[00:02:25]     Updating crates.io index
[00:02:26] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:26] Build completed unsuccessfully in 0:00:00
[00:02:26] make: *** [prepare] Error 1
[00:02:26] Makefile:69: recipe for target 'prepare' failed
[00:02:26] The command has failed after 5 attempts.
---
travis_time:end:35a9f1c8:start=1557870535799193293,finish=1557870535804576672,duration=5383379
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0ea1335e
$ 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:16c0ae80
travis_time:start:16c0ae80
$ 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:062f90f8
$ 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)

[RalfJung]

@bors r+

[bors]

📌 Commit 0998c63bf2d9a8541242043d8f099b62ecf1b565 has been approved by RalfJung

[alexcrichton]

Updating again to pull in rust-lang/compiler-builtins#293

@bors: r=RalfJung

[bors]

📌 Commit 616a3ff7171e01729c11482396e44d491142e0fd has been approved by RalfJung

[alexcrichton]

Updated again to pull in rust-lang/compiler-builtins#294

@bors: r=RalfJung

[bors]

📌 Commit 9efaa294c55ade0df3ca963cdd358a3b6d4a5201 has been approved by RalfJung

[cuviper]

Note that bootstrap.py currently doesn't initialize src/llvm-project if you've configured an external LLVM. Are we going to always require that checkout now? Or should there be a way to use an external (possibly precompiled) compiler-rt too?

[alexcrichton]

Hm that's an excellent point @cuviper, thanks for bringing it up! In the interest of landing bug fixes sooner I'm gonna submit that as a separate change and go back to 0.1.14 which only fixes the bugs that are plaguing master right now.

[alexcrichton]

@bors: r=RalfJung

[bors]

📌 Commit 616a3ff7171e01729c11482396e44d491142e0fd has been approved by RalfJung

[Centril]

@bors p=1

[bors]

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

1. git checkout update-compiler-builtins (switch to your branch)
2. git fetch upstream master (retrieve the latest master)
3. git rebase upstream/master -p (rebase on top of it)
4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
5. git push self update-compiler-builtins --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging src/libstd/Cargo.toml
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

[alexcrichton]

@bors: r=RalfJung

[bors]

📌 Commit 3c9790e has been approved by RalfJung

[bors]

⌛ Testing commit 3c9790e with merge 823a75d...

[bors]

☀️ Test successful - checks-travis, status-appveyor
Approved by: RalfJung
Pushing 823a75d to master...