Skip to content

Commit 9e4f296

Browse files
committed
Add -Zcodegen-source-order for linkage external tests.
1 parent dd0772b commit 9e4f296

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

tests/ui/linkage-attr/linkage-detect-extern-generated-name-collision.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
//@ build-fail
66
//@ aux-build:def_colliding_external.rs
77
// FIXME(#83838) codegen-units=1 triggers llvm asserts
8-
//@ compile-flags: -Ccodegen-units=16
8+
// FIXME(#144940) `-Zcodegen-source-order` avoids `_rust_extern_with_linkage_collision`
9+
// sorted after the main, otherwise it causes an ICE. Remove this option
10+
// once this issue fixed.
11+
//@ compile-flags: -Ccodegen-units=16 -Zcodegen-source-order
912

1013
extern crate def_colliding_external as dep1;
1114

@@ -19,7 +22,7 @@ mod dep2 {
1922

2023
fn main() {
2124
unsafe {
22-
println!("{:p}", &dep1::collision);
25+
println!("{:p}", &dep1::collision);
2326
}
2427
}
2528

tests/ui/linkage-attr/linkage-detect-local-generated-name-collision.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
//@ build-fail
22
// FIXME(#83838) codegen-units=1 triggers llvm asserts
3-
//@ compile-flags: -Ccodegen-units=16
3+
// FIXME(#144940) `-Zcodegen-source-order` avoids `_rust_extern_with_linkage_collision`
4+
// sorted after the main, otherwise it causes an ICE. Remove this option
5+
// once this issue fixed.
6+
//@ compile-flags: -Ccodegen-units=16 -Zcodegen-source-order
47
#![feature(linkage)]
58

69
mod dep1 {

tests/ui/linkage-attr/linkage-detect-local-generated-name-collision.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: symbol `collision` is already defined
2-
--> $DIR/linkage-detect-local-generated-name-collision.rs:10:9
2+
--> $DIR/linkage-detect-local-generated-name-collision.rs:13:9
33
|
44
LL | pub static collision: *const i32;
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

0 commit comments

Comments
 (0)