Skip to content

Commit 0a41618

Browse files
rust-timerrust-timer
authored
Unrolled build for rust-lang#128929
Rollup merge of rust-lang#128929 - saethlin:enable-codegen-units-tests, r=compiler-errors Fix codegen-units tests that were disabled 8 years ago I don't know if any of these tests still have value. They were disabled by rust-lang#33890, and we've survived without them for a while. But considering how small this test suite is, maybe it's worth having them. I also had to add some normalization to the codegen-units tests output. I think the fact that I had to add some underscores how poor our test coverage is.
2 parents e08b80c + 03b6c2f commit 0a41618

File tree

5 files changed

+45
-58
lines changed

5 files changed

+45
-58
lines changed

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

+7-1
Original file line numberDiff line numberDiff line change
@@ -3027,11 +3027,17 @@ impl<'test> TestCx<'test> {
30273027
const PREFIX: &str = "MONO_ITEM ";
30283028
const CGU_MARKER: &str = "@@";
30293029

3030+
// Some MonoItems can contain {closure@/path/to/checkout/tests/codgen-units/test.rs}
3031+
// To prevent the current dir from leaking, we just replace the entire path to the test
3032+
// file with TEST_PATH.
30303033
let actual: Vec<MonoItem> = proc_res
30313034
.stdout
30323035
.lines()
30333036
.filter(|line| line.starts_with(PREFIX))
3034-
.map(|line| str_to_mono_item(line, true))
3037+
.map(|line| {
3038+
line.replace(&self.testpaths.file.display().to_string(), "TEST_PATH").to_string()
3039+
})
3040+
.map(|line| str_to_mono_item(&line, true))
30353041
.collect();
30363042

30373043
let expected: Vec<MonoItem> = errors::load_errors(&self.testpaths.file, None)

‎tests/codegen-units/item-collection/auxiliary/cgu_extern_closures.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
//@ compile-flags: -Zinline-mir=no
2+
13
#![crate_type = "lib"]
24

35
#[inline]

‎tests/codegen-units/item-collection/cross-crate-closures.rs

+8-13
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,22 @@
1-
// In the current version of the collector that still has to support
2-
// legacy-codegen, closures do not generate their own MonoItems, so we are
3-
// ignoring this test until MIR codegen has taken over completely
4-
//@ ignore-test
5-
6-
//@ compile-flags:-Zprint-mono-items=eager
1+
// We need to disable MIR inlining in both this and its aux-build crate. The MIR inliner
2+
// will just inline everything into our start function if we let it. As it should.
3+
//@ compile-flags:-Zprint-mono-items=eager -Zinline-mir=no
74

85
#![deny(dead_code)]
96
#![feature(start)]
107

118
//@ aux-build:cgu_extern_closures.rs
129
extern crate cgu_extern_closures;
1310

14-
//~ MONO_ITEM fn cross_crate_closures::start[0]
11+
//~ MONO_ITEM fn start @@ cross_crate_closures-cgu.0[Internal]
1512
#[start]
1613
fn start(_: isize, _: *const *const u8) -> isize {
17-
//~ MONO_ITEM fn cgu_extern_closures::inlined_fn[0]
18-
//~ MONO_ITEM fn cgu_extern_closures::inlined_fn[0]::{{closure}}[0]
14+
//~ MONO_ITEM fn cgu_extern_closures::inlined_fn @@ cross_crate_closures-cgu.0[Internal]
15+
//~ MONO_ITEM fn cgu_extern_closures::inlined_fn::{closure#0} @@ cross_crate_closures-cgu.0[Internal]
1916
let _ = cgu_extern_closures::inlined_fn(1, 2);
2017

21-
//~ MONO_ITEM fn cgu_extern_closures::inlined_fn_generic[0]<i32>
22-
//~ MONO_ITEM fn cgu_extern_closures::inlined_fn_generic[0]::{{closure}}[0]<i32>
18+
//~ MONO_ITEM fn cgu_extern_closures::inlined_fn_generic::<i32> @@ cross_crate_closures-cgu.0[Internal]
19+
//~ MONO_ITEM fn cgu_extern_closures::inlined_fn_generic::<i32>::{closure#0} @@ cross_crate_closures-cgu.0[Internal]
2320
let _ = cgu_extern_closures::inlined_fn_generic(3, 4, 5i32);
2421

2522
// Nothing should be generated for this call, we just link to the instance
@@ -28,5 +25,3 @@ fn start(_: isize, _: *const *const u8) -> isize {
2825

2926
0
3027
}
31-
32-
//~ MONO_ITEM drop-glue i8

‎tests/codegen-units/item-collection/non-generic-closures.rs

+13-17
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,45 @@
1-
// In the current version of the collector that still has to support
2-
// legacy-codegen, closures do not generate their own MonoItems, so we are
3-
// ignoring this test until MIR codegen has taken over completely
4-
//@ ignore-test
5-
6-
//
7-
//@ compile-flags:-Zprint-mono-items=eager
1+
//@ compile-flags:-Zprint-mono-items=eager -Zinline-mir=no
82

93
#![deny(dead_code)]
104
#![feature(start)]
115

12-
//~ MONO_ITEM fn non_generic_closures::temporary[0]
6+
//~ MONO_ITEM fn temporary @@ non_generic_closures-cgu.0[Internal]
137
fn temporary() {
14-
//~ MONO_ITEM fn non_generic_closures::temporary[0]::{{closure}}[0]
8+
//~ MONO_ITEM fn temporary::{closure#0} @@ non_generic_closures-cgu.0[Internal]
159
(|a: u32| {
1610
let _ = a;
1711
})(4);
1812
}
1913

20-
//~ MONO_ITEM fn non_generic_closures::assigned_to_variable_but_not_executed[0]
14+
//~ MONO_ITEM fn assigned_to_variable_but_not_executed @@ non_generic_closures-cgu.0[Internal]
2115
fn assigned_to_variable_but_not_executed() {
22-
//~ MONO_ITEM fn non_generic_closures::assigned_to_variable_but_not_executed[0]::{{closure}}[0]
2316
let _x = |a: i16| {
2417
let _ = a + 1;
2518
};
2619
}
2720

28-
//~ MONO_ITEM fn non_generic_closures::assigned_to_variable_executed_directly[0]
21+
//~ MONO_ITEM fn assigned_to_variable_executed_indirectly @@ non_generic_closures-cgu.0[Internal]
2922
fn assigned_to_variable_executed_indirectly() {
30-
//~ MONO_ITEM fn non_generic_closures::assigned_to_variable_executed_directly[0]::{{closure}}[0]
23+
//~ MONO_ITEM fn assigned_to_variable_executed_indirectly::{closure#0} @@ non_generic_closures-cgu.0[Internal]
24+
//~ MONO_ITEM fn <{closure@TEST_PATH:27:13: 27:21} as std::ops::FnOnce<(i32,)>>::call_once - shim @@ non_generic_closures-cgu.0[Internal]
25+
//~ MONO_ITEM fn <{closure@TEST_PATH:27:13: 27:21} as std::ops::FnOnce<(i32,)>>::call_once - shim(vtable) @@ non_generic_closures-cgu.0[Internal]
26+
//~ MONO_ITEM fn std::ptr::drop_in_place::<{closure@TEST_PATH:27:13: 27:21}> - shim(None) @@ non_generic_closures-cgu.0[Internal]
3127
let f = |a: i32| {
3228
let _ = a + 2;
3329
};
3430
run_closure(&f);
3531
}
3632

37-
//~ MONO_ITEM fn non_generic_closures::assigned_to_variable_executed_indirectly[0]
33+
//~ MONO_ITEM fn assigned_to_variable_executed_directly @@ non_generic_closures-cgu.0[Internal]
3834
fn assigned_to_variable_executed_directly() {
39-
//~ MONO_ITEM fn non_generic_closures::assigned_to_variable_executed_indirectly[0]::{{closure}}[0]
35+
//~ MONO_ITEM fn assigned_to_variable_executed_directly::{closure#0} @@ non_generic_closures-cgu.0[Internal]
4036
let f = |a: i64| {
4137
let _ = a + 3;
4238
};
4339
f(4);
4440
}
4541

46-
//~ MONO_ITEM fn non_generic_closures::start[0]
42+
//~ MONO_ITEM fn start @@ non_generic_closures-cgu.0[Internal]
4743
#[start]
4844
fn start(_: isize, _: *const *const u8) -> isize {
4945
temporary();
@@ -54,7 +50,7 @@ fn start(_: isize, _: *const *const u8) -> isize {
5450
0
5551
}
5652

57-
//~ MONO_ITEM fn non_generic_closures::run_closure[0]
53+
//~ MONO_ITEM fn run_closure @@ non_generic_closures-cgu.0[Internal]
5854
fn run_closure(f: &Fn(i32)) {
5955
f(3);
6056
}

‎tests/codegen-units/partitioning/methods-are-with-self-type.rs

+15-27
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,23 @@
1-
// Currently, all generic functions are instantiated in each codegen unit that
2-
// uses them, even those not marked with #[inline], so this test does not make
3-
// much sense at the moment.
4-
//@ ignore-test
5-
61
// We specify incremental here because we want to test the partitioning for incremental compilation
72
//@ incremental
83
//@ compile-flags:-Zprint-mono-items=lazy
94

10-
#![allow(dead_code)]
11-
#![feature(start)]
5+
#![crate_type = "lib"]
126

13-
struct SomeType;
7+
pub struct SomeType;
148

159
struct SomeGenericType<T1, T2>(T1, T2);
1610

17-
mod mod1 {
11+
pub mod mod1 {
1812
use super::{SomeGenericType, SomeType};
1913

2014
// Even though the impl is in `mod1`, the methods should end up in the
2115
// parent module, since that is where their self-type is.
2216
impl SomeType {
23-
//~ MONO_ITEM fn methods_are_with_self_type::mod1[0]::{{impl}}[0]::method[0] @@ methods_are_with_self_type[External]
24-
fn method(&self) {}
25-
26-
//~ MONO_ITEM fn methods_are_with_self_type::mod1[0]::{{impl}}[0]::associated_fn[0] @@ methods_are_with_self_type[External]
27-
fn associated_fn() {}
17+
//~ MONO_ITEM fn mod1::<impl SomeType>::method @@ methods_are_with_self_type[External]
18+
pub fn method(&self) {}
19+
//~ MONO_ITEM fn mod1::<impl SomeType>::associated_fn @@ methods_are_with_self_type[External]
20+
pub fn associated_fn() {}
2821
}
2922

3023
impl<T1, T2> SomeGenericType<T1, T2> {
@@ -52,25 +45,20 @@ mod type2 {
5245
pub struct Struct;
5346
}
5447

55-
//~ MONO_ITEM fn methods_are_with_self_type::start[0]
56-
#[start]
57-
fn start(_: isize, _: *const *const u8) -> isize {
58-
//~ MONO_ITEM fn methods_are_with_self_type::mod1[0]::{{impl}}[1]::method[0]<u32, u64> @@ methods_are_with_self_type.volatile[WeakODR]
48+
//~ MONO_ITEM fn start @@ methods_are_with_self_type[External]
49+
pub fn start() {
50+
//~ MONO_ITEM fn mod1::<impl SomeGenericType<u32, u64>>::method @@ methods_are_with_self_type.volatile[External]
5951
SomeGenericType(0u32, 0u64).method();
60-
//~ MONO_ITEM fn methods_are_with_self_type::mod1[0]::{{impl}}[1]::associated_fn[0]<char, &str> @@ methods_are_with_self_type.volatile[WeakODR]
52+
//~ MONO_ITEM fn mod1::<impl SomeGenericType<char, &str>>::associated_fn @@ methods_are_with_self_type.volatile[External]
6153
SomeGenericType::associated_fn('c', "&str");
6254

63-
//~ MONO_ITEM fn methods_are_with_self_type::{{impl}}[0]::foo[0]<methods_are_with_self_type::type1[0]::Struct[0]> @@ methods_are_with_self_type-type1.volatile[WeakODR]
55+
//~ MONO_ITEM fn <type1::Struct as Trait>::foo @@ methods_are_with_self_type-type1.volatile[External]
6456
type1::Struct.foo();
65-
//~ MONO_ITEM fn methods_are_with_self_type::{{impl}}[0]::foo[0]<methods_are_with_self_type::type2[0]::Struct[0]> @@ methods_are_with_self_type-type2.volatile[WeakODR]
57+
//~ MONO_ITEM fn <type2::Struct as Trait>::foo @@ methods_are_with_self_type-type2.volatile[External]
6658
type2::Struct.foo();
6759

68-
//~ MONO_ITEM fn methods_are_with_self_type::Trait[0]::default[0]<methods_are_with_self_type::type1[0]::Struct[0]> @@ methods_are_with_self_type-type1.volatile[WeakODR]
60+
//~ MONO_ITEM fn <type1::Struct as Trait>::default @@ methods_are_with_self_type-type1.volatile[External]
6961
type1::Struct.default();
70-
//~ MONO_ITEM fn methods_are_with_self_type::Trait[0]::default[0]<methods_are_with_self_type::type2[0]::Struct[0]> @@ methods_are_with_self_type-type2.volatile[WeakODR]
62+
//~ MONO_ITEM fn <type2::Struct as Trait>::default @@ methods_are_with_self_type-type2.volatile[External]
7163
type2::Struct.default();
72-
73-
0
7464
}
75-
76-
//~ MONO_ITEM drop-glue i8

0 commit comments

Comments
 (0)