Skip to content

Conversation

@Zalathar
Copy link
Contributor

@Zalathar Zalathar commented Oct 26, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Enselic and others added 8 commits October 17, 2025 18:57
…n.rs`

In 9253e12 a bunch of `gdbr-check` (for `rust-gdb`) and
`gdbg-check` (for plain `gdb`) was added. But in two places the author
accidentally wrote `gdbt-check` instead. This commit fixes this typo.
Don't require `T: RefUnwindSafe` for `vec::IntoIter<T>: UnwindSafe`

Closes rust-lang#144707

r? t-libs-api
tests: activate misspelled `gdb-check` in `function-arg-initialization.rs`

In 9253e12 a bunch of `gdbr-check` (for `rust-gdb`) directives and `gdbg-check` (for plain `gdb`) directives were added. But in two places the author accidentally wrote `gdbt-check` instead (`t` is next to `r` on the keyboard). This commit fixes that typo.

rust-lang#129218 later renamed `gdbr-check` to just `gdb-check` which is why we rename to `gdb-check` directly.

The test still passes locally for me after the change, but fails if I change the `gdb-check` checks to check for some other string, so the check seems to still perform its intended function.

Note that we need to add a `std::hint::black_box()` to avoid

    $4 = <optimized out>

prints on at least `aarch64-gnu-llvm-20-1`.

After this there are no more instances of the string `gdbt` in the code base:
```console
$ git grep gdbt
```
…lathar

tests/debuginfo/closures.rs: Activate misspelled `cdb-check`

Split out from rust-lang#147799 because these seemingly simple corrections can turn out to be non-trivial. See rust-lang#147728 for example.
…ug-msg, r=Noratrieb,dianqk

Improve the ICE message for invalid nullary intrinsic calls

In rust-lang#148104, we found the panic message here rather confusing, and (if I'm reading the tea leaves right) that's because the intended audience for either side of the phrase is very different. I think this is more clear if/when this is encountered by users.

I expect this ICE to be hit in practice by people calling the `size_of` and `align_of` intrinsics, so it's now _kind of_ helpful for those users too.

The original effort to stop backends from needing to support nullary intrinsics added a note to all these const-only intrinsics, but when rust-lang#147793 ported two more the paragraph wasn't added. I've added it.
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Oct 26, 2025
@Zalathar
Copy link
Contributor Author

Rollup of everything.

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Oct 26, 2025

📌 Commit 278e079 has been approved by Zalathar

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 26, 2025
bors added a commit that referenced this pull request Oct 26, 2025
Rollup of 4 pull requests

Successful merges:

 - #145665 (Don't require `T: RefUnwindSafe` for `vec::IntoIter<T>: UnwindSafe`)
 - #147728 (tests: activate misspelled `gdb-check` in `function-arg-initialization.rs`)
 - #148097 (tests/debuginfo/closures.rs: Activate misspelled `cdb-check`)
 - #148118 (Improve the ICE message for invalid nullary intrinsic calls)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Collaborator

bors commented Oct 26, 2025

⌛ Testing commit 278e079 with merge 5f3f2be...

@rust-log-analyzer
Copy link
Collaborator

The job dist-i586-gnu-i586-i686-musl failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)

---- [debuginfo-gdb] tests/debuginfo/function-arg-initialization.rs stdout ----
NOTE: compiletest thinks it is using GDB version 12001000

error: check directive(s) from `/checkout/tests/debuginfo/function-arg-initialization.rs` not found in debugger output. errors:
    (function-arg-initialization.rs:29) `$4 = function_arg_initialization::BigStruct {a: 3, b: 4, c: 5, d: 6, e: 7, f: 8, g: 9, h: 10}`
    (function-arg-initialization.rs:31) `$5 = function_arg_initialization::BigStruct {a: 11, b: 12, c: 13, d: 14, e: 15, f: 16, g: 17, h: 18}`
the following subset of check directive(s) was found successfully:
    (function-arg-initialization.rs:20) `$1 = 1`
    (function-arg-initialization.rs:22) `$2 = true`
    (function-arg-initialization.rs:24) `$3 = 2.5`
    (function-arg-initialization.rs:36) `$6 = 19`
    (function-arg-initialization.rs:38) `$7 = 20`
    (function-arg-initialization.rs:40) `$8 = 21.5`
    (function-arg-initialization.rs:45) `$9 = 22`
    (function-arg-initialization.rs:47) `$10 = 23`
    (function-arg-initialization.rs:49) `$11 = 24.5`
    (function-arg-initialization.rs:54) `$12 = 25`
    (function-arg-initialization.rs:56) `$13 = 26`
    (function-arg-initialization.rs:58) `$14 = 27.5`
    (function-arg-initialization.rs:63) `$15 = 28`
    (function-arg-initialization.rs:65) `$16 = 29`
    (function-arg-initialization.rs:67) `$17 = 30.5`
    (function-arg-initialization.rs:72) `$18 = 31`
    (function-arg-initialization.rs:74) `$19 = 32`
    (function-arg-initialization.rs:76) `$20 = 33.5`
    (function-arg-initialization.rs:81) `$21 = 34`
    (function-arg-initialization.rs:83) `$22 = 35`
    (function-arg-initialization.rs:85) `$23 = 36.5`
    (function-arg-initialization.rs:90) `$24 = 37`
    (function-arg-initialization.rs:92) `$25 = 38`
    (function-arg-initialization.rs:94) `$26 = 39.5`
    (function-arg-initialization.rs:99) `$27 = 40`
    (function-arg-initialization.rs:101) `$28 = 41`
    (function-arg-initialization.rs:103) `$29 = 42`
    (function-arg-initialization.rs:108) `$30 = 43`
    (function-arg-initialization.rs:110) `$31 = 44`
    (function-arg-initialization.rs:112) `$32 = 45`
status: exit status: 0
command: PYTHONPATH="/checkout/src/etc" "/usr/bin/gdb" "-quiet" "-batch" "-nx" "-command=/checkout/obj/build/x86_64-unknown-linux-gnu/test/debuginfo/function-arg-initialization.gdb/function-arg-initialization.debugger.script"
--- stdout -------------------------------
GNU gdb (Ubuntu 12.1-0ubuntu1~22.04.2) 12.1
Copyright (C) 2022 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
Type "show copying" and "show warranty" for details.
This GDB was configured as "x86_64-linux-gnu".
Type "show configuration" for configuration details.
For bug reporting instructions, please see:
<https://www.gnu.org/software/gdb/bugs/>.
Find the GDB manual and other documentation resources online at:
    <http://www.gnu.org/software/gdb/documentation/>.

For help, type "help".
Type "apropos word" to search for commands related to "word".
To enable execution of this file add
 add-auto-load-safe-path /checkout/src/etc/gdb_load_rust_pretty_printers.py
line to your configuration file "/home/user/.config/gdb/gdbinit".
To completely disable this security protection add
 set auto-load safe-path /
line to your configuration file "/home/user/.config/gdb/gdbinit".
For more information about this security protection see the
"Auto-loading safe path" section in the GDB manual.  E.g., run from the shell:
 info "(gdb)Auto-loading safe path"
Breakpoint 1 at 0x13c4: file /checkout/tests/debuginfo/function-arg-initialization.rs, line 221.
Breakpoint 2 at 0x1444: file /checkout/tests/debuginfo/function-arg-initialization.rs, line 236.
Breakpoint 3 at 0x17ea: file /checkout/tests/debuginfo/function-arg-initialization.rs, line 244.
Breakpoint 4 at 0x120a: file /checkout/tests/debuginfo/function-arg-initialization.rs, line 249.
Breakpoint 5 at 0x1396: file /checkout/tests/debuginfo/function-arg-initialization.rs, line 254.
Breakpoint 6 at 0x1256: file /checkout/tests/debuginfo/function-arg-initialization.rs, line 259.
Breakpoint 7 at 0x1366: file /checkout/tests/debuginfo/function-arg-initialization.rs, line 263.
Breakpoint 8 at 0x13fc: file /checkout/tests/debuginfo/function-arg-initialization.rs, line 266.
Breakpoint 9 at 0x185c: file /checkout/tests/debuginfo/function-arg-initialization.rs, line 270.
Breakpoint 10 at 0x12a6: file /checkout/tests/debuginfo/function-arg-initialization.rs, line 278.
Breakpoint 11 at 0x1916: file /checkout/tests/debuginfo/function-arg-initialization.rs, line 286.
[Thread debugging using libthread_db enabled]
Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1".

Breakpoint 1, function_arg_initialization::immediate_args (a=1, b=true, c=2.5) at /checkout/tests/debuginfo/function-arg-initialization.rs:221
221     zzz(); // #break
$1 = 1
$2 = true
$3 = 2.5

Breakpoint 2, function_arg_initialization::non_immediate_args (a=..., b=...) at /checkout/tests/debuginfo/function-arg-initialization.rs:236
236     zzz(); // #break
$4 = <optimized out>
$5 = <optimized out>

Breakpoint 3, function_arg_initialization::binding (a=19, b=20, c=21.5) at /checkout/tests/debuginfo/function-arg-initialization.rs:244
244     let x = 0; // #break
$6 = 19
$7 = 20
$8 = 21.5


Breakpoint 4, function_arg_initialization::assignment (a=22, b=23, c=24.5) at /checkout/tests/debuginfo/function-arg-initialization.rs:249
249     a = b; // #break
$9 = 22
$10 = 23
$11 = 24.5


Breakpoint 5, function_arg_initialization::function_call (x=25, y=26, z=27.5) at /checkout/tests/debuginfo/function-arg-initialization.rs:254
254     zzz(); // #break
$12 = 25
$13 = 26
$14 = 27.5

Breakpoint 6, function_arg_initialization::identifier (x=28, y=29, z=30.5) at /checkout/tests/debuginfo/function-arg-initialization.rs:259
259 }
$15 = 28
$16 = 29
$17 = 30.5

Breakpoint 7, function_arg_initialization::return_expr (x=31, y=32, z=33.5) at /checkout/tests/debuginfo/function-arg-initialization.rs:263
263 }
$18 = 31
$19 = 32
$20 = 33.5

Breakpoint 8, function_arg_initialization::arithmetic_expr (x=34, y=35, z=36.5) at /checkout/tests/debuginfo/function-arg-initialization.rs:266
266     x + y // #break
$21 = 34
$22 = 35
$23 = 36.5

Breakpoint 9, function_arg_initialization::if_expr (x=37, y=38, z=39.5) at /checkout/tests/debuginfo/function-arg-initialization.rs:270
270     if x + y < 1000 { // #break
$24 = 37
$25 = 38
$26 = 39.5

Breakpoint 10, function_arg_initialization::while_expr (x=40, y=41, z=42) at /checkout/tests/debuginfo/function-arg-initialization.rs:278
278     while x + y > 1000 { // #break
$27 = 40
$28 = 41
$29 = 42

Breakpoint 11, function_arg_initialization::loop_expr (x=43, y=44, z=45) at /checkout/tests/debuginfo/function-arg-initialization.rs:286
286         x += z; // #break
$30 = 43
$31 = 44
$32 = 45

Breakpoint 11, function_arg_initialization::loop_expr (x=88, y=44, z=45) at /checkout/tests/debuginfo/function-arg-initialization.rs:286
286         x += z; // #break
A debugging session is active.

 Inferior 1 [process 476133] will be killed.

Quit anyway? (y or n) [answered Y; input not from terminal]
------------------------------------------
--- stderr -------------------------------
warning: File "/checkout/src/etc/gdb_load_rust_pretty_printers.py" auto-loading has been declined by your `auto-load safe-path' set to "$debugdir:$datadir/auto-load".
------------------------------------------

---- [debuginfo-gdb] tests/debuginfo/function-arg-initialization.rs stdout end ----

failures:

@bors
Copy link
Collaborator

bors commented Oct 26, 2025

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 26, 2025
@Zalathar Zalathar closed this Oct 26, 2025
@rustbot rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 26, 2025
@Zalathar Zalathar deleted the rollup-zlxn01b branch October 26, 2025 06:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollup A PR which is a rollup T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants