Rearrange `default_configuration` and `CheckCfg::fill_well_known`. #118494

nnethercote · 2023-12-01T05:36:45Z

There are comments saying these two functions should be kept in sync, but they have very different structures, process symbols in different orders, and there are some inconsistencies.

This commit reorders them so they're both mostly processing symbols in alphabetical order, which makes cross-checking them a lot easier. The commit also adds some macros to factor out repetitive code patterns.

The commit also moves the handling of sym::test out of build_configuration into default_configuration, where all the other symbols are handled.

r? @bjorn3

nnethercote · 2023-12-01T05:39:23Z

cc @Urgau

There are some njn: comments in the commit indicating places were the two functions are currently inconsistent.

sanitizer_cfi_normalize_{integers,pointers} should probably be added to fill_well_known.
I'm not sure why doc, doctest, miri, and target_features are in fill_well_known when they're not in default_configuration.

Any suggestions how to handle these are welcome.

compiler/rustc_session/src/config.rs

bjorn3 · 2023-12-01T08:37:19Z

compiler/rustc_session/src/config.rs

-
-        // Target specific values
+        // njn: sym::sanitizer_cfi_normalize_integers missing!
+        // njn: sym::sanitizer_cfi_normalize_pointers missing!


These should be added I think.

@rcvalle What is the story about the configs sanitizer_cfi_normalize_integers and sanitizer_cfi_normalize_pointers ? Are they expected to be used by users ? or just std/core ?

If it's only for core/std, it shouldn't be added, since it's not user-facing.

They're expected to be used by users with the cfi_encoding attribute. For example, they're currently used by the cfi_types crate.

Right, in that case let's define them like this:

Suggested change

// njn: sym::sanitizer_cfi_normalize_pointers missing!

ins!(sym::sanitizer_cfi_normalize_integers, no_values);

ins!(sym::sanitizer_cfi_generalize_pointers, no_values);

EDIT: Oops, I meant generalize_pointers not normalize_integers. Sorry

Btw, I don't see those cfgs in GATED_CFGS, the list of unstable cfgs. I think they should be added there since they are unstable, right?

Yes, you're right. Would you mind also adding them as part of this PR? Thank you!

nnethercote · 2023-12-04T23:48:32Z

I have added new comments to the doc/doctest/miri and target_feature cases. I am still unsure what to do with the sanitizer ones.

bjorn3 · 2023-12-05T16:03:57Z

I am still unsure what to do with the sanitizer ones.

Not sure either.

Urgau · 2023-12-05T16:18:13Z

I am still unsure what to do with the sanitizer ones.

I would leave them for now. I don't think they're meant to be used outside of core, but if they are, we can always add them later.

rcvalle · 2023-12-05T17:00:17Z

I am still unsure what to do with the sanitizer ones.

I would leave them for now. I don't think they're meant to be used outside of core, but if they are, we can always add them later.

Please keep these as they're expected to be used by users with the cfi_encoding attribute, and they're currently used by the cfi_types crate.

Urgau · 2023-12-05T17:52:04Z

Please keep these as they're expected to be used by users with the cfi_encoding attribute, and they're currently used by the cfi_types crate.

Rest assured that we have no plans to remove them. We were just puzzled by the fact that these cfgs were not defined in the well known check-cfg list.

rcvalle · 2023-12-05T17:54:17Z

Rest assured that we have no plans to remove them. We were just puzzled by the fact that these cfgs were not defined in the well known check-cfg list.

Thank you! That was probably an oversight on my part when I added them.

nnethercote · 2023-12-05T20:15:54Z

I have added the sanitizer_cfi ones to fill_well_known.

I haven't touched GATED_CFGS, that would need quite a few changes, e.g. some new cfg symbols defined, tests, and updates to the unstable book. I figure that's scope creep for this PR, but could be done in a follow-up.

@bjorn3: should be ready for final review now, thanks.

compiler/rustc_session/src/config.rs

nnethercote · 2023-12-05T20:29:51Z

I pushed an update that fixes the compile error, addresses @Urgau's comment, and updates expected output for the check-cfg tests. Should genuinely be ready for review now :)

bors · 2023-12-07T01:23:06Z

☔ The latest upstream changes (presumably #118687) made this pull request unmergeable. Please resolve the merge conflicts.

nnethercote · 2023-12-07T10:06:30Z

@bjorn3 is low on time right now, so let's try a different reviewer:

r? @Mark-Simulacrum

Note that @Urgau, the resident expert on this code, has given approval, so a light review might suffice. I need to fix the conflicts, but they should just be trivial changes in test output.

…own, r=nnethercote Strengthen well known check-cfg names and values test rust-lang#118494 is changing the implementation of how we expect well known check-cfg names and values, but we currently don't have a test that checks every well known only some of them. This PR therefore strengthen our well known names/values test to include all of the configs to at least avoid unintended regressions and validate new entry. *this PR also contains some drive-by consolidation of unexpected `target_os`, `target_arch` into a single file* r? `@nnethercote` (maybe? feel free to re-assign)

…own, r=nnethercote Strengthen well known check-cfg names and values test rust-lang#118494 is changing the implementation of how we expect well known check-cfg names and values, but we currently don't have a test that checks every well known only some of them. This PR therefore strengthen our well known names/values test to include all of the configs to at least avoid unintended regressions and validate new entry. *this PR also contains some drive-by consolidation of unexpected `target_os`, `target_arch` into a single file* r? ``@nnethercote`` (maybe? feel free to re-assign)

…own, r=nnethercote Strengthen well known check-cfg names and values test rust-lang#118494 is changing the implementation of how we expect well known check-cfg names and values, but we currently don't have a test that checks every well known only some of them. This PR therefore strengthen our well known names/values test to include all of the configs to at least avoid unintended regressions and validate new entry. *this PR also contains some drive-by consolidation of unexpected `target_os`, `target_arch` into a single file* r? ```@nnethercote``` (maybe? feel free to re-assign)

…own, r=nnethercote Strengthen well known check-cfg names and values test rust-lang#118494 is changing the implementation of how we expect well known check-cfg names and values, but we currently don't have a test that checks every well known only some of them. This PR therefore strengthen our well known names/values test to include all of the configs to at least avoid unintended regressions and validate new entry. *this PR also contains some drive-by consolidation of unexpected `target_os`, `target_arch` into a single file* r? `@nnethercote` (maybe? feel free to re-assign)

Mark-Simulacrum

r=me

Rollup merge of rust-lang#118702 - Urgau:check-cfg-strengthen-well-known, r=nnethercote Strengthen well known check-cfg names and values test rust-lang#118494 is changing the implementation of how we expect well known check-cfg names and values, but we currently don't have a test that checks every well known only some of them. This PR therefore strengthen our well known names/values test to include all of the configs to at least avoid unintended regressions and validate new entry. *this PR also contains some drive-by consolidation of unexpected `target_os`, `target_arch` into a single file* r? `@nnethercote` (maybe? feel free to re-assign)

There are comments saying these two functions should be kept in sync, but they have very different structures, process symbols in different orders, and there are some inconsistencies. This commit reorders them so they're both mostly processing symbols in alphabetical order, which makes cross-checking them a lot easier. The commit also adds some macros to factor out repetitive code patterns. Plus it adds `sanitizer_cfi_normalize_{integers,pointers}` to `fill_well_known`, which were missing. The commit also moves the handling of `sym::test` out of `build_configuration` into `default_configuration`, where all the other symbols are handled.

nnethercote · 2023-12-10T23:05:29Z

I rebased.

@bors r=Mark-Simulacrum

bors · 2023-12-10T23:05:32Z

📌 Commit 22b534d has been approved by Mark-Simulacrum

It is now in the queue for this repository.

bors · 2023-12-11T06:10:47Z

⌛ Testing commit 22b534d with merge c13187c...

bors · 2023-12-11T08:06:08Z

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing c13187c to master...

rust-timer · 2023-12-11T09:26:24Z

Finished benchmarking commit (c13187c): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

This benchmark run did not return any relevant results for this metric.

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 668.003s -> 669.249s (0.19%)
Artifact size: 314.13 MiB -> 314.19 MiB (0.02%)

…aKO8Ki Add all known `target_feature` configs to check-cfg This PR adds all the known `target_feature` from ~~`rustc_codegen_ssa`~~ `rustc_target` to the well known list of check-cfg. It does so by moving the list from `rustc_codegen_ssa` to `rustc_target` ~~`rustc_session` (I not sure about this, but some of the moved function take a `Session`)~~, then using it the `fill_well_known` function. This already proved to be useful since portable-simd had a bad cfg. cc `@nnethercote` (since we discussed it in rust-lang#118494)

…=TaKO8Ki,GuillaumeGomez,workingjubilee Add all known `target_feature` configs to check-cfg This PR adds all the known `target_feature` from ~~`rustc_codegen_ssa`~~ `rustc_target` to the well known list of check-cfg. It does so by moving the list from `rustc_codegen_ssa` to `rustc_target` ~~`rustc_session` (I not sure about this, but some of the moved function take a `Session`)~~, then using it the `fill_well_known` function. This already proved to be useful since portable-simd had a bad cfg. cc `@nnethercote` (since we discussed it in rust-lang#118494)

Rollup merge of rust-lang#118908 - Urgau:check-cfg-target-features, r=TaKO8Ki,GuillaumeGomez,workingjubilee Add all known `target_feature` configs to check-cfg This PR adds all the known `target_feature` from ~~`rustc_codegen_ssa`~~ `rustc_target` to the well known list of check-cfg. It does so by moving the list from `rustc_codegen_ssa` to `rustc_target` ~~`rustc_session` (I not sure about this, but some of the moved function take a `Session`)~~, then using it the `fill_well_known` function. This already proved to be useful since portable-simd had a bad cfg. cc `@nnethercote` (since we discussed it in rust-lang#118494)

…er-cfi-cfgs, r=Nilstrieb Add missing feature gate for sanitizer CFI cfgs Found during the review of rust-lang#118494 in rust-lang#118494 (comment). cc `@rcvalle`

Rollup merge of rust-lang#119235 - Urgau:missing-feature-gate-sanitizer-cfi-cfgs, r=Nilstrieb Add missing feature gate for sanitizer CFI cfgs Found during the review of rust-lang#118494 in rust-lang#118494 (comment). cc `@rcvalle`

rustbot assigned bjorn3 Dec 1, 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. labels Dec 1, 2023

bjorn3 reviewed Dec 1, 2023

View reviewed changes

compiler/rustc_session/src/config.rs Show resolved Hide resolved

bjorn3 reviewed Dec 1, 2023

View reviewed changes

compiler/rustc_session/src/config.rs Show resolved Hide resolved

bjorn3 reviewed Dec 1, 2023

View reviewed changes

nnethercote force-pushed the default_configuration-fill_well_known branch from 6da79b5 to afeb3e6 Compare December 4, 2023 23:47

nnethercote force-pushed the default_configuration-fill_well_known branch from afeb3e6 to 634ae81 Compare December 5, 2023 20:12

This comment has been minimized.

Sign in to view

Urgau approved these changes Dec 5, 2023

View reviewed changes

compiler/rustc_session/src/config.rs Outdated Show resolved Hide resolved

nnethercote force-pushed the default_configuration-fill_well_known branch from 634ae81 to cf59759 Compare December 5, 2023 20:29

rustbot assigned Mark-Simulacrum and unassigned bjorn3 Dec 7, 2023

Urgau mentioned this pull request Dec 7, 2023

Strengthen well known check-cfg names and values test #118702

Merged

Mark-Simulacrum approved these changes Dec 9, 2023

View reviewed changes

Mark-Simulacrum 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 9, 2023

nnethercote force-pushed the default_configuration-fill_well_known branch from cf59759 to 22b534d Compare December 10, 2023 23:05

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

bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 11, 2023

bors merged commit c13187c into rust-lang:master Dec 11, 2023
12 checks passed

rustbot added this to the 1.76.0 milestone Dec 11, 2023

bors mentioned this pull request Dec 11, 2023

tidy watcher #114209

Open

nnethercote deleted the default_configuration-fill_well_known branch December 11, 2023 21:11

Urgau mentioned this pull request Dec 13, 2023

Add all known target_feature configs to check-cfg #118908

Merged

Urgau mentioned this pull request Dec 22, 2023

Add missing feature gate for sanitizer CFI cfgs #119235

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rearrange `default_configuration` and `CheckCfg::fill_well_known`. #118494

Rearrange `default_configuration` and `CheckCfg::fill_well_known`. #118494

nnethercote commented Dec 1, 2023

nnethercote commented Dec 1, 2023

bjorn3 Dec 1, 2023

Urgau Dec 1, 2023 •

edited

rcvalle Dec 5, 2023

Urgau Dec 5, 2023 •

edited

rcvalle Dec 5, 2023

nnethercote commented Dec 4, 2023

bjorn3 commented Dec 5, 2023

Urgau commented Dec 5, 2023 •

edited

rcvalle commented Dec 5, 2023 •

edited

Urgau commented Dec 5, 2023

rcvalle commented Dec 5, 2023

nnethercote commented Dec 5, 2023

This comment has been minimized.

nnethercote commented Dec 5, 2023

bors commented Dec 7, 2023

nnethercote commented Dec 7, 2023

Mark-Simulacrum left a comment

nnethercote commented Dec 10, 2023

bors commented Dec 10, 2023

bors commented Dec 11, 2023

bors commented Dec 11, 2023

rust-timer commented Dec 11, 2023

	// njn: sym::sanitizer_cfi_normalize_pointers missing!
	ins!(sym::sanitizer_cfi_normalize_integers, no_values);
	ins!(sym::sanitizer_cfi_generalize_pointers, no_values);

Rearrange default_configuration and CheckCfg::fill_well_known. #118494

Rearrange default_configuration and CheckCfg::fill_well_known. #118494

Conversation

nnethercote commented Dec 1, 2023

nnethercote commented Dec 1, 2023

bjorn3 Dec 1, 2023

Choose a reason for hiding this comment

Urgau Dec 1, 2023 • edited

Choose a reason for hiding this comment

rcvalle Dec 5, 2023

Choose a reason for hiding this comment

Urgau Dec 5, 2023 • edited

Choose a reason for hiding this comment

rcvalle Dec 5, 2023

Choose a reason for hiding this comment

nnethercote commented Dec 4, 2023

bjorn3 commented Dec 5, 2023

Urgau commented Dec 5, 2023 • edited

rcvalle commented Dec 5, 2023 • edited

Urgau commented Dec 5, 2023

rcvalle commented Dec 5, 2023

nnethercote commented Dec 5, 2023

This comment has been minimized.

nnethercote commented Dec 5, 2023

bors commented Dec 7, 2023

nnethercote commented Dec 7, 2023

Mark-Simulacrum left a comment

Choose a reason for hiding this comment

nnethercote commented Dec 10, 2023

bors commented Dec 10, 2023

bors commented Dec 11, 2023

bors commented Dec 11, 2023

rust-timer commented Dec 11, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Rearrange `default_configuration` and `CheckCfg::fill_well_known`. #118494

Rearrange `default_configuration` and `CheckCfg::fill_well_known`. #118494

Urgau Dec 1, 2023 •

edited

Urgau Dec 5, 2023 •

edited

Urgau commented Dec 5, 2023 •

edited

rcvalle commented Dec 5, 2023 •

edited