Target modifiers (special marked options) are recorded in metainfo #133138

azhogin · 2024-11-17T21:27:33Z

Target modifiers (special marked options) are recorded in metainfo and compared to be equal in different linked crates.

Draft PR for this RFC: rust-lang/rfcs#3716

Option may be marked as TMOD, example: regparm: Option<u32> = (None, parse_opt_number, [TRACKED TMOD].
If an TMOD-marked option has non-default value, it will be recorded in crate metainfo as a Vec<TargetModifier>:

pub struct TargetModifier {
    pub name_hash: u64,     // option name hash
    pub value_name: String, // User-provided option value (before parsing)
}

Option value code is generated using Debug trait.

Error example:

error: mixing `-Zregparm` will cause an ABI mismatch
  --> $DIR/incompatible_regparm.rs:9:1
   |
LL | #![crate_type = "lib"]
   | ^
   |
   = help: `-Zregparm` modifies the ABI so Rust crates compiled with different values of this flag cannot be used together safely
   = note: `-Zregparm=1` in this crate is incompatible with `-Zregparm=2` in dependency `wrong_regparm`
   = help: set `-Zregparm=2` in this crate or `-Zregparm=1` in `wrong_regparm`
   = help: alternatively, use `-Cunsafe-allow-abi-mismatch=regparm` to silence this error

error: aborting due to 1 previous error

-Cunsafe-allow-abi-mismatch=regparm,reg-struct-return to disable list of flags.

rustbot · 2024-11-17T21:27:42Z

r? @davidtwco

rustbot has assigned @davidtwco.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

compiler/rustc_metadata/src/creader.rs

compiler/rustc_session/src/options.rs

compiler/rustc_metadata/src/creader.rs

compiler/rustc_session/src/options.rs

compiler/rustc_lint/messages.ftl

compiler/rustc_session/src/options.rs

tests/ui/target_modifiers/incompatible_regparm.rs

azhogin · 2024-11-28T10:54:04Z

@rustbot ready

compiler/rustc_lint/messages.ftl

azhogin · 2024-12-10T07:59:52Z

Re-worked as a hard error.
Only user option values are stored in metainfo (with name hash). User values are parsed again and converted into tech values (printed by Debug trait) for comparison during verification procedure.
'Allow-all' flag option removed.

azhogin · 2024-12-10T08:01:43Z

@rustbot ready

…d compared to be equal in different crates

compiler/rustc_session/src/options.rs

davidtwco · 2024-12-12T10:52:43Z

tests/ui/target_modifiers/incompatible_regparm.rs

+//@ needs-llvm-components: x86
+//@ revisions:error_generated allow_regparm_mismatch
+
+//@[allow_regparm_mismatch] compile-flags: -Cunsafe-allow-abi-mismatch=regparm


Can you add another test showing that -Cunsafe-allow-abi-mismatch must be provided a value?

compiler/rustc_session/src/options.rs

davidtwco · 2024-12-12T11:22:17Z

compiler/rustc_metadata/messages.ftl

+metadata_incompatible_target_modifiers =
+    mixing `{$flag_name_prefixed}` will cause an ABI mismatch
+    .note = `{$flag_name_prefixed}={$flag_local_value}` in this crate is incompatible with `{$flag_name_prefixed}={$flag_extern_value}` in dependency `{$extern_crate}`
+    .help = `{$flag_name_prefixed}` modifies the ABI so Rust crates compiled with different values of this flag cannot be used together safely


Suggested change

.help = `{$flag_name_prefixed}` modifies the ABI so Rust crates compiled with different values of this flag cannot be used together safely

.help = this error occurs because the `{$flag_name_prefixed}` flag modifies the ABI,

and different crates in your project were compiled with inconsistent

values

.help = to resolve this, ensure that `{$flag_name_prefixed}` is set to the same value

for all crates during compilation

…ifiers enum

azhogin · 2024-12-18T13:37:36Z

Implemented CodegenOptionsTargetModifiers and UnstableOptionsTargetModifiers enums generation. To generate enums with macro_rules it is necessary to use recursive mechanic, that's why #![recursion_limit = "256"] in rustc_session.
Small fixes performed too.
@rustbot ready

davidtwco

I think the enum key is a lot better, I'll pass this on to someone else just to get another opinion on it.

davidtwco · 2024-12-20T11:45:09Z

compiler/rustc_session/src/options.rs

+pub enum OptionsTargetModifiers {
+    CodegenOptions(CodegenOptionsTargetModifiers),
+    UnstableOptions(UnstableOptionsTargetModifiers),
+}


This should probably be generated like the Options struct, just in case any top-level arguments are target modifiers.

OptionsTargetModifiers enum is now generated by macro to support substruct option groups. But top-level arguments can't now be target modifiers, because they are processed in a different way, they are not parsed by the same "parse_*" functions system. They are set manually in different places.
Target modifiers are now supported only for codegen/unstable option groups.

davidtwco · 2024-12-20T11:47:59Z

compiler/rustc_session/src/options.rs

@@ -1986,10 +2221,10 @@ options! {
        "enable queries of the dependency graph for regression testing (default: no)"),
    randomize_layout: bool = (false, parse_bool, [TRACKED],
        "randomize the layout of types (default: no)"),
-    reg_struct_return: bool = (false, parse_bool, [TRACKED],
+    reg_struct_return: bool = (false, parse_bool, [TRACKED TMOD],


I think it would better if TMOD was TARGET_MODIFIER in these macros.

davidtwco · 2024-12-20T11:58:52Z

r? compiler

rustbot assigned davidtwco Nov 17, 2024

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 Nov 17, 2024

This comment has been minimized.

Sign in to view

azhogin force-pushed the azhogin/target-modifiers branch from d99ff62 to bd52a23 Compare November 18, 2024 19:21

This comment has been minimized.

Sign in to view

azhogin force-pushed the azhogin/target-modifiers branch from bd52a23 to 500600b Compare November 18, 2024 22:37

This comment has been minimized.

Sign in to view

azhogin force-pushed the azhogin/target-modifiers branch 2 times, most recently from db91299 to 43e5956 Compare November 20, 2024 22:32

This comment has been minimized.

Sign in to view

azhogin force-pushed the azhogin/target-modifiers branch from 43e5956 to 6793451 Compare November 21, 2024 10:31

davidtwco requested changes Nov 21, 2024

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 Nov 21, 2024

azhogin force-pushed the azhogin/target-modifiers branch 2 times, most recently from 95f9595 to 9cd86c3 Compare November 26, 2024 22:28

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 Nov 28, 2024

azhogin marked this pull request as ready for review November 28, 2024 10:54

azhogin force-pushed the azhogin/target-modifiers branch from 9cd86c3 to 97a8240 Compare November 28, 2024 11:57

This comment has been minimized.

Sign in to view

azhogin force-pushed the azhogin/target-modifiers branch from 97a8240 to 8603b2b Compare November 28, 2024 13:12

davidtwco reviewed Dec 2, 2024

View reviewed changes

compiler/rustc_lint/messages.ftl Outdated Show resolved Hide resolved

compiler/rustc_lint/messages.ftl Outdated Show resolved Hide resolved

davidtwco mentioned this pull request Dec 2, 2024

[RFC] Target Modifiers rust-lang/rfcs#3716

Open

ojeda mentioned this pull request Dec 2, 2024

Rust unstable features needed for the kernel Rust-for-Linux/linux#2

Open

89 tasks

azhogin force-pushed the azhogin/target-modifiers branch from 8603b2b to 95ffdf8 Compare December 6, 2024 09:22

This comment was marked as resolved.

Sign in to view

azhogin force-pushed the azhogin/target-modifiers branch from 95ffdf8 to c59d611 Compare December 10, 2024 06:39

azhogin force-pushed the azhogin/target-modifiers branch from c59d611 to 7dfbf13 Compare December 12, 2024 06:18

This comment has been minimized.

Sign in to view

Target modifiers (special marked options) are recorded in metainfo an…

6741a49

…d compared to be equal in different crates

azhogin force-pushed the azhogin/target-modifiers branch from 7dfbf13 to 6741a49 Compare December 12, 2024 08:53

davidtwco requested changes Dec 12, 2024

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 12, 2024

Target modifiers: Small fixes & re-work to generated OptionsTargetMod…

4ecef0c

…ifiers enum

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 18, 2024

davidtwco reviewed Dec 20, 2024

View reviewed changes

rustbot assigned petrochenkov and unassigned davidtwco Dec 20, 2024

Top level option group enums are generated by macro

a084519

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Target modifiers (special marked options) are recorded in metainfo #133138

Target modifiers (special marked options) are recorded in metainfo #133138

azhogin commented Nov 17, 2024 •

edited

Loading

rustbot commented Nov 17, 2024

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

azhogin commented Nov 28, 2024

This comment has been minimized.

This comment was marked as resolved.

azhogin commented Dec 10, 2024

azhogin commented Dec 10, 2024

This comment has been minimized.

davidtwco Dec 12, 2024

davidtwco Dec 12, 2024

azhogin commented Dec 18, 2024

davidtwco left a comment

davidtwco Dec 20, 2024

azhogin Dec 23, 2024

davidtwco Dec 20, 2024

azhogin Dec 23, 2024

davidtwco commented Dec 20, 2024

-    .help = `{$flag_name_prefixed}` modifies the ABI so Rust crates compiled with different values of this flag cannot be used together safely
+.help = this error occurs because the `{$flag_name_prefixed}` flag modifies the ABI,
+        and different crates in your project were compiled with inconsistent
+        values
+.help = to resolve this, ensure that `{$flag_name_prefixed}` is set to the same value
+        for all crates during compilation

Target modifiers (special marked options) are recorded in metainfo #133138

Are you sure you want to change the base?

Target modifiers (special marked options) are recorded in metainfo #133138

Conversation

azhogin commented Nov 17, 2024 • edited Loading

rustbot commented Nov 17, 2024

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

azhogin commented Nov 28, 2024

This comment has been minimized.

This comment was marked as resolved.

azhogin commented Dec 10, 2024

azhogin commented Dec 10, 2024

This comment has been minimized.

davidtwco Dec 12, 2024

Choose a reason for hiding this comment

davidtwco Dec 12, 2024

Choose a reason for hiding this comment

azhogin commented Dec 18, 2024

davidtwco left a comment

Choose a reason for hiding this comment

davidtwco Dec 20, 2024

Choose a reason for hiding this comment

azhogin Dec 23, 2024

Choose a reason for hiding this comment

davidtwco Dec 20, 2024

Choose a reason for hiding this comment

azhogin Dec 23, 2024

Choose a reason for hiding this comment

davidtwco commented Dec 20, 2024

azhogin commented Nov 17, 2024 •

edited

Loading