From: Francis Ricci Date: Thu, 5 Oct 2017 19:47:13 +0000 (+0000) Subject: Revert "[llvm-dsymutil] Add support for __swift_ast MachO DWARF section" X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ad31280af50c8337af0d39645dd6e259b659d2bf;p=llvm Revert "[llvm-dsymutil] Add support for __swift_ast MachO DWARF section" This reverts commit r315004, because of a failing test on non-apple platforms git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@315009 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/llvm/MC/MCObjectFileInfo.h b/include/llvm/MC/MCObjectFileInfo.h index d95f84d1d81..b03fd099c1d 100644 --- a/include/llvm/MC/MCObjectFileInfo.h +++ b/include/llvm/MC/MCObjectFileInfo.h @@ -123,9 +123,6 @@ protected: /// Section for newer gnu pubtypes. MCSection *DwarfGnuPubTypesSection; - // Section for Swift AST - MCSection *DwarfSwiftASTSection; - MCSection *COFFDebugSymbolsSection; MCSection *COFFDebugTypesSection; @@ -270,7 +267,6 @@ public: MCSection *getDwarfAddrSection() const { return DwarfAddrSection; } MCSection *getDwarfCUIndexSection() const { return DwarfCUIndexSection; } MCSection *getDwarfTUIndexSection() const { return DwarfTUIndexSection; } - MCSection *getDwarfSwiftASTSection() const { return DwarfSwiftASTSection; } MCSection *getCOFFDebugSymbolsSection() const { return COFFDebugSymbolsSection; diff --git a/lib/MC/MCObjectFileInfo.cpp b/lib/MC/MCObjectFileInfo.cpp index e162e954687..c6c5cb31690 100644 --- a/lib/MC/MCObjectFileInfo.cpp +++ b/lib/MC/MCObjectFileInfo.cpp @@ -214,10 +214,6 @@ void MCObjectFileInfo::initMachOMCObjectFileInfo(const Triple &T) { Ctx->getMachOSection("__DWARF", "__apple_types", MachO::S_ATTR_DEBUG, SectionKind::getMetadata(), "types_begin"); - DwarfSwiftASTSection = - Ctx->getMachOSection("__DWARF", "__swift_ast", MachO::S_ATTR_DEBUG, - SectionKind::getMetadata()); - DwarfAbbrevSection = Ctx->getMachOSection("__DWARF", "__debug_abbrev", MachO::S_ATTR_DEBUG, SectionKind::getMetadata(), "section_abbrev"); diff --git a/test/tools/dsymutil/Inputs/swift-ast b/test/tools/dsymutil/Inputs/swift-ast deleted file mode 100755 index f82d811409b..00000000000 Binary files a/test/tools/dsymutil/Inputs/swift-ast and /dev/null differ diff --git a/test/tools/dsymutil/Inputs/swift-ast.swiftmodule b/test/tools/dsymutil/Inputs/swift-ast.swiftmodule deleted file mode 100644 index b9f59495119..00000000000 --- a/test/tools/dsymutil/Inputs/swift-ast.swiftmodule +++ /dev/null @@ -1 +0,0 @@ -SWIFTMODULE DATA diff --git a/test/tools/dsymutil/swift-ast.test b/test/tools/dsymutil/swift-ast.test deleted file mode 100644 index c9dc6d3cb40..00000000000 --- a/test/tools/dsymutil/swift-ast.test +++ /dev/null @@ -1,14 +0,0 @@ -RUN: llvm-dsymutil -oso-prepend-path %p %p/Inputs/swift-ast -o %T/swift-ast.dSYM -verbose | FileCheck %s --check-prefix=DSYMUTIL -RUN: llvm-readobj -sections -section-data %T/swift-ast.dSYM/Contents/Resources/DWARF/swift-ast | FileCheck %s --check-prefix=READOBJ - -The tested object file has been created by the dummy Swift code: -let x = 1 - -Compiled with: swiftc /tmp/test.swift -Onone -target x86_64-apple-macosx10.9 -c -Linked with: ld swift-ast.o -add_ast_path Inputs/swift-ast.swiftmodule -arch x86_64 -lSystem -macosx_version_min 10.9.0 - -DSYMUTIL: filename:{{.*}}swift-ast.swiftmodule -DSYMUTIL: DEBUG MAP OBJECT:{{.*}}swift-ast.swiftmodule - -READOBJ: Name:{{.*}}__swift_ast -READOBJ: |SWIFTMODULE DATA| diff --git a/tools/dsymutil/BinaryHolder.h b/tools/dsymutil/BinaryHolder.h index f4ca0b2bc3a..5b2061d23aa 100644 --- a/tools/dsymutil/BinaryHolder.h +++ b/tools/dsymutil/BinaryHolder.h @@ -66,12 +66,6 @@ class BinaryHolder { MapArchiveAndGetMemberBuffers(StringRef Filename, sys::TimePoint Timestamp); - void changeBackingMemoryBuffer(std::unique_ptr &&MemBuf); - ErrorOr getObjfileForArch(const Triple &T); - -public: - BinaryHolder(bool Verbose) : Verbose(Verbose) {} - /// Return the MemoryBufferRef that holds the memory mapping for the /// given \p Filename. This function will try to parse archive /// member specifications of the form /path/to/archive.a(member.o). @@ -85,6 +79,12 @@ public: GetMemoryBuffersForFile(StringRef Filename, sys::TimePoint Timestamp); + void changeBackingMemoryBuffer(std::unique_ptr &&MemBuf); + ErrorOr getObjfileForArch(const Triple &T); + +public: + BinaryHolder(bool Verbose) : Verbose(Verbose) {} + /// Get the ObjectFiles designated by the \p Filename. This /// might be an archive member specification of the form /// /path/to/archive.a(member.o). diff --git a/tools/dsymutil/DebugMap.cpp b/tools/dsymutil/DebugMap.cpp index 7f205767461..636d65836c6 100644 --- a/tools/dsymutil/DebugMap.cpp +++ b/tools/dsymutil/DebugMap.cpp @@ -21,9 +21,8 @@ namespace dsymutil { using namespace llvm::object; DebugMapObject::DebugMapObject(StringRef ObjectFilename, - sys::TimePoint Timestamp, - uint8_t Type) - : Filename(ObjectFilename), Timestamp(Timestamp), Type(Type) {} + sys::TimePoint Timestamp) + : Filename(ObjectFilename), Timestamp(Timestamp) {} bool DebugMapObject::addSymbol(StringRef Name, Optional ObjectAddress, uint64_t LinkedAddress, uint32_t Size) { @@ -65,9 +64,8 @@ void DebugMapObject::dump() const { print(errs()); } DebugMapObject & DebugMap::addDebugMapObject(StringRef ObjectFilePath, - sys::TimePoint Timestamp, - uint8_t Type) { - Objects.emplace_back(new DebugMapObject(ObjectFilePath, Timestamp, Type)); + sys::TimePoint Timestamp) { + Objects.emplace_back(new DebugMapObject(ObjectFilePath, Timestamp)); return *Objects.back(); } @@ -243,7 +241,7 @@ MappingTraits::YamlDMO::denormalize(IO &IO) { } } - dsymutil::DebugMapObject Res(Path, sys::toTimePoint(Timestamp), MachO::N_OSO); + dsymutil::DebugMapObject Res(Path, sys::toTimePoint(Timestamp)); for (auto &Entry : Entries) { auto &Mapping = Entry.second; Optional ObjAddress; diff --git a/tools/dsymutil/DebugMap.h b/tools/dsymutil/DebugMap.h index 0b564149488..eab0cb0a800 100644 --- a/tools/dsymutil/DebugMap.h +++ b/tools/dsymutil/DebugMap.h @@ -94,8 +94,7 @@ public: /// debug map. DebugMapObject & addDebugMapObject(StringRef ObjectFilePath, - sys::TimePoint Timestamp, - uint8_t Type); + sys::TimePoint Timestamp); const Triple &getTriple() const { return BinaryTriple; } @@ -155,8 +154,6 @@ public: return Timestamp; } - uint8_t getType() const { return Type; } - iterator_range::const_iterator> symbols() const { return make_range(Symbols.begin(), Symbols.end()); } @@ -169,13 +166,12 @@ private: friend class DebugMap; /// DebugMapObjects can only be constructed by the owning DebugMap. DebugMapObject(StringRef ObjectFilename, - sys::TimePoint Timestamp, uint8_t Type); + sys::TimePoint Timestamp); std::string Filename; sys::TimePoint Timestamp; StringMap Symbols; DenseMap AddressToMapping; - uint8_t Type; /// For YAMLIO support. ///@{ diff --git a/tools/dsymutil/DwarfLinker.cpp b/tools/dsymutil/DwarfLinker.cpp index be662f49e1a..fba23b6517d 100644 --- a/tools/dsymutil/DwarfLinker.cpp +++ b/tools/dsymutil/DwarfLinker.cpp @@ -525,9 +525,6 @@ public: /// Emit the string table described by \p Pool. void emitStrings(const NonRelocatableStringpool &Pool); - /// Emit the swift_ast section stored in \p Buffers. - void emitSwiftAST(const std::vector &Buffers); - /// Emit debug_ranges for \p FuncRange by translating the /// original \p Entries. void emitRangesEntries( @@ -711,15 +708,6 @@ void DwarfStreamer::emitStrings(const NonRelocatableStringpool &Pool) { StringRef(Entry->getKey().data(), Entry->getKey().size() + 1)); } -/// Emit the swift_ast section stored in \p Buffers. -void DwarfStreamer::emitSwiftAST(const std::vector &Buffers) { - MCSection *SwiftASTSection = MOFI->getDwarfSwiftASTSection(); - SwiftASTSection->setAlignment(1 << 5); - MS->SwitchSection(SwiftASTSection); - for (auto Buf : Buffers) - MS->EmitBytes(Buf.getBuffer()); -} - /// Emit the debug_range section contents for \p FuncRange by /// translating the original \p Entries. The debug_range section /// format is totally trivial, consisting just of pairs of address @@ -3341,8 +3329,8 @@ void DwarfLinker::loadClangModule(StringRef Filename, StringRef ModulePath, else sys::path::append(Path, Filename); BinaryHolder ObjHolder(Options.Verbose); - auto &Obj = ModuleMap.addDebugMapObject( - Path, sys::TimePoint(), MachO::N_OSO); + auto &Obj = + ModuleMap.addDebugMapObject(Path, sys::TimePoint()); auto ErrOrObj = loadObject(ObjHolder, Obj, ModuleMap); if (!ErrOrObj) { // Try and emit more helpful warnings by applying some heuristics. @@ -3487,19 +3475,6 @@ bool DwarfLinker::link(const DebugMap &Map) { if (Options.Verbose) outs() << "DEBUG MAP OBJECT: " << Obj->getObjectFilename() << "\n"; - - // N_AST objects (swiftmodule files) should get dumped directly into the - // appropriate DWARF section. - if (Obj->getType() == MachO::N_AST) { - auto ErrOrMemBufferRefs = BinHolder.GetMemoryBuffersForFile( - Obj->getObjectFilename(), Obj->getTimestamp()); - if (ErrOrMemBufferRefs.getError()) - continue; - if (!Options.NoOutput) - Streamer->emitSwiftAST(ErrOrMemBufferRefs.get()); - continue; - } - auto ErrOrObj = loadObject(BinHolder, *Obj, Map); if (!ErrOrObj) continue; diff --git a/tools/dsymutil/MachODebugMapParser.cpp b/tools/dsymutil/MachODebugMapParser.cpp index 79b19137119..866196fb27e 100644 --- a/tools/dsymutil/MachODebugMapParser.cpp +++ b/tools/dsymutil/MachODebugMapParser.cpp @@ -135,8 +135,7 @@ void MachODebugMapParser::switchToNewDebugMapObject( Err.message() + "\n"); } - CurrentDebugMapObject = - &Result->addDebugMapObject(Path, Timestamp, MachO::N_OSO); + CurrentDebugMapObject = &Result->addDebugMapObject(Path, Timestamp); loadCurrentObjectFileSymbols(*ErrOrAchObj); } @@ -350,13 +349,6 @@ void MachODebugMapParser::handleStabSymbolTableEntry(uint32_t StringIndex, if (Type == MachO::N_OSO) return switchToNewDebugMapObject(Name, sys::toTimePoint(Value)); - if (Type == MachO::N_AST) { - SmallString<80> Path(PathPrefix); - sys::path::append(Path, Name); - Result->addDebugMapObject(Path, sys::toTimePoint(Value), Type); - return; - } - // If the last N_OSO object file wasn't found, // CurrentDebugMapObject will be null. Do not update anything // until we find the next valid N_OSO entry.