Skip to content

Commit d97cef0

Browse files
authored
Rollup merge of #111251 - mj10021:issue-109502-follow-up, r=oli-obk
Issue 109502 follow up, remove unnecessary Vec::new() from compile_test() As mentioned in comment on PR #110773 , adding a separate function to pass the test passes into the `dump-mir` is a bit nicer
2 parents ce71f57 + 2da54a9 commit d97cef0

File tree

1 file changed

+21
-13
lines changed

1 file changed

+21
-13
lines changed

src/tools/compiletest/src/runtest.rs

+21-13
Original file line numberDiff line numberDiff line change
@@ -319,8 +319,7 @@ impl<'test> TestCx<'test> {
319319

320320
fn run_cfail_test(&self) {
321321
let pm = self.pass_mode();
322-
let proc_res =
323-
self.compile_test(WillExecute::No, self.should_emit_metadata(pm), Vec::new());
322+
let proc_res = self.compile_test(WillExecute::No, self.should_emit_metadata(pm));
324323
self.check_if_test_should_compile(&proc_res, pm);
325324
self.check_no_compiler_crash(&proc_res, self.props.should_ice);
326325

@@ -348,7 +347,7 @@ impl<'test> TestCx<'test> {
348347
fn run_rfail_test(&self) {
349348
let pm = self.pass_mode();
350349
let should_run = self.run_if_enabled();
351-
let proc_res = self.compile_test(should_run, self.should_emit_metadata(pm), Vec::new());
350+
let proc_res = self.compile_test(should_run, self.should_emit_metadata(pm));
352351

353352
if !proc_res.status.success() {
354353
self.fatal_proc_rec("compilation failed!", &proc_res);
@@ -396,7 +395,7 @@ impl<'test> TestCx<'test> {
396395

397396
fn run_cpass_test(&self) {
398397
let emit_metadata = self.should_emit_metadata(self.pass_mode());
399-
let proc_res = self.compile_test(WillExecute::No, emit_metadata, Vec::new());
398+
let proc_res = self.compile_test(WillExecute::No, emit_metadata);
400399

401400
if !proc_res.status.success() {
402401
self.fatal_proc_rec("compilation failed!", &proc_res);
@@ -411,7 +410,7 @@ impl<'test> TestCx<'test> {
411410
fn run_rpass_test(&self) {
412411
let emit_metadata = self.should_emit_metadata(self.pass_mode());
413412
let should_run = self.run_if_enabled();
414-
let proc_res = self.compile_test(should_run, emit_metadata, Vec::new());
413+
let proc_res = self.compile_test(should_run, emit_metadata);
415414

416415
if !proc_res.status.success() {
417416
self.fatal_proc_rec("compilation failed!", &proc_res);
@@ -441,7 +440,7 @@ impl<'test> TestCx<'test> {
441440
}
442441

443442
let should_run = self.run_if_enabled();
444-
let mut proc_res = self.compile_test(should_run, Emit::None, Vec::new());
443+
let mut proc_res = self.compile_test(should_run, Emit::None);
445444

446445
if !proc_res.status.success() {
447446
self.fatal_proc_rec("compilation failed!", &proc_res);
@@ -687,7 +686,7 @@ impl<'test> TestCx<'test> {
687686

688687
// compile test file (it should have 'compile-flags:-g' in the header)
689688
let should_run = self.run_if_enabled();
690-
let compile_result = self.compile_test(should_run, Emit::None, Vec::new());
689+
let compile_result = self.compile_test(should_run, Emit::None);
691690
if !compile_result.status.success() {
692691
self.fatal_proc_rec("compilation failed!", &compile_result);
693692
}
@@ -807,7 +806,7 @@ impl<'test> TestCx<'test> {
807806

808807
// compile test file (it should have 'compile-flags:-g' in the header)
809808
let should_run = self.run_if_enabled();
810-
let compiler_run_result = self.compile_test(should_run, Emit::None, Vec::new());
809+
let compiler_run_result = self.compile_test(should_run, Emit::None);
811810
if !compiler_run_result.status.success() {
812811
self.fatal_proc_rec("compilation failed!", &compiler_run_result);
813812
}
@@ -1044,7 +1043,7 @@ impl<'test> TestCx<'test> {
10441043
fn run_debuginfo_lldb_test_no_opt(&self) {
10451044
// compile test file (it should have 'compile-flags:-g' in the header)
10461045
let should_run = self.run_if_enabled();
1047-
let compile_result = self.compile_test(should_run, Emit::None, Vec::new());
1046+
let compile_result = self.compile_test(should_run, Emit::None);
10481047
if !compile_result.status.success() {
10491048
self.fatal_proc_rec("compilation failed!", &compile_result);
10501049
}
@@ -1483,7 +1482,16 @@ impl<'test> TestCx<'test> {
14831482
}
14841483
}
14851484

1486-
fn compile_test(&self, will_execute: WillExecute, emit: Emit, passes: Vec<String>) -> ProcRes {
1485+
fn compile_test(&self, will_execute: WillExecute, emit: Emit) -> ProcRes {
1486+
self.compile_test_general(will_execute, emit, self.props.local_pass_mode(), Vec::new())
1487+
}
1488+
1489+
fn compile_test_with_passes(
1490+
&self,
1491+
will_execute: WillExecute,
1492+
emit: Emit,
1493+
passes: Vec<String>,
1494+
) -> ProcRes {
14871495
self.compile_test_general(will_execute, emit, self.props.local_pass_mode(), passes)
14881496
}
14891497

@@ -2791,7 +2799,7 @@ impl<'test> TestCx<'test> {
27912799
fn run_codegen_units_test(&self) {
27922800
assert!(self.revision.is_none(), "revisions not relevant here");
27932801

2794-
let proc_res = self.compile_test(WillExecute::No, Emit::None, Vec::new());
2802+
let proc_res = self.compile_test(WillExecute::No, Emit::None);
27952803

27962804
if !proc_res.status.success() {
27972805
self.fatal_proc_rec("compilation failed!", &proc_res);
@@ -3340,7 +3348,7 @@ impl<'test> TestCx<'test> {
33403348
let pm = self.pass_mode();
33413349
let should_run = self.should_run(pm);
33423350
let emit_metadata = self.should_emit_metadata(pm);
3343-
let proc_res = self.compile_test(should_run, emit_metadata, Vec::new());
3351+
let proc_res = self.compile_test(should_run, emit_metadata);
33443352
self.check_if_test_should_compile(&proc_res, pm);
33453353

33463354
// if the user specified a format in the ui test
@@ -3523,7 +3531,7 @@ impl<'test> TestCx<'test> {
35233531
let emit_metadata = self.should_emit_metadata(pm);
35243532
let passes = self.get_passes();
35253533

3526-
let proc_res = self.compile_test(should_run, emit_metadata, passes);
3534+
let proc_res = self.compile_test_with_passes(should_run, emit_metadata, passes);
35273535
self.check_mir_dump();
35283536
if !proc_res.status.success() {
35293537
self.fatal_proc_rec("compilation failed!", &proc_res);

0 commit comments

Comments
 (0)