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

Simplify the version check

Browse Source 
Address the review comments by simplifying the version check to
just "< 8".
This commit is contained in:
Tom Tromey
2019-01-22 11:44:23 -07:00
parent 1c95f5a34c
commit 9452a8dfa3
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/librustc_codegen_llvm/debuginfo/metadata.rs
View File

@@ -1164,11 +1164,10 @@ fn use_enum_fallback(cx: &CodegenCx) -> bool {
// On MSVC we have to use the fallback mode, because LLVM doesn't // On MSVC we have to use the fallback mode, because LLVM doesn't
// lower variant parts to PDB. // lower variant parts to PDB.
return cx.sess().target.target.options.is_like_msvc return cx.sess().target.target.options.is_like_msvc
|| llvm_util::get_major_version() < 7
// LLVM version 7 did not release with an important bug fix; // LLVM version 7 did not release with an important bug fix;
// but the required patch is in the equivalent Rust LLVM. // but the required patch is in the LLVM 8. Rust LLVM reports
// See https://github.com/rust-lang/rust/issues/57762. // 8 as well.
|| (llvm_util::get_major_version() == 7 && unsafe { !llvm::LLVMRustIsRustLLVM() }); || llvm_util::get_major_version() < 8;
} }
// Describes the members of an enum value: An enum is described as a union of // Describes the members of an enum value: An enum is described as a union of