From 10b6d0901f70738037e3f23e5b441be7ecb94d65 Mon Sep 17 00:00:00 2001 From: Vedant Kumar Date: Tue, 13 Oct 2020 16:32:31 -0700 Subject: Revert "[llvm-cov] Warn when -arch spec is missing/invalid for universal binary" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit b81d4bfb44c14575130bb06c047728b69c3213aa. It's causing some bots to fail to build due to: "error: no matching function for call to ‘__iterator_category". --- llvm/lib/ProfileData/Coverage/CoverageMappingReader.cpp | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'llvm/lib/ProfileData/Coverage/CoverageMappingReader.cpp') diff --git a/llvm/lib/ProfileData/Coverage/CoverageMappingReader.cpp b/llvm/lib/ProfileData/Coverage/CoverageMappingReader.cpp index c110ab7..b75738b 100644 --- a/llvm/lib/ProfileData/Coverage/CoverageMappingReader.cpp +++ b/llvm/lib/ProfileData/Coverage/CoverageMappingReader.cpp @@ -950,18 +950,6 @@ loadBinaryFormat(std::unique_ptr Bin, StringRef Arch) { BytesInAddress, Endian); } -/// Determine whether \p Arch is invalid or empty, given \p Bin. -static bool isArchSpecifierInvalidOrMissing(Binary *Bin, StringRef Arch) { - // If we have a universal binary and Arch doesn't identify any of its slices, - // it's user error. - if (auto *Universal = dyn_cast(Bin)) - return none_of(Universal->objects(), - [Arch](const MachOUniversalBinary::ObjectForArch &Obj) { - return Obj.getArchFlagName() == Arch; - }); - return false; -} - Expected>> BinaryCoverageReader::create( MemoryBufferRef ObjectBuffer, StringRef Arch, @@ -982,10 +970,6 @@ BinaryCoverageReader::create( return BinOrErr.takeError(); std::unique_ptr Bin = std::move(BinOrErr.get()); - if (isArchSpecifierInvalidOrMissing(Bin.get(), Arch)) - return make_error( - coveragemap_error::invalid_or_missing_arch_specifier); - // MachO universal binaries which contain archives need to be treated as // archives, not as regular binaries. if (auto *Universal = dyn_cast(Bin.get())) { -- cgit v1.1