Improved support of collapse_debuginfo attribute for macros. #118903

azhogin · 2023-12-13T05:29:06Z

Added walk_chain_collapsed function to consider collapse_debuginfo attribute in parent macros in call chain.
Fixed collapse_debuginfo attribute processing for cranelift (there was if/else branches error swap).

cc #100758

rustbot · 2023-12-13T05:29:15Z

r? @WaffleLapkin

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

rustbot · 2023-12-13T05:29:17Z

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

compiler/rustc_middle/src/ty/mod.rs

WaffleLapkin · 2023-12-13T09:21:47Z

r? @bjorn3

compiler/rustc_span/src/hygiene.rs

petrochenkov · 2023-12-13T16:19:22Z

cc @davidtwco

tests/debuginfo/skip_second_statement_si_collapse.rs

tests/debuginfo/skip_second_statement.rs

compiler/rustc_middle/src/ty/mod.rs

tests/debuginfo/collapse-debuginfo-in-non-collapse-macro.rs

petrochenkov · 2023-12-15T15:49:20Z

@azhogin to split the work into two parts - one with tests and bugfixes, and another with enabling collapse_debuginfo for built-in and standard library macros.
@rustbot author

azhogin · 2023-12-21T11:18:54Z

@azhogin to split the work into two parts - one with tests and bugfixes, and another with enabling collapse_debuginfo for built-in and standard library macros. @rustbot author

This PR converted into first part - no default attribute for builtin/std macros.
Added the required test cases.
@rustbot review

tests/debuginfo/skip_second_statement_collapse.rs

tests/debuginfo/skip_second_statement_si_collapse.rs

compiler/rustc_middle/src/ty/mod.rs

compiler/rustc_span/src/hygiene.rs

compiler/rustc_middle/src/ty/mod.rs

compiler/rustc_span/src/hygiene.rs

petrochenkov · 2023-12-21T16:38:05Z

Mostly ready, some minor comments.
@rustbot author

davidtwco

To make sure I understand correctly, this just makes #[collapse_debuginfo] work when macro calls to annotated macros are themselves within a macro?

I'd appreciate some additional comments/documentation as per my review comments below, some of these tests are quite hard to understand otherwise.

compiler/rustc_span/src/hygiene.rs

tests/debuginfo/collapse-debuginfo-in-non-collapse-macro.rs

tests/debuginfo/skip_second_statement.rs

azhogin · 2024-01-05T11:52:43Z

To make sure I understand correctly, this just makes #[collapse_debuginfo] work when macro calls to annotated macros are themselves within a macro?

I'd appreciate some additional comments/documentation as per my review comments below, some of these tests are quite hard to understand otherwise.

Yes, to correctly process chained situations: tagged macro inside untagged macro, tagged macro inside untagged macro etc.
Also, there was (probably), if-else branch swapped in compiler/rustc_codegen_cranelift/src/debuginfo/line_info.rs:

let span = if tcx.should_collapse_debuginfo(span) {
    span
} else {
    // Walk up the macro expansion chain until we reach a non-expanded span.
    // We also stop at the function body level because no line stepping can occur
    // at the level above that.
    rustc_span::hygiene::walk_chain(span, function_span.ctxt())
};

Right?

petrochenkov · 2024-01-08T11:42:22Z

@bors r+

bors · 2024-01-08T11:42:25Z

📌 Commit f2dbeba has been approved by petrochenkov

It is now in the queue for this repository.

…ebuginfo.rs, r=petrochenkov Improved support of collapse_debuginfo attribute for macros. Added walk_chain_collapsed function to consider collapse_debuginfo attribute in parent macros in call chain. Fixed collapse_debuginfo attribute processing for cranelift (there was if/else branches error swap). cc rust-lang#100758

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#118903 (Improved support of collapse_debuginfo attribute for macros.) - rust-lang#119033 (coverage: `llvm-cov` expects column numbers to be bytes, not code points) - rust-lang#119654 (bump bootstrap dependencies) - rust-lang#119660 (remove an unnecessary stderr-per-bitwidth) - rust-lang#119663 (tests: Normalize `\r\n` to `\n` in some run-make tests) - rust-lang#119681 (coverage: Anonymize line numbers in branch views) - rust-lang#119704 (Fix two variable binding issues in lint let_underscore) - rust-lang#119725 (Add helper for when we want to know if an item has a host param) r? `@ghost` `@rustbot` modify labels: rollup

…ebuginfo.rs, r=petrochenkov Improved support of collapse_debuginfo attribute for macros. Added walk_chain_collapsed function to consider collapse_debuginfo attribute in parent macros in call chain. Fixed collapse_debuginfo attribute processing for cranelift (there was if/else branches error swap). cc rust-lang#100758

…iaskrgr Rollup of 11 pull requests Successful merges: - rust-lang#116343 (Stop mentioning internal lang items in no_std binary errors) - rust-lang#118903 (Improved support of collapse_debuginfo attribute for macros.) - rust-lang#119033 (coverage: `llvm-cov` expects column numbers to be bytes, not code points) - rust-lang#119598 (Fix a typo in core::ops::Deref's doc) - rust-lang#119660 (remove an unnecessary stderr-per-bitwidth) - rust-lang#119663 (tests: Normalize `\r\n` to `\n` in some run-make tests) - rust-lang#119681 (coverage: Anonymize line numbers in branch views) - rust-lang#119704 (Fix two variable binding issues in lint let_underscore) - rust-lang#119725 (Add helper for when we want to know if an item has a host param) - rust-lang#119738 (Add `riscv32imafc-esp-espidf` tier 3 target for the ESP32-P4.) - rust-lang#119740 (Remove crossbeam-channel) Failed merges: - rust-lang#119723 (Remove `-Zdont-buffer-diagnostics`.) r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#118903 (Improved support of collapse_debuginfo attribute for macros.) - rust-lang#119033 (coverage: `llvm-cov` expects column numbers to be bytes, not code points) - rust-lang#119598 (Fix a typo in core::ops::Deref's doc) - rust-lang#119660 (remove an unnecessary stderr-per-bitwidth) - rust-lang#119663 (tests: Normalize `\r\n` to `\n` in some run-make tests) - rust-lang#119681 (coverage: Anonymize line numbers in branch views) - rust-lang#119704 (Fix two variable binding issues in lint let_underscore) - rust-lang#119725 (Add helper for when we want to know if an item has a host param) - rust-lang#119738 (Add `riscv32imafc-esp-espidf` tier 3 target for the ESP32-P4.) - rust-lang#119740 (Remove crossbeam-channel) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#118903 - azhogin:azhogin/skip_second_stmt_debuginfo.rs, r=petrochenkov Improved support of collapse_debuginfo attribute for macros. Added walk_chain_collapsed function to consider collapse_debuginfo attribute in parent macros in call chain. Fixed collapse_debuginfo attribute processing for cranelift (there was if/else branches error swap). cc rust-lang#100758

…ebuginfo.rs, r=petrochenkov Improved support of collapse_debuginfo attribute for macros. Added walk_chain_collapsed function to consider collapse_debuginfo attribute in parent macros in call chain. Fixed collapse_debuginfo attribute processing for cranelift (there was if/else branches error swap). cc rust-lang#100758

rustbot assigned WaffleLapkin Dec 13, 2023

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. labels Dec 13, 2023

azhogin force-pushed the azhogin/skip_second_stmt_debuginfo.rs branch from 374c882 to 2fa1ecf Compare December 13, 2023 06:58

bjorn3 reviewed Dec 13, 2023

View reviewed changes

compiler/rustc_middle/src/ty/mod.rs Outdated Show resolved Hide resolved

rustbot assigned bjorn3 and unassigned WaffleLapkin Dec 13, 2023

azhogin force-pushed the azhogin/skip_second_stmt_debuginfo.rs branch from 2fa1ecf to b5cb3ee Compare December 13, 2023 15:58

petrochenkov self-assigned this Dec 13, 2023

petrochenkov reviewed Dec 13, 2023

View reviewed changes

compiler/rustc_span/src/hygiene.rs Outdated Show resolved Hide resolved

azhogin force-pushed the azhogin/skip_second_stmt_debuginfo.rs branch from b5cb3ee to 2546264 Compare December 14, 2023 12:32

petrochenkov reviewed Dec 14, 2023

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 Dec 15, 2023

petrochenkov mentioned this pull request Dec 15, 2023

Tracking Issue for #[collapse_debuginfo] #100758

Closed

4 tasks

azhogin force-pushed the azhogin/skip_second_stmt_debuginfo.rs branch from 2546264 to dc993ca Compare December 21, 2023 07:11

This comment has been minimized.

Sign in to view

azhogin force-pushed the azhogin/skip_second_stmt_debuginfo.rs branch from dc993ca to 24df98d Compare December 21, 2023 08:29

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 Dec 21, 2023

petrochenkov reviewed Dec 21, 2023

View reviewed changes

rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 21, 2023

This comment was marked as resolved.

Sign in to view

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 Dec 28, 2023

petrochenkov 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 Dec 28, 2023

davidtwco requested changes Jan 3, 2024

View reviewed changes

compiler/rustc_span/src/hygiene.rs Outdated Show resolved Hide resolved

tests/debuginfo/collapse-debuginfo-in-non-collapse-macro.rs Outdated Show resolved Hide resolved

tests/debuginfo/skip_second_statement.rs Outdated Show resolved Hide resolved

azhogin force-pushed the azhogin/skip_second_stmt_debuginfo.rs branch from ea1350e to 5fee6e5 Compare January 7, 2024 22:34

This comment has been minimized.

Sign in to view

Improved support of collapse_debuginfo attribute for macros.

f2dbeba

azhogin force-pushed the azhogin/skip_second_stmt_debuginfo.rs branch from 5fee6e5 to f2dbeba Compare January 8, 2024 10:47

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 8, 2024

matthiaskrgr mentioned this pull request Jan 8, 2024

Rollup of 8 pull requests #119737

Closed

matthiaskrgr mentioned this pull request Jan 8, 2024

Rollup of 8 pull requests #119745

Closed

matthiaskrgr mentioned this pull request Jan 8, 2024

Rollup of 11 pull requests #119747

Closed

matthiaskrgr mentioned this pull request Jan 8, 2024

Rollup of 10 pull requests #119754

Merged

bors merged commit ee7d4c1 into rust-lang:master Jan 9, 2024

rustbot added this to the 1.77.0 milestone Jan 9, 2024

petrochenkov mentioned this pull request Feb 12, 2024

debuginfo: Stabilize -Z debug-macros, -Z collapse-macro-debuginfo and #[collapse_debuginfo] #120845

Merged

Improved support of collapse_debuginfo attribute for macros. #118903

Improved support of collapse_debuginfo attribute for macros. #118903

Uh oh!

Conversation

azhogin commented Dec 13, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Dec 13, 2023

Uh oh!

rustbot commented Dec 13, 2023

Uh oh!

Uh oh!

WaffleLapkin commented Dec 13, 2023

Uh oh!

Uh oh!

petrochenkov commented Dec 13, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

petrochenkov commented Dec 15, 2023

Uh oh!

This comment has been minimized.

azhogin commented Dec 21, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

petrochenkov commented Dec 21, 2023

Uh oh!

This comment was marked as resolved.

davidtwco left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

azhogin commented Jan 5, 2024

Uh oh!

This comment has been minimized.

petrochenkov commented Jan 8, 2024

Uh oh!

bors commented Jan 8, 2024

Uh oh!

Uh oh!

azhogin commented Dec 13, 2023 •

edited

Loading