From f8261b496d5c94bd8d6ad5dcce0cb5cc2e0e3fe5 Mon Sep 17 00:00:00 2001 From: Nicholas Nethercote Date: Sat, 21 Mar 2020 09:15:07 +1100 Subject: [PATCH] Factor out a repeated `config.obj_is_bitcode` test. --- src/librustc_codegen_llvm/back/write.rs | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/librustc_codegen_llvm/back/write.rs b/src/librustc_codegen_llvm/back/write.rs index 2826de1e490d2..1df8ee6746d89 100644 --- a/src/librustc_codegen_llvm/back/write.rs +++ b/src/librustc_codegen_llvm/back/write.rs @@ -773,17 +773,19 @@ pub(crate) unsafe fn codegen( } } - if config.emit_obj && config.obj_is_bitcode { - debug!("copying bitcode {:?} to obj {:?}", bc_out, obj_out); - if let Err(e) = link_or_copy(&bc_out, &obj_out) { - diag_handler.err(&format!("failed to copy bitcode to object file: {}", e)); + if config.obj_is_bitcode { + if config.emit_obj { + debug!("copying bitcode {:?} to obj {:?}", bc_out, obj_out); + if let Err(e) = link_or_copy(&bc_out, &obj_out) { + diag_handler.err(&format!("failed to copy bitcode to object file: {}", e)); + } } - } - if !config.emit_bc && config.obj_is_bitcode { - debug!("removing_bitcode {:?}", bc_out); - if let Err(e) = fs::remove_file(&bc_out) { - diag_handler.err(&format!("failed to remove bitcode: {}", e)); + if !config.emit_bc { + debug!("removing_bitcode {:?}", bc_out); + if let Err(e) = fs::remove_file(&bc_out) { + diag_handler.err(&format!("failed to remove bitcode: {}", e)); + } } }