From 9a134fc917ad83e00bf5f591f296643749776859 Mon Sep 17 00:00:00 2001
From: Greg Clayton <gclayton@apple.com>
Date: Thu, 27 Oct 2016 17:43:39 +0000
Subject: [PATCH] Fix build breakage on buildbots that was due to 285309.

llvm-svn: 285321
---
 lld/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lld/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp b/lld/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp
index b0ef1c9..6c8c09b 100644
--- a/lld/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp
+++ b/lld/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp
@@ -853,7 +853,7 @@ static uint32_t getCUAbbrevOffset(llvm::DataExtractor abbrevData,
 //        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 &normalizedFile,
   // 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: {
-- 
2.7.4