llvm: Tolerate dead_on_return attribute changes #151469

maurer · 2026-01-21T20:32:52Z

The attribute now has a size parameter and sorts differently. Adjust tests to tolerate this.

r? durin42

@rustbot label llvm-main

nikic

You also need to change the attribute construction code. dead_on_return(0) is not the correct result, it should be just dead_on_return at a different position.

View changes since this review

rustbot · 2026-01-21T20:42:41Z

Reminder, once the PR becomes ready for a review, use @rustbot ready.

maurer · 2026-01-21T21:56:38Z

@nikic - I don't see a special Attribute::getWithFoo family function for the attribute, and the default Attribute::get all pass a parameter (with the default one we're using right now passing 0, thus the issue).

Reading the CL, it appears that it is only possible to construct the unparameterized attribute through the AttrBuilder interface, which Rust currently doesn't use until the end (when actually applying attributes). Is there actually a way to directly construct an Atribute with dead_on_return (and no parameter)?

If there isn't currently a way, would adding an additional getWith static method to LLVM that explicitly doesn't add any optional parameters be the right way to address this?

nikic · 2026-01-21T22:12:03Z

It's possible to construct it as a normal integer attribute with std::numeric_limits<uint64_t>::max() value. But this is somewhat relying on internal implementation details. Adding an additional getWith method would be the clean way to do it.

The attribute now has a size parameter and sorts differently: * Explicitly omit size parameter during construction on 23+ * Tolerate alternate sorting in tests llvm/llvm-project#171712

maurer · 2026-01-22T02:10:46Z

@rustbot ready

I added the getWith method LLVM side, and we now have a green CI build with this change, and are no longer setting size=0, and instead leaving the size unset.

nikic · 2026-01-22T08:28:05Z

@bors r+ rollup

rust-bors · 2026-01-22T08:28:07Z

📌 Commit b639b0a has been approved by nikic

It is now in the queue for this repository.

@rustbot

llvm: Tolerate dead_on_return attribute changes The attribute now has a size parameter and sorts differently. Adjust tests to tolerate this. llvm/llvm-project#171712 r? durin42 @rustbot label llvm-main

@rustbot

llvm: Tolerate dead_on_return attribute changes The attribute now has a size parameter and sorts differently. Adjust tests to tolerate this. llvm/llvm-project#171712 r? durin42 @rustbot label llvm-main

@ghost

…uwer Rollup of 8 pull requests Successful merges: - #148206 (Deduplicated float tests and unified in floats/mod.rs) - #151042 (fix fallback impl for select_unpredictable intrinsic) - #151220 (option: Use Option::map in Option::cloned) - #151260 (Handle unevaluated ConstKind in in_operand) - #151441 (Fix ICE: Don't try to evaluate type_consts when eagerly collecting items) - #151465 (codegen: clarify some variable names around function calls) - #151469 (llvm: Tolerate dead_on_return attribute changes) - #151476 (Avoid `-> ()` in derived functions.) r? @ghost

@ghost

…uwer Rollup of 8 pull requests Successful merges: - #148206 (Deduplicated float tests and unified in floats/mod.rs) - #151042 (fix fallback impl for select_unpredictable intrinsic) - #151220 (option: Use Option::map in Option::cloned) - #151260 (Handle unevaluated ConstKind in in_operand) - #151441 (Fix ICE: Don't try to evaluate type_consts when eagerly collecting items) - #151465 (codegen: clarify some variable names around function calls) - #151469 (llvm: Tolerate dead_on_return attribute changes) - #151476 (Avoid `-> ()` in derived functions.) r? @ghost

@ghost

…uwer Rollup of 8 pull requests Successful merges: - #148206 (Deduplicated float tests and unified in floats/mod.rs) - #151042 (fix fallback impl for select_unpredictable intrinsic) - #151220 (option: Use Option::map in Option::cloned) - #151260 (Handle unevaluated ConstKind in in_operand) - #151441 (Fix ICE: Don't try to evaluate type_consts when eagerly collecting items) - #151465 (codegen: clarify some variable names around function calls) - #151469 (llvm: Tolerate dead_on_return attribute changes) - #151476 (Avoid `-> ()` in derived functions.) r? @ghost

@ghost

…uwer Rollup of 11 pull requests Successful merges: - #151001 (rustdoc: render doc(hidden) as a code attribute) - #151042 (fix fallback impl for select_unpredictable intrinsic) - #151220 (option: Use Option::map in Option::cloned) - #151260 (Handle unevaluated ConstKind in in_operand) - #151296 (MGCA: Fix incorrect pretty printing of valtree arrays) - #151423 (Move assert_matches to planned stable path) - #151441 (Fix ICE: Don't try to evaluate type_consts when eagerly collecting items) - #151465 (codegen: clarify some variable names around function calls) - #151468 (fix `f16` doctest FIXMEs) - #151469 (llvm: Tolerate dead_on_return attribute changes) - #151476 (Avoid `-> ()` in derived functions.) r? @ghost

@ghost

…uwer Rollup of 11 pull requests Successful merges: - #151001 (rustdoc: render doc(hidden) as a code attribute) - #151042 (fix fallback impl for select_unpredictable intrinsic) - #151220 (option: Use Option::map in Option::cloned) - #151260 (Handle unevaluated ConstKind in in_operand) - #151296 (MGCA: Fix incorrect pretty printing of valtree arrays) - #151423 (Move assert_matches to planned stable path) - #151441 (Fix ICE: Don't try to evaluate type_consts when eagerly collecting items) - #151465 (codegen: clarify some variable names around function calls) - #151468 (fix `f16` doctest FIXMEs) - #151469 (llvm: Tolerate dead_on_return attribute changes) - #151476 (Avoid `-> ()` in derived functions.) r? @ghost

@ghost

…uwer Rollup of 11 pull requests Successful merges: - #151001 (rustdoc: render doc(hidden) as a code attribute) - #151042 (fix fallback impl for select_unpredictable intrinsic) - #151220 (option: Use Option::map in Option::cloned) - #151260 (Handle unevaluated ConstKind in in_operand) - #151296 (MGCA: Fix incorrect pretty printing of valtree arrays) - #151423 (Move assert_matches to planned stable path) - #151441 (Fix ICE: Don't try to evaluate type_consts when eagerly collecting items) - #151465 (codegen: clarify some variable names around function calls) - #151468 (fix `f16` doctest FIXMEs) - #151469 (llvm: Tolerate dead_on_return attribute changes) - #151476 (Avoid `-> ()` in derived functions.) r? @ghost

@rustbot

Rollup merge of #151469 - maurer:dead-on-return, r=nikic llvm: Tolerate dead_on_return attribute changes The attribute now has a size parameter and sorts differently. Adjust tests to tolerate this. llvm/llvm-project#171712 r? durin42 @rustbot label llvm-main

@ghost

…uwer Rollup of 11 pull requests Successful merges: - rust-lang/rust#151001 (rustdoc: render doc(hidden) as a code attribute) - rust-lang/rust#151042 (fix fallback impl for select_unpredictable intrinsic) - rust-lang/rust#151220 (option: Use Option::map in Option::cloned) - rust-lang/rust#151260 (Handle unevaluated ConstKind in in_operand) - rust-lang/rust#151296 (MGCA: Fix incorrect pretty printing of valtree arrays) - rust-lang/rust#151423 (Move assert_matches to planned stable path) - rust-lang/rust#151441 (Fix ICE: Don't try to evaluate type_consts when eagerly collecting items) - rust-lang/rust#151465 (codegen: clarify some variable names around function calls) - rust-lang/rust#151468 (fix `f16` doctest FIXMEs) - rust-lang/rust#151469 (llvm: Tolerate dead_on_return attribute changes) - rust-lang/rust#151476 (Avoid `-> ()` in derived functions.) r? @ghost

rustbot assigned durin42 Jan 21, 2026

nikic requested changes Jan 21, 2026

View reviewed changes

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 21, 2026

maurer force-pushed the dead-on-return branch from 7b55d24 to 135c7ad Compare January 21, 2026 23:24

rustbot added the A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. label Jan 21, 2026

maurer mentioned this pull request Jan 21, 2026

[IR] Support constructing dead_on_return without an argument llvm/llvm-project#177272

Merged

This comment has been minimized.

Sign in to view

llvm: Tolerate dead_on_return attribute changes

b639b0a

The attribute now has a size parameter and sorts differently: * Explicitly omit size parameter during construction on 23+ * Tolerate alternate sorting in tests llvm/llvm-project#171712

maurer force-pushed the dead-on-return branch from 135c7ad to b639b0a Compare January 21, 2026 23:39

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 22, 2026

maurer requested a review from nikic January 22, 2026 02:11

rust-bors bot 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 Jan 22, 2026

JonathanBrouwer mentioned this pull request Jan 22, 2026

Rollup of 5 pull requests #151484

Closed

JonathanBrouwer mentioned this pull request Jan 22, 2026

Rollup of 8 pull requests #151485

Closed

JonathanBrouwer mentioned this pull request Jan 22, 2026

Rollup of 11 pull requests #151490

Merged

rust-bors bot merged commit 797601b into rust-lang:main Jan 22, 2026
11 checks passed

rustbot added this to the 1.95.0 milestone Jan 22, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

llvm: Tolerate dead_on_return attribute changes #151469

llvm: Tolerate dead_on_return attribute changes #151469

maurer commented Jan 21, 2026

Uh oh!

nikic left a comment •

edited by rustbot

Loading

Uh oh!

rustbot commented Jan 21, 2026

Uh oh!

maurer commented Jan 21, 2026

Uh oh!

nikic commented Jan 21, 2026

Uh oh!

This comment has been minimized.

maurer commented Jan 22, 2026

Uh oh!

nikic commented Jan 22, 2026

Uh oh!

rust-bors bot commented Jan 22, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Uh oh!

llvm: Tolerate dead_on_return attribute changes #151469

llvm: Tolerate dead_on_return attribute changes #151469

Conversation

maurer commented Jan 21, 2026

Uh oh!

nikic left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rustbot commented Jan 21, 2026

Uh oh!

maurer commented Jan 21, 2026

Uh oh!

nikic commented Jan 21, 2026

Uh oh!

This comment has been minimized.

maurer commented Jan 22, 2026

Uh oh!

nikic commented Jan 22, 2026

Uh oh!

rust-bors bot commented Jan 22, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

nikic left a comment •

edited by rustbot

Loading