rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Check for LLVM 11+ when using -Z instrument-coverage

Browse Source 
* `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
This commit is contained in:
Rich Kadel
2020-11-24 11:50:24 -08:00
parent 5d5dc4c9d8
commit 51268d2735
6 changed files with 40 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/rustc_llvm/llvm-wrapper/CoverageMappingWrapper.cpp
View File

@@ -71,7 +71,11 @@ extern "C" void LLVMRustCoverageWriteMapSectionNameToString(LLVMModuleRef M,
extern "C" void LLVMRustCoverageWriteFuncSectionNameToString(LLVMModuleRef M,
RustStringRef Str) {
#if LLVM_VERSION_GE(11, 0)
WriteSectionNameToString(M, IPSK_covfun, Str);
#else
report_fatal_error("rustc option `-Z instrument-coverage` requires LLVM 11 or higher.");
#endif
}
extern "C" void LLVMRustCoverageWriteMappingVarNameToString(RustStringRef Str) {
@@ -81,5 +85,9 @@ extern "C" void LLVMRustCoverageWriteMappingVarNameToString(RustStringRef Str) {
}
extern "C" uint32_t LLVMRustCoverageMappingVersion() {
#if LLVM_VERSION_GE(11, 0)
return coverage::CovMapVersion::Version4;
#else
report_fatal_error("rustc option `-Z instrument-coverage` requires LLVM 11 or higher.");
#endif
}