Rollup of 16 pull requests #144067
Closed
Rollup of 16 pull requests #144067
+3,080
−3,657
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
external-repos.md: small fixes
Partially reverts commit 40311c4.
See RUST-141600: this test is broken in two ways: 1. This test triggers `-Wincompatible-pointer-types` on GCC 14. 2. This test requires ARMv8.5+ w/ MTE extensions enabled, but GHA CI runner hardware do not have this enabled.
./x is recommended over running ./x.py directly, and is the more commonly-used invocation of bootstrap in the guide
use a consistent (and recommended) invocation
- --depth=1 is more useful for once-off uses, like on ci - .git postfix on github repo url is not needed
That is, calling it an example is misleading
Nowhere else is this called "Dist check"
add missing word
do not invent a name
distcheck has only one possible invocation
…buginfo, r=wesleywiser tests: Test line number in debuginfo for diverging function calls Closes rust-lang#59558 which just [E-needs-test](rust-lang#59558 (comment)). The bug seems to have been fixed in **nightly-2021-05-10**: ```sh for toolchain in nightly-2021-05-09 \ nightly-2021-05-10 \ 1.88; do echo -e "\nWith $toolchain:" rustc +$toolchain tests/codegen/diverging-function-call-debuginfo.rs --emit llvm-ir -o /tmp/out.ll -g -Clto -Copt-level=0 build/x86_64-unknown-linux-gnu/ci-llvm/bin/FileCheck --input-file /tmp/out.ll tests/codegen/diverging-function-call-debuginfo.rs --check-prefix=CHECK --dump-input-context 10 2>/dev/null && echo OK || echo FAIL done ``` ``` With nightly-2021-05-09: FAIL With nightly-2021-05-10: OK With 1.88: OK ``` which gives the following list of candidate commits. Not clear which one it is exactly but it doesn't matter much since we can confirm that the test works. I have confirmed locally that with **nightly-2021-05-09** we get `line: 0` for the last call. <details> <summary>click to expand</summary> ``` $ git log ^881c1ac408d93bb7adaa3a51dabab9266e82eee8 ca82264 --no-merges --oneline ``` f25aa57 Remove unused `opt_span_warn` function ebbc949 Note why `Handler::fatal` is different from `Sesssion::fatal` 96509b4 Make `Diagnostic::span_fatal` unconditionally raise an error e49f447 Remove some unnecessary uses of `struct_span_fatal` 955fdae Rename `Parser::span_fatal_err` -> `Parser::span_err` 4b7c8b0 Add `#[track_caller]` to `FakeDefId::expect_real()` ba13225 Remove `FakeDefId::expect_local()` 020d83d Enable `-W semicolon_in_expressions_from_macros` in bootstrap 1b928ff Update LLVM submodule c2b15a6 Support -C passes in NewPM 5519cbf Don't force -O1 with ThinLTO 7c4989a Drop -opt-bisect-limit=0 flag from test db140de Explicitly register GCOV profiling pass as well 5ecbe7f Explicitly register instrprof pass 0318883 Make -Z new-llvm-pass-manager an Option<bool> 0367e24 Avoid predecessors having Drop impls </details>
rustc-dev-guide subtree update r? ghost
Copy GCC sources into the build directory even outside CI It takes ~3.5s on my Linux notebook to perform the copy, but it should only be executed when we actually go build GCC, and that will almost certainly take much longer :) So I think it should be fine. At least we won't be polluting the source directory for local builds. Fixes: rust-lang#143986 r? `@nikic`
rustbot
added
A-attributes
|
@bors r+ rollup=never p=5 |
bors
added
S-waiting-on-bors
|
The job Click to see the possible cause of the failure (guessed by this bot) |
5 tasks
|
@bors r- |
bors
added
S-waiting-on-author
rustbot
removed
the
S-waiting-on-author
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Successful merges:
tests/run-make/mte-ffibecause no CI runners have MTE extensions enabled #142300 (Disabletests/run-make/mte-ffibecause no CI runners have MTE extensions enabled)run-failui tests to have an exit code (SIGABRTnot ok) #143002 (tests: Requirerun-failui tests to have an exit code (SIGABRTnot ok))-Zsanitizer=kcfion#[naked]functions #143293 (fix-Zsanitizer=kcfion#[naked]functions)-oand arg #143719 (Emit warning when there is no space between-oand arg)const trait Trait#143879 (parseconst trait Trait)#[coverage]to the new attribute system #143891 (Port#[coverage]to the new attribute system)Optionmethods #143967 (constifyOptionmethods)optimize = false#144010 (Boostrap: add warning onoptimize = false)Failed merges:
r? @ghost
@rustbot modify labels: rollup
Create a similar rollup