Skip to content

Commit 3ce0567

Browse files
committed
Move invocation_temp into OutputFilenames
While it was previously defined in Session, it is only ever used with OutputFilenames methods.
1 parent b9197b7 commit 3ce0567

1 file changed

Lines changed: 5 additions & 21 deletions

File tree

src/back/write.rs

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,8 @@ pub(crate) fn codegen(
2929
let lto_mode = module.module_llvm.lto_mode;
3030
let lto_supported = module.module_llvm.lto_supported;
3131

32-
let bc_out = cgcx.output_filenames.temp_path_for_cgu(
33-
OutputType::Bitcode,
34-
&module.name,
35-
cgcx.invocation_temp.as_deref(),
36-
);
37-
let obj_out = cgcx.output_filenames.temp_path_for_cgu(
38-
OutputType::Object,
39-
&module.name,
40-
cgcx.invocation_temp.as_deref(),
41-
);
32+
let bc_out = cgcx.output_filenames.temp_path_for_cgu(OutputType::Bitcode, &module.name);
33+
let obj_out = cgcx.output_filenames.temp_path_for_cgu(OutputType::Object, &module.name);
4234

4335
if config.bitcode_needed() {
4436
let _timer =
@@ -82,22 +74,15 @@ pub(crate) fn codegen(
8274
}
8375

8476
if config.emit_ir {
85-
let out = cgcx.output_filenames.temp_path_for_cgu(
86-
OutputType::LlvmAssembly,
87-
&module.name,
88-
cgcx.invocation_temp.as_deref(),
89-
);
77+
let out =
78+
cgcx.output_filenames.temp_path_for_cgu(OutputType::LlvmAssembly, &module.name);
9079
std::fs::write(out, "").expect("write file");
9180
}
9281

9382
if config.emit_asm {
9483
let _timer =
9584
prof.generic_activity_with_arg("GCC_module_codegen_emit_asm", &*module.name);
96-
let path = cgcx.output_filenames.temp_path_for_cgu(
97-
OutputType::Assembly,
98-
&module.name,
99-
cgcx.invocation_temp.as_deref(),
100-
);
85+
let path = cgcx.output_filenames.temp_path_for_cgu(OutputType::Assembly, &module.name);
10186
context.compile_to_file(OutputKind::Assembler, path.to_str().expect("path to str"));
10287
}
10388

@@ -215,7 +200,6 @@ pub(crate) fn codegen(
215200
config.emit_asm,
216201
config.emit_ir,
217202
&cgcx.output_filenames,
218-
cgcx.invocation_temp.as_deref(),
219203
)
220204
}
221205

0 commit comments

Comments
 (0)