Skip to content

Commit c93e62b

Browse files
michaelwoeristermichaelwoerister
committed
Adapt cgu-partitioning tests to pre-trans symbol internalization.
1 parent 2f07eb3 commit c93e62b

10 files changed

+53
-53
lines changed

‎src/test/codegen-units/partitioning/extern-drop-glue.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ extern crate cgu_extern_drop_glue;
2424

2525
struct LocalStruct(cgu_extern_drop_glue::Struct);
2626

27-
//~ TRANS_ITEM fn extern_drop_glue::user[0] @@ extern_drop_glue[External]
27+
//~ TRANS_ITEM fn extern_drop_glue::user[0] @@ extern_drop_glue[Internal]
2828
fn user()
2929
{
3030
//~ TRANS_ITEM fn core::ptr[0]::drop_in_place[0]<extern_drop_glue::LocalStruct[0]> @@ extern_drop_glue[Internal]
@@ -36,7 +36,7 @@ mod mod1 {
3636

3737
struct LocalStruct(cgu_extern_drop_glue::Struct);
3838

39-
//~ TRANS_ITEM fn extern_drop_glue::mod1[0]::user[0] @@ extern_drop_glue-mod1[External]
39+
//~ TRANS_ITEM fn extern_drop_glue::mod1[0]::user[0] @@ extern_drop_glue-mod1[Internal]
4040
fn user()
4141
{
4242
//~ TRANS_ITEM fn core::ptr[0]::drop_in_place[0]<extern_drop_glue::mod1[0]::LocalStruct[0]> @@ extern_drop_glue-mod1[Internal]

‎src/test/codegen-units/partitioning/extern-generic.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,23 @@
1919
// aux-build:cgu_generic_function.rs
2020
extern crate cgu_generic_function;
2121

22-
//~ TRANS_ITEM fn extern_generic::user[0] @@ extern_generic[External]
22+
//~ TRANS_ITEM fn extern_generic::user[0] @@ extern_generic[Internal]
2323
fn user() {
2424
let _ = cgu_generic_function::foo("abc");
2525
}
2626

2727
mod mod1 {
2828
use cgu_generic_function;
2929

30-
//~ TRANS_ITEM fn extern_generic::mod1[0]::user[0] @@ extern_generic-mod1[External]
30+
//~ TRANS_ITEM fn extern_generic::mod1[0]::user[0] @@ extern_generic-mod1[Internal]
3131
fn user() {
3232
let _ = cgu_generic_function::foo("abc");
3333
}
3434

3535
mod mod1 {
3636
use cgu_generic_function;
3737

38-
//~ TRANS_ITEM fn extern_generic::mod1[0]::mod1[0]::user[0] @@ extern_generic-mod1-mod1[External]
38+
//~ TRANS_ITEM fn extern_generic::mod1[0]::mod1[0]::user[0] @@ extern_generic-mod1-mod1[Internal]
3939
fn user() {
4040
let _ = cgu_generic_function::foo("abc");
4141
}
@@ -45,18 +45,18 @@ mod mod1 {
4545
mod mod2 {
4646
use cgu_generic_function;
4747

48-
//~ TRANS_ITEM fn extern_generic::mod2[0]::user[0] @@ extern_generic-mod2[External]
48+
//~ TRANS_ITEM fn extern_generic::mod2[0]::user[0] @@ extern_generic-mod2[Internal]
4949
fn user() {
5050
let _ = cgu_generic_function::foo("abc");
5151
}
5252
}
5353

5454
mod mod3 {
55-
//~ TRANS_ITEM fn extern_generic::mod3[0]::non_user[0] @@ extern_generic-mod3[External]
55+
//~ TRANS_ITEM fn extern_generic::mod3[0]::non_user[0] @@ extern_generic-mod3[Internal]
5656
fn non_user() {}
5757
}
5858

5959
// Make sure the two generic functions from the extern crate get instantiated
6060
// once for the current crate
6161
//~ TRANS_ITEM fn cgu_generic_function::foo[0]<&str> @@ cgu_generic_function.volatile[External]
62-
//~ TRANS_ITEM fn cgu_generic_function::bar[0]<&str> @@ cgu_generic_function.volatile[External]
62+
//~ TRANS_ITEM fn cgu_generic_function::bar[0]<&str> @@ cgu_generic_function.volatile[Internal]

‎src/test/codegen-units/partitioning/inlining-from-extern-crate.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ pub fn user()
3737
mod mod1 {
3838
use cgu_explicit_inlining;
3939

40-
//~ TRANS_ITEM fn inlining_from_extern_crate::mod1[0]::user[0] @@ inlining_from_extern_crate-mod1[External]
40+
//~ TRANS_ITEM fn inlining_from_extern_crate::mod1[0]::user[0] @@ inlining_from_extern_crate-mod1[Internal]
4141
pub fn user()
4242
{
4343
cgu_explicit_inlining::inlined();
@@ -50,7 +50,7 @@ mod mod1 {
5050
mod mod2 {
5151
use cgu_explicit_inlining;
5252

53-
//~ TRANS_ITEM fn inlining_from_extern_crate::mod2[0]::user[0] @@ inlining_from_extern_crate-mod2[External]
53+
//~ TRANS_ITEM fn inlining_from_extern_crate::mod2[0]::user[0] @@ inlining_from_extern_crate-mod2[Internal]
5454
pub fn user()
5555
{
5656
cgu_explicit_inlining::always_inlined();

‎src/test/codegen-units/partitioning/local-drop-glue.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ struct Outer {
3131
_a: Struct
3232
}
3333

34-
//~ TRANS_ITEM fn local_drop_glue::user[0] @@ local_drop_glue[External]
34+
//~ TRANS_ITEM fn local_drop_glue::user[0] @@ local_drop_glue[Internal]
3535
fn user()
3636
{
3737
let _ = Outer {
@@ -52,7 +52,7 @@ mod mod1
5252
_b: (u32, Struct),
5353
}
5454

55-
//~ TRANS_ITEM fn local_drop_glue::mod1[0]::user[0] @@ local_drop_glue-mod1[External]
55+
//~ TRANS_ITEM fn local_drop_glue::mod1[0]::user[0] @@ local_drop_glue-mod1[Internal]
5656
fn user()
5757
{
5858
let _ = Struct2 {

‎src/test/codegen-units/partitioning/local-generic.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,23 @@
2222
//~ TRANS_ITEM fn local_generic::generic[0]<&str> @@ local_generic.volatile[External]
2323
pub fn generic<T>(x: T) -> T { x }
2424

25-
//~ TRANS_ITEM fn local_generic::user[0] @@ local_generic[External]
25+
//~ TRANS_ITEM fn local_generic::user[0] @@ local_generic[Internal]
2626
fn user() {
2727
let _ = generic(0u32);
2828
}
2929

3030
mod mod1 {
3131
pub use super::generic;
3232

33-
//~ TRANS_ITEM fn local_generic::mod1[0]::user[0] @@ local_generic-mod1[External]
33+
//~ TRANS_ITEM fn local_generic::mod1[0]::user[0] @@ local_generic-mod1[Internal]
3434
fn user() {
3535
let _ = generic(0u64);
3636
}
3737

3838
mod mod1 {
3939
use super::generic;
4040

41-
//~ TRANS_ITEM fn local_generic::mod1[0]::mod1[0]::user[0] @@ local_generic-mod1-mod1[External]
41+
//~ TRANS_ITEM fn local_generic::mod1[0]::mod1[0]::user[0] @@ local_generic-mod1-mod1[Internal]
4242
fn user() {
4343
let _ = generic('c');
4444
}
@@ -48,7 +48,7 @@ mod mod1 {
4848
mod mod2 {
4949
use super::generic;
5050

51-
//~ TRANS_ITEM fn local_generic::mod2[0]::user[0] @@ local_generic-mod2[External]
51+
//~ TRANS_ITEM fn local_generic::mod2[0]::user[0] @@ local_generic-mod2[Internal]
5252
fn user() {
5353
let _ = generic("abc");
5454
}

‎src/test/codegen-units/partitioning/local-inlining.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ mod inline {
3030
mod user1 {
3131
use super::inline;
3232

33-
//~ TRANS_ITEM fn local_inlining::user1[0]::foo[0] @@ local_inlining-user1[External]
33+
//~ TRANS_ITEM fn local_inlining::user1[0]::foo[0] @@ local_inlining-user1[Internal]
3434
fn foo() {
3535
inline::inlined_function();
3636
}
@@ -39,15 +39,15 @@ mod user1 {
3939
mod user2 {
4040
use super::inline;
4141

42-
//~ TRANS_ITEM fn local_inlining::user2[0]::bar[0] @@ local_inlining-user2[External]
42+
//~ TRANS_ITEM fn local_inlining::user2[0]::bar[0] @@ local_inlining-user2[Internal]
4343
fn bar() {
4444
inline::inlined_function();
4545
}
4646
}
4747

4848
mod non_user {
4949

50-
//~ TRANS_ITEM fn local_inlining::non_user[0]::baz[0] @@ local_inlining-non_user[External]
50+
//~ TRANS_ITEM fn local_inlining::non_user[0]::baz[0] @@ local_inlining-non_user[Internal]
5151
fn baz() {
5252

5353
}

‎src/test/codegen-units/partitioning/local-transitive-inlining.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ mod direct_user {
3939
mod indirect_user {
4040
use super::direct_user;
4141

42-
//~ TRANS_ITEM fn local_transitive_inlining::indirect_user[0]::bar[0] @@ local_transitive_inlining-indirect_user[External]
42+
//~ TRANS_ITEM fn local_transitive_inlining::indirect_user[0]::bar[0] @@ local_transitive_inlining-indirect_user[Internal]
4343
fn bar() {
4444
direct_user::foo();
4545
}
4646
}
4747

4848
mod non_user {
4949

50-
//~ TRANS_ITEM fn local_transitive_inlining::non_user[0]::baz[0] @@ local_transitive_inlining-non_user[External]
50+
//~ TRANS_ITEM fn local_transitive_inlining::non_user[0]::baz[0] @@ local_transitive_inlining-non_user[Internal]
5151
fn baz() {
5252

5353
}

‎src/test/codegen-units/partitioning/regular-modules.rs

+21-21
Original file line numberDiff line numberDiff line change
@@ -16,67 +16,67 @@
1616
#![allow(dead_code)]
1717
#![crate_type="lib"]
1818

19-
//~ TRANS_ITEM fn regular_modules::foo[0] @@ regular_modules[External]
19+
//~ TRANS_ITEM fn regular_modules::foo[0] @@ regular_modules[Internal]
2020
fn foo() {}
2121

22-
//~ TRANS_ITEM fn regular_modules::bar[0] @@ regular_modules[External]
22+
//~ TRANS_ITEM fn regular_modules::bar[0] @@ regular_modules[Internal]
2323
fn bar() {}
2424

25-
//~ TRANS_ITEM static regular_modules::BAZ[0] @@ regular_modules[External]
25+
//~ TRANS_ITEM static regular_modules::BAZ[0] @@ regular_modules[Internal]
2626
static BAZ: u64 = 0;
2727

2828
mod mod1 {
2929

30-
//~ TRANS_ITEM fn regular_modules::mod1[0]::foo[0] @@ regular_modules-mod1[External]
30+
//~ TRANS_ITEM fn regular_modules::mod1[0]::foo[0] @@ regular_modules-mod1[Internal]
3131
fn foo() {}
32-
//~ TRANS_ITEM fn regular_modules::mod1[0]::bar[0] @@ regular_modules-mod1[External]
32+
//~ TRANS_ITEM fn regular_modules::mod1[0]::bar[0] @@ regular_modules-mod1[Internal]
3333
fn bar() {}
34-
//~ TRANS_ITEM static regular_modules::mod1[0]::BAZ[0] @@ regular_modules-mod1[External]
34+
//~ TRANS_ITEM static regular_modules::mod1[0]::BAZ[0] @@ regular_modules-mod1[Internal]
3535
static BAZ: u64 = 0;
3636

3737
mod mod1 {
38-
//~ TRANS_ITEM fn regular_modules::mod1[0]::mod1[0]::foo[0] @@ regular_modules-mod1-mod1[External]
38+
//~ TRANS_ITEM fn regular_modules::mod1[0]::mod1[0]::foo[0] @@ regular_modules-mod1-mod1[Internal]
3939
fn foo() {}
40-
//~ TRANS_ITEM fn regular_modules::mod1[0]::mod1[0]::bar[0] @@ regular_modules-mod1-mod1[External]
40+
//~ TRANS_ITEM fn regular_modules::mod1[0]::mod1[0]::bar[0] @@ regular_modules-mod1-mod1[Internal]
4141
fn bar() {}
42-
//~ TRANS_ITEM static regular_modules::mod1[0]::mod1[0]::BAZ[0] @@ regular_modules-mod1-mod1[External]
42+
//~ TRANS_ITEM static regular_modules::mod1[0]::mod1[0]::BAZ[0] @@ regular_modules-mod1-mod1[Internal]
4343
static BAZ: u64 = 0;
4444
}
4545

4646
mod mod2 {
47-
//~ TRANS_ITEM fn regular_modules::mod1[0]::mod2[0]::foo[0] @@ regular_modules-mod1-mod2[External]
47+
//~ TRANS_ITEM fn regular_modules::mod1[0]::mod2[0]::foo[0] @@ regular_modules-mod1-mod2[Internal]
4848
fn foo() {}
49-
//~ TRANS_ITEM fn regular_modules::mod1[0]::mod2[0]::bar[0] @@ regular_modules-mod1-mod2[External]
49+
//~ TRANS_ITEM fn regular_modules::mod1[0]::mod2[0]::bar[0] @@ regular_modules-mod1-mod2[Internal]
5050
fn bar() {}
51-
//~ TRANS_ITEM static regular_modules::mod1[0]::mod2[0]::BAZ[0] @@ regular_modules-mod1-mod2[External]
51+
//~ TRANS_ITEM static regular_modules::mod1[0]::mod2[0]::BAZ[0] @@ regular_modules-mod1-mod2[Internal]
5252
static BAZ: u64 = 0;
5353
}
5454
}
5555

5656
mod mod2 {
5757

58-
//~ TRANS_ITEM fn regular_modules::mod2[0]::foo[0] @@ regular_modules-mod2[External]
58+
//~ TRANS_ITEM fn regular_modules::mod2[0]::foo[0] @@ regular_modules-mod2[Internal]
5959
fn foo() {}
60-
//~ TRANS_ITEM fn regular_modules::mod2[0]::bar[0] @@ regular_modules-mod2[External]
60+
//~ TRANS_ITEM fn regular_modules::mod2[0]::bar[0] @@ regular_modules-mod2[Internal]
6161
fn bar() {}
62-
//~ TRANS_ITEM static regular_modules::mod2[0]::BAZ[0] @@ regular_modules-mod2[External]
62+
//~ TRANS_ITEM static regular_modules::mod2[0]::BAZ[0] @@ regular_modules-mod2[Internal]
6363
static BAZ: u64 = 0;
6464

6565
mod mod1 {
66-
//~ TRANS_ITEM fn regular_modules::mod2[0]::mod1[0]::foo[0] @@ regular_modules-mod2-mod1[External]
66+
//~ TRANS_ITEM fn regular_modules::mod2[0]::mod1[0]::foo[0] @@ regular_modules-mod2-mod1[Internal]
6767
fn foo() {}
68-
//~ TRANS_ITEM fn regular_modules::mod2[0]::mod1[0]::bar[0] @@ regular_modules-mod2-mod1[External]
68+
//~ TRANS_ITEM fn regular_modules::mod2[0]::mod1[0]::bar[0] @@ regular_modules-mod2-mod1[Internal]
6969
fn bar() {}
70-
//~ TRANS_ITEM static regular_modules::mod2[0]::mod1[0]::BAZ[0] @@ regular_modules-mod2-mod1[External]
70+
//~ TRANS_ITEM static regular_modules::mod2[0]::mod1[0]::BAZ[0] @@ regular_modules-mod2-mod1[Internal]
7171
static BAZ: u64 = 0;
7272
}
7373

7474
mod mod2 {
75-
//~ TRANS_ITEM fn regular_modules::mod2[0]::mod2[0]::foo[0] @@ regular_modules-mod2-mod2[External]
75+
//~ TRANS_ITEM fn regular_modules::mod2[0]::mod2[0]::foo[0] @@ regular_modules-mod2-mod2[Internal]
7676
fn foo() {}
77-
//~ TRANS_ITEM fn regular_modules::mod2[0]::mod2[0]::bar[0] @@ regular_modules-mod2-mod2[External]
77+
//~ TRANS_ITEM fn regular_modules::mod2[0]::mod2[0]::bar[0] @@ regular_modules-mod2-mod2[Internal]
7878
fn bar() {}
79-
//~ TRANS_ITEM static regular_modules::mod2[0]::mod2[0]::BAZ[0] @@ regular_modules-mod2-mod2[External]
79+
//~ TRANS_ITEM static regular_modules::mod2[0]::mod2[0]::BAZ[0] @@ regular_modules-mod2-mod2[Internal]
8080
static BAZ: u64 = 0;
8181
}
8282
}

‎src/test/codegen-units/partitioning/statics.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -15,34 +15,34 @@
1515

1616
#![crate_type="lib"]
1717

18-
//~ TRANS_ITEM static statics::FOO[0] @@ statics[External]
18+
//~ TRANS_ITEM static statics::FOO[0] @@ statics[Internal]
1919
static FOO: u32 = 0;
2020

21-
//~ TRANS_ITEM static statics::BAR[0] @@ statics[External]
21+
//~ TRANS_ITEM static statics::BAR[0] @@ statics[Internal]
2222
static BAR: u32 = 0;
2323

24-
//~ TRANS_ITEM fn statics::function[0] @@ statics[External]
24+
//~ TRANS_ITEM fn statics::function[0] @@ statics[Internal]
2525
fn function() {
26-
//~ TRANS_ITEM static statics::function[0]::FOO[0] @@ statics[External]
26+
//~ TRANS_ITEM static statics::function[0]::FOO[0] @@ statics[Internal]
2727
static FOO: u32 = 0;
2828

29-
//~ TRANS_ITEM static statics::function[0]::BAR[0] @@ statics[External]
29+
//~ TRANS_ITEM static statics::function[0]::BAR[0] @@ statics[Internal]
3030
static BAR: u32 = 0;
3131
}
3232

3333
mod mod1 {
34-
//~ TRANS_ITEM static statics::mod1[0]::FOO[0] @@ statics-mod1[External]
34+
//~ TRANS_ITEM static statics::mod1[0]::FOO[0] @@ statics-mod1[Internal]
3535
static FOO: u32 = 0;
3636

37-
//~ TRANS_ITEM static statics::mod1[0]::BAR[0] @@ statics-mod1[External]
37+
//~ TRANS_ITEM static statics::mod1[0]::BAR[0] @@ statics-mod1[Internal]
3838
static BAR: u32 = 0;
3939

40-
//~ TRANS_ITEM fn statics::mod1[0]::function[0] @@ statics-mod1[External]
40+
//~ TRANS_ITEM fn statics::mod1[0]::function[0] @@ statics-mod1[Internal]
4141
fn function() {
42-
//~ TRANS_ITEM static statics::mod1[0]::function[0]::FOO[0] @@ statics-mod1[External]
42+
//~ TRANS_ITEM static statics::mod1[0]::function[0]::FOO[0] @@ statics-mod1[Internal]
4343
static FOO: u32 = 0;
4444

45-
//~ TRANS_ITEM static statics::mod1[0]::function[0]::BAR[0] @@ statics-mod1[External]
45+
//~ TRANS_ITEM static statics::mod1[0]::function[0]::BAR[0] @@ statics-mod1[Internal]
4646
static BAR: u32 = 0;
4747
}
4848
}

‎src/test/codegen-units/partitioning/vtable-through-const.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ mod mod1 {
6767
pub const ID_I64: fn(i64) -> i64 = id::<i64>;
6868
}
6969

70-
//~ TRANS_ITEM fn vtable_through_const::main[0] @@ vtable_through_const[External]
70+
//~ TRANS_ITEM fn vtable_through_const::main[0] @@ vtable_through_const[Internal]
7171
fn main() {
7272
//~ TRANS_ITEM fn core::ptr[0]::drop_in_place[0]<u32> @@ vtable_through_const[Internal]
7373

0 commit comments

Comments
 (0)