From 4ea16835ba66f2240d050ffcaee44cee6c97cab9 Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Mon, 26 Jun 2017 20:33:45 +0000
Subject: Vendor import of lld trunk r306325:
 https://llvm.org/svn/llvm-project/lld/trunk@306325

---
 lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp')

diff --git a/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp b/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp
index 18fb71f16bcf..226a25d3c1ed 100644
--- a/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp
+++ b/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp
@@ -906,6 +906,7 @@ readCompUnit(const NormalizedFile &normalizedFile,
   abbrevData.getU8(&abbrevOffset);
   uint32_t name;
   llvm::dwarf::Form form;
+  llvm::DWARFFormParams formParams = {version, addrSize, Format};
   TranslationUnitSource tu;
   while ((name = abbrevData.getULEB128(&abbrevOffset)) |
          (form = static_cast<llvm::dwarf::Form>(
@@ -929,8 +930,7 @@ readCompUnit(const NormalizedFile &normalizedFile,
       break;
     }
     default:
-      llvm::DWARFFormValue::skipValue(form, infoData, &offset, version,
-                                      addrSize, Format);
+      llvm::DWARFFormValue::skipValue(form, infoData, &offset, formParams);
     }
   }
   return tu;
-- 
cgit v1.3