Skip to content

Commit 71b68da

Browse files
borsbors
committed
Auto merge of rust-lang#139578 - ferrocene:pa-compiletest-edition, r=jieyouxu
Fix breakage when running compiletest with `--test-args=--edition=2015` Compiletest has an `--edition` flag to change the default edition tests are run with. Unfortunately no test suite successfully executes when that flag is passed. If the edition is set to something greater than 2015 the breakage is expected, since the test suite currently supports only edition 2015 (Ferrous Systems will open an MCP about fixing that soonish). Surprisingly, the test suite is also broken if `--edition=2015` is passed to compiletest. This PR focuses on fixing the latter. This PR fixes the two categories of failures happening when `--edition=2015` is passed: * Some edition-specific tests set their edition through `//@ compile-flags` instead of `//@ edition`. Compiletest doesn't parse the compile flags, so it would see no `//@ edition` and add another `--edition` flag, leading to a rustc error. * Compiletest would add the edition after `//@ compile-flags`, while some tests depend on flags passed to `//@ compile-flags` being the last flags in the rustc invocation. Note that for the first category, I opted to manually go and replace all `//@ compile-flags` setting an edition with an explicit `//@ edition`. We could've changed compiletest to instead check whether an edition was set in `//@ compile-flags`, but I thought it was better to enforce a consistent way to set the edition in tests. I also added the edition to the stamp, so that changing `--edition` results in tests being re-executed. r? `@jieyouxu`
2 parents 81d8c74 + 3ebf1c2 commit 71b68da

File tree

111 files changed

+208
-151
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+208
-151
lines changed

‎src/doc/rustc-dev-guide/src/tests/directives.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -234,14 +234,14 @@ ignoring debuggers.
234234

235235
### Affecting how tests are built
236236

237-
| Directive | Explanation | Supported test suites | Possible values |
238-
|---------------------|----------------------------------------------------------------------------------------------|---------------------------|------------------------------------------------------------------------------|
239-
| `compile-flags` | Flags passed to `rustc` when building the test or aux file | All except for `run-make` | Any valid `rustc` flags, e.g. `-Awarnings -Dfoo`. Cannot be `-Cincremental`. |
240-
| `edition` | Alias for `compile-flags: --edition=xxx` | All except for `run-make` | Any valid `--edition` value |
241-
| `rustc-env` | Env var to set when running `rustc` | All except for `run-make` | `<KEY>=<VALUE>` |
242-
| `unset-rustc-env` | Env var to unset when running `rustc` | All except for `run-make` | Any env var name |
243-
| `incremental` | Proper incremental support for tests outside of incremental test suite | `ui`, `crashes` | N/A |
244-
| `no-prefer-dynamic` | Don't use `-C prefer-dynamic`, don't build as a dylib via a `--crate-type=dylib` preset flag | `ui`, `crashes` | N/A |
237+
| Directive | Explanation | Supported test suites | Possible values |
238+
|---------------------|----------------------------------------------------------------------------------------------|---------------------------|--------------------------------------------------------------------------------------------|
239+
| `compile-flags` | Flags passed to `rustc` when building the test or aux file | All except for `run-make` | Any valid `rustc` flags, e.g. `-Awarnings -Dfoo`. Cannot be `-Cincremental` or `--edition` |
240+
| `edition` | The edition used to build the test | All except for `run-make` | Any valid `--edition` value |
241+
| `rustc-env` | Env var to set when running `rustc` | All except for `run-make` | `<KEY>=<VALUE>` |
242+
| `unset-rustc-env` | Env var to unset when running `rustc` | All except for `run-make` | Any env var name |
243+
| `incremental` | Proper incremental support for tests outside of incremental test suite | `ui`, `crashes` | N/A |
244+
| `no-prefer-dynamic` | Don't use `-C prefer-dynamic`, don't build as a dylib via a `--crate-type=dylib` preset flag | `ui`, `crashes` | N/A |
245245

246246
<div class="warning">
247247
Tests (outside of `run-make`) that want to use incremental tests not in the

‎src/tools/compiletest/src/header.rs‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -389,14 +389,22 @@ impl TestProps {
389389
}
390390

391391
if let Some(flags) = config.parse_name_value_directive(ln, COMPILE_FLAGS) {
392-
self.compile_flags.extend(split_flags(&flags));
392+
let flags = split_flags(&flags);
393+
for flag in &flags {
394+
if flag == "--edition" || flag.starts_with("--edition=") {
395+
panic!("you must use `//@ edition` to configure the edition");
396+
}
397+
}
398+
self.compile_flags.extend(flags);
393399
}
394400
if config.parse_name_value_directive(ln, INCORRECT_COMPILER_FLAGS).is_some() {
395401
panic!("`compiler-flags` directive should be spelled `compile-flags`");
396402
}
397403

398404
if let Some(edition) = config.parse_edition(ln) {
399-
self.compile_flags.push(format!("--edition={}", edition.trim()));
405+
// The edition is added at the start, since flags from //@compile-flags must
406+
// be passed to rustc last.
407+
self.compile_flags.insert(0, format!("--edition={}", edition.trim()));
400408
has_edition = true;
401409
}
402410

@@ -624,7 +632,9 @@ impl TestProps {
624632
}
625633

626634
if let (Some(edition), false) = (&config.edition, has_edition) {
627-
self.compile_flags.push(format!("--edition={}", edition));
635+
// The edition is added at the start, since flags from //@compile-flags must be passed
636+
// to rustc last.
637+
self.compile_flags.insert(0, format!("--edition={}", edition));
628638
}
629639
}
630640

‎src/tools/compiletest/src/runtest.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ pub fn compute_stamp_hash(config: &Config) -> String {
177177
let mut hash = DefaultHasher::new();
178178
config.stage_id.hash(&mut hash);
179179
config.run.hash(&mut hash);
180+
config.edition.hash(&mut hash);
180181

181182
match config.debugger {
182183
Some(Debugger::Cdb) => {

‎tests/assembly/cstring-merging.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
//@ only-linux
22
//@ assembly-output: emit-asm
3-
//@ compile-flags: --crate-type=lib -Copt-level=3 --edition 2024
3+
//@ compile-flags: --crate-type=lib -Copt-level=3
4+
//@ edition: 2024
45

56
use std::ffi::CStr;
67

‎tests/codegen/async-closure-debug.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// Just make sure that async closures don't ICE.
22
//
3-
//@ compile-flags: -C debuginfo=2 --edition=2018
3+
//@ compile-flags: -C debuginfo=2
4+
//@ edition: 2018
45
//@ ignore-msvc
56

67
// CHECK-DAG: [[GEN_FN:!.*]] = !DINamespace(name: "async_closure_test"

‎tests/codegen/async-fn-debug-awaitee-field.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
//@[MSVC] only-msvc
88
//@[NONMSVC] ignore-msvc
99

10-
//@ compile-flags: -C debuginfo=2 --edition=2018 -Copt-level=0
10+
//@ compile-flags: -C debuginfo=2 -Copt-level=0
11+
//@ edition: 2018
1112

1213
#![crate_type = "lib"]
1314

‎tests/codegen/async-fn-debug-msvc.rs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
// - Other fields are not marked artificial
55
//
66
//
7-
//@ compile-flags: -C debuginfo=2 --edition=2018
7+
//@ compile-flags: -C debuginfo=2
8+
//@ edition: 2018
89
//@ only-msvc
910

1011
async fn foo() {}
@@ -19,23 +20,23 @@ async fn async_fn_test() {
1920
// CHECK-DAG: [[GEN:!.*]] = !DICompositeType(tag: DW_TAG_union_type, name: "enum2$<async_fn_debug_msvc::async_fn_test::async_fn_env$0>",
2021
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "variant0", scope: [[GEN]],
2122
// For brevity, we only check the struct name and members of the last variant.
22-
// CHECK-SAME: file: [[FILE:![0-9]*]], line: 11,
23+
// CHECK-SAME: file: [[FILE:![0-9]*]], line: 12,
2324
// CHECK-NOT: flags: DIFlagArtificial
2425
// CHECK-SAME: )
2526
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "variant1", scope: [[GEN]],
26-
// CHECK-SAME: file: [[FILE]], line: 15,
27+
// CHECK-SAME: file: [[FILE]], line: 16,
2728
// CHECK-NOT: flags: DIFlagArtificial
2829
// CHECK-SAME: )
2930
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "variant2", scope: [[GEN]],
30-
// CHECK-SAME: file: [[FILE]], line: 15,
31+
// CHECK-SAME: file: [[FILE]], line: 16,
3132
// CHECK-NOT: flags: DIFlagArtificial
3233
// CHECK-SAME: )
3334
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "variant3", scope: [[GEN]],
34-
// CHECK-SAME: file: [[FILE]], line: 12,
35+
// CHECK-SAME: file: [[FILE]], line: 13,
3536
// CHECK-NOT: flags: DIFlagArtificial
3637
// CHECK-SAME: )
3738
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "variant4", scope: [[GEN]],
38-
// CHECK-SAME: file: [[FILE]], line: 14,
39+
// CHECK-SAME: file: [[FILE]], line: 15,
3940
// CHECK-SAME: baseType: [[VARIANT_WRAPPER:![0-9]*]]
4041
// CHECK-NOT: flags: DIFlagArtificial
4142
// CHECK-SAME: )

‎tests/codegen/async-fn-debug.rs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
// - Other fields are not marked artificial
55
//
66
//
7-
//@ compile-flags: -C debuginfo=2 --edition=2018
7+
//@ compile-flags: -C debuginfo=2
8+
//@ edition: 2018
89
//@ ignore-msvc
910

1011
async fn foo() {}
@@ -22,26 +23,26 @@ async fn async_fn_test() {
2223
// CHECK-NOT: flags: DIFlagArtificial
2324
// CHECK-SAME: discriminator: [[DISC:![0-9]*]]
2425
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "0", scope: [[VARIANT]],
25-
// CHECK-SAME: file: [[FILE:![0-9]*]], line: 11,
26+
// CHECK-SAME: file: [[FILE:![0-9]*]], line: 12,
2627
// CHECK-NOT: flags: DIFlagArtificial
2728
// CHECK-SAME: )
2829
// CHECK: {{!.*}} = !DICompositeType(tag: DW_TAG_structure_type, name: "Unresumed", scope: [[GEN]],
2930
// CHECK-NOT: flags: DIFlagArtificial
3031
// CHECK-SAME: )
3132
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "1", scope: [[VARIANT]],
32-
// CHECK-SAME: file: [[FILE]], line: 15,
33+
// CHECK-SAME: file: [[FILE]], line: 16,
3334
// CHECK-NOT: flags: DIFlagArtificial
3435
// CHECK-SAME: )
3536
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "2", scope: [[VARIANT]],
36-
// CHECK-SAME: file: [[FILE]], line: 15,
37+
// CHECK-SAME: file: [[FILE]], line: 16,
3738
// CHECK-NOT: flags: DIFlagArtificial
3839
// CHECK-SAME: )
3940
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "3", scope: [[VARIANT]],
40-
// CHECK-SAME: file: [[FILE]], line: 12,
41+
// CHECK-SAME: file: [[FILE]], line: 13,
4142
// CHECK-NOT: flags: DIFlagArtificial
4243
// CHECK-SAME: )
4344
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "4", scope: [[VARIANT]],
44-
// CHECK-SAME: file: [[FILE]], line: 14,
45+
// CHECK-SAME: file: [[FILE]], line: 15,
4546
// CHECK-NOT: flags: DIFlagArtificial
4647
// CHECK-SAME: )
4748
// CHECK: [[S1:!.*]] = !DICompositeType(tag: DW_TAG_structure_type, name: "Suspend1", scope: [[GEN]],

‎tests/codegen/coroutine-debug.rs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
// - Other fields are not marked artificial
55
//
66
//
7-
//@ compile-flags: -C debuginfo=2 --edition=2018
7+
//@ compile-flags: -C debuginfo=2
8+
//@ edition: 2018
89
//@ ignore-msvc
910

1011
#![feature(coroutines, coroutine_trait)]
@@ -27,26 +28,26 @@ fn coroutine_test() -> impl Coroutine<Yield = i32, Return = ()> {
2728
// CHECK-NOT: flags: DIFlagArtificial
2829
// CHECK-SAME: discriminator: [[DISC:![0-9]*]]
2930
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "0", scope: [[VARIANT]],
30-
// CHECK-SAME: file: [[FILE:![0-9]*]], line: 15,
31+
// CHECK-SAME: file: [[FILE:![0-9]*]], line: 16,
3132
// CHECK-NOT: flags: DIFlagArtificial
3233
// CHECK-SAME: )
3334
// CHECK: {{!.*}} = !DICompositeType(tag: DW_TAG_structure_type, name: "Unresumed", scope: [[GEN]],
3435
// CHECK-NOT: flags: DIFlagArtificial
3536
// CHECK-SAME: )
3637
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "1", scope: [[VARIANT]],
37-
// CHECK-SAME: file: [[FILE]], line: 19,
38+
// CHECK-SAME: file: [[FILE]], line: 20,
3839
// CHECK-NOT: flags: DIFlagArtificial
3940
// CHECK-SAME: )
4041
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "2", scope: [[VARIANT]],
41-
// CHECK-SAME: file: [[FILE]], line: 19,
42+
// CHECK-SAME: file: [[FILE]], line: 20,
4243
// CHECK-NOT: flags: DIFlagArtificial
4344
// CHECK-SAME: )
4445
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "3", scope: [[VARIANT]],
45-
// CHECK-SAME: file: [[FILE]], line: 16,
46+
// CHECK-SAME: file: [[FILE]], line: 17,
4647
// CHECK-NOT: flags: DIFlagArtificial
4748
// CHECK-SAME: )
4849
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "4", scope: [[VARIANT]],
49-
// CHECK-SAME: file: [[FILE]], line: 18,
50+
// CHECK-SAME: file: [[FILE]], line: 19,
5051
// CHECK-NOT: flags: DIFlagArtificial
5152
// CHECK-SAME: )
5253
// CHECK: [[S1:!.*]] = !DICompositeType(tag: DW_TAG_structure_type, name: "Suspend1", scope: [[GEN]],

‎tests/codegen/debuginfo-generic-closure-env-names.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
// legacy mangling scheme rustc version and generic parameters are both hashed into a single part
1919
// of the name, thus randomizing item order with respect to rustc version.
2020

21-
//@ compile-flags: -Cdebuginfo=2 --edition 2021 -Copt-level=0 -Csymbol-mangling-version=v0
21+
//@ compile-flags: -Cdebuginfo=2 -Copt-level=0 -Csymbol-mangling-version=v0
22+
//@ edition: 2021
2223

2324
// non_generic_closure()
2425
// NONMSVC: !DICompositeType(tag: DW_TAG_structure_type, name: "{closure_env#0}", scope: ![[non_generic_closure_NAMESPACE:[0-9]+]],

0 commit comments

Comments
 (0)