From 51268d2735ed59b4f6b6351fd75edd0f4cf19c9f Mon Sep 17 00:00:00 2001 From: Rich Kadel Date: Tue, 24 Nov 2020 11:50:24 -0800 Subject: Check for LLVM 11+ when using `-Z instrument-coverage` * `rustc` should now compile under LLVM 9 or 10 * Compiler generates an error if `-Z instrument-coverage` is specified but LLVM version is less than 11 * Coverage tests that require `-Z instrument-coverage` and run codegen should be skipped if LLVM version is less than 11 --- compiler/rustc_codegen_llvm/src/coverageinfo/mapgen.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'compiler/rustc_codegen_llvm/src/coverageinfo/mapgen.rs') diff --git a/compiler/rustc_codegen_llvm/src/coverageinfo/mapgen.rs b/compiler/rustc_codegen_llvm/src/coverageinfo/mapgen.rs index e4a9ac7a5e8..d3de960fbec 100644 --- a/compiler/rustc_codegen_llvm/src/coverageinfo/mapgen.rs +++ b/compiler/rustc_codegen_llvm/src/coverageinfo/mapgen.rs @@ -39,7 +39,7 @@ pub fn finalize<'ll, 'tcx>(cx: &CodegenCx<'ll, 'tcx>) { // Encode coverage mappings and generate function records let mut function_data = Vec::new(); - for (instance, function_coverage) in function_coverage_map.into_iter() { + for (instance, function_coverage) in function_coverage_map { debug!("Generate coverage map for: {:?}", instance); let mangled_function_name = cx.tcx.symbol_name(instance).to_string(); @@ -172,7 +172,7 @@ impl CoverageMapGenerator { // as of `llvm::coverage::CovMapVersion::Version4`. let zero_was_n_records_val = cx.const_u32(0); let filenames_size_val = cx.const_u32(filenames_size as u32); - let zero_was_coverage_size_val = cx.const_u32(0 as u32); + let zero_was_coverage_size_val = cx.const_u32(0); let version_val = cx.const_u32(coverageinfo::mapping_version()); let cov_data_header_val = cx.const_struct( &[zero_was_n_records_val, filenames_size_val, zero_was_coverage_size_val, version_val], -- cgit 1.4.1-3-g733a5