diff options
| author | kennytm <kennytm@gmail.com> | 2019-03-24 15:32:57 +0800 |
|---|---|---|
| committer | kennytm <kennytm@gmail.com> | 2019-03-24 22:43:48 +0800 |
| commit | 00478a0f3c56db92e2abe4dd73b45d7f380fe43f (patch) | |
| tree | 55e55f82a4faad3fcd0140afe3f937eb4e6109c1 /src/librustc_codegen_llvm | |
| parent | 70cf3255023ec3034256def20f5d7cda0a1e663d (diff) | |
| parent | 8d3dd39d885f427faf3898521e7e1e9319d76b91 (diff) | |
| download | rust-00478a0f3c56db92e2abe4dd73b45d7f380fe43f.tar.gz rust-00478a0f3c56db92e2abe4dd73b45d7f380fe43f.zip | |
Rollup merge of #59377 - smaeul:patch/system-llvm, r=nikic
Correct minimum system LLVM version in tests Since commit 9452a8dfa3ba, the new debug info format is only generated for LLVM 8 and newer versions. However, the tests still assume that LLVM 7 will use the new debug info format. Fix the tests (and a comment in the code) to match the actual version check.
Diffstat (limited to 'src/librustc_codegen_llvm')
| -rw-r--r-- | src/librustc_codegen_llvm/debuginfo/metadata.rs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/librustc_codegen_llvm/debuginfo/metadata.rs b/src/librustc_codegen_llvm/debuginfo/metadata.rs index ddcbf29da83..8efa025e3dd 100644 --- a/src/librustc_codegen_llvm/debuginfo/metadata.rs +++ b/src/librustc_codegen_llvm/debuginfo/metadata.rs @@ -1156,12 +1156,14 @@ fn prepare_union_metadata( // Enums //=----------------------------------------------------------------------------- -// DWARF variant support is only available starting in LLVM 7. +// DWARF variant support is only available starting in LLVM 8. // Although the earlier enum debug info output did not work properly // in all situations, it is better for the time being to continue to // sometimes emit the old style rather than emit something completely -// useless when rust is compiled against LLVM 6 or older. This -// function decides which representation will be emitted. +// useless when rust is compiled against LLVM 6 or older. LLVM 7 +// contains an early version of the DWARF variant support, and will +// crash when handling the new debug info format. This function +// decides which representation will be emitted. fn use_enum_fallback(cx: &CodegenCx<'_, '_>) -> bool { // On MSVC we have to use the fallback mode, because LLVM doesn't // lower variant parts to PDB. |
