From f75a236fe0751a0d9bfb740c32eec14da787f112 Mon Sep 17 00:00:00 2001 From: Rich Kadel Date: Fri, 23 Oct 2020 14:58:08 -0700 Subject: [PATCH] Update compiler/rustc_codegen_llvm/src/coverageinfo/mapgen.rs Co-authored-by: Wesley Wiser --- compiler/rustc_codegen_llvm/src/coverageinfo/mapgen.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/rustc_codegen_llvm/src/coverageinfo/mapgen.rs b/compiler/rustc_codegen_llvm/src/coverageinfo/mapgen.rs index 94ef33ac5b4..c1163a871cf 100644 --- a/compiler/rustc_codegen_llvm/src/coverageinfo/mapgen.rs +++ b/compiler/rustc_codegen_llvm/src/coverageinfo/mapgen.rs @@ -26,10 +26,10 @@ /// undocumented details in Clang's implementation (that may or may not be important) were also /// replicated for Rust's Coverage Map. pub fn finalize<'ll, 'tcx>(cx: &CodegenCx<'ll, 'tcx>) { - if cx.coverage_context().is_none() { - return; - } - let function_coverage_map = cx.coverage_context().unwrap().take_function_coverage_map(); + let function_coverage_map = match cx.coverage_context() { + Some(ctx) => ctx.take_function_coverage_map(), + None => return, + }; if function_coverage_map.is_empty() { // This module has no functions with coverage instrumentation return;