commit ab998a2eeb2bcdc69ce70c814af97f0d1302a404 (from d17f62d857c70508efbf60be41135880bcd2e062)

Merge: d17f62d857c7 9452a8dfa3ba

Author: Mazdak Farrokhzad <twingoow@gmail.com>

Date:   Thu Jan 24 00:20:00 2019 +0100

    Rollup merge of #57840 - tromey:fix-issue-57762, r=nikic

    Fix issue 57762

    against a stock LLVM 7.  LLVM 7 was released without a necessary fix

    for a bug in the DWARF discriminant code.

    This patch changes rustc to use the fallback mode on (non-Rust) LLVM 7.

    Closes #57762

diff --git a/src/librustc_codegen_llvm/debuginfo/metadata.rs b/src/librustc_codegen_llvm/debuginfo/metadata.rs

index 6deedd0b5ea3..9f63038c3623 100644

--- a/src/librustc_codegen_llvm/debuginfo/metadata.rs

+++ b/src/librustc_codegen_llvm/debuginfo/metadata.rs

@@ -1164,7 +1164,10 @@ 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.

     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;

+        // but the required patch is in the LLVM 8.  Rust LLVM reports

+        // 8 as well.

+        || llvm_util::get_major_version() < 8;

 }

 // Describes the members of an enum value: An enum is described as a union of