bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Introduce a local variable config_emit_normal_obj.

Browse source 
This adds a missing `!config.obj_is_bitcode` condition to two places
that should have it.

As a result, when `obj_is_bitcode` and `no_integrated_as` are both true,
the compiler will no longer unnecessarily emit asm, convert it to an
object file, and then overwrite that object file with bitcode.
This commit is contained in:
Nicholas Nethercote 2020-03-21 09:19:21 +11:00
parent f8261b496d
commit a147cd070e
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/librustc_codegen_llvm/back/write.rs
View file

@ -732,7 +732,9 @@ pub(crate) unsafe fn codegen(
})?; })?;
} }
if config.emit_asm || (config.emit_obj && config.no_integrated_as) { let config_emit_normal_obj = config.emit_obj && !config.obj_is_bitcode;
if config.emit_asm || (config_emit_normal_obj && config.no_integrated_as) {
let _timer = cgcx let _timer = cgcx
.prof .prof
.generic_activity_with_arg("LLVM_module_codegen_emit_asm", &module.name[..]); .generic_activity_with_arg("LLVM_module_codegen_emit_asm", &module.name[..]);
@ -747,7 +749,7 @@ pub(crate) unsafe fn codegen(
})?; })?;
} }
if config.emit_obj && !config.obj_is_bitcode && !config.no_integrated_as { if config_emit_normal_obj && !config.no_integrated_as {
let _timer = cgcx let _timer = cgcx
.prof .prof
.generic_activity_with_arg("LLVM_module_codegen_emit_obj", &module.name[..]); .generic_activity_with_arg("LLVM_module_codegen_emit_obj", &module.name[..]);
@ -761,7 +763,7 @@ pub(crate) unsafe fn codegen(
llvm::FileType::ObjectFile, llvm::FileType::ObjectFile,
) )
})?; })?;
} else if config.emit_obj && config.no_integrated_as { } else if config_emit_normal_obj && config.no_integrated_as {
let _timer = cgcx let _timer = cgcx
.prof .prof
.generic_activity_with_arg("LLVM_module_codegen_asm_to_obj", &module.name[..]); .generic_activity_with_arg("LLVM_module_codegen_asm_to_obj", &module.name[..]);