[lld] r285321 - Fix build breakage on buildbots that was due to 285309.

[Greg Clayton via llvm-commits]

Author: gclayton
Date: Thu Oct 27 12:43:39 2016
New Revision: 285321

URL: http://llvm.org/viewvc/llvm-project?rev=285321&view=rev
Log:
Fix build breakage on buildbots that was due to 285309.


Modified:
    lld/trunk/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp

Modified: lld/trunk/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp?rev=285321&r1=285320&r2=285321&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp (original)
+++ lld/trunk/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp Thu Oct 27 12:43:39 2016
@@ -853,7 +853,7 @@ static uint32_t getCUAbbrevOffset(llvm::
 //        inspection" code if possible.
 static Expected<const char *>
 getIndexedString(const NormalizedFile &normalizedFile,
-                 uint32_t form, llvm::DataExtractor infoData,
+                 llvm::dwarf::Form form, llvm::DataExtractor infoData,
                  uint32_t &infoOffset, const Section &stringsSection) {
   if (form == llvm::dwarf::DW_FORM_string)
    return infoData.getCStr(&infoOffset);
@@ -902,10 +902,11 @@ readCompUnit(const NormalizedFile &norma
   // DW_CHILDREN
   abbrevData.getU8(&abbrevOffset);
   uint32_t name;
-  uint32_t form;
+  llvm::dwarf::Form form;
   TranslationUnitSource tu;
   while ((name = abbrevData.getULEB128(&abbrevOffset)) |
-             (form = abbrevData.getULEB128(&abbrevOffset)) &&
+         (form = static_cast<llvm::dwarf::Form>(
+             abbrevData.getULEB128(&abbrevOffset))) &&
          (name != 0 || form != 0)) {
     switch (name) {
     case llvm::dwarf::DW_AT_name: {