diff options
author | shadchin <shadchin@yandex-team.ru> | 2022-02-10 16:44:39 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:44:39 +0300 |
commit | e9656aae26e0358d5378e5b63dcac5c8dbe0e4d0 (patch) | |
tree | 64175d5cadab313b3e7039ebaa06c5bc3295e274 /contrib/libs/llvm12/include/llvm/DebugInfo/DWARF | |
parent | 2598ef1d0aee359b4b6d5fdd1758916d5907d04f (diff) | |
download | ydb-e9656aae26e0358d5378e5b63dcac5c8dbe0e4d0.tar.gz |
Restoring authorship annotation for <shadchin@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'contrib/libs/llvm12/include/llvm/DebugInfo/DWARF')
15 files changed, 133 insertions, 133 deletions
diff --git a/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h b/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h index 13d3250535..930cfeb651 100644 --- a/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h +++ b/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h @@ -118,16 +118,16 @@ public: return AttributeSpecs[idx].Attr; } - bool getAttrIsImplicitConstByIndex(uint32_t idx) const { - assert(idx < AttributeSpecs.size()); - return AttributeSpecs[idx].isImplicitConst(); - } - - int64_t getAttrImplicitConstValueByIndex(uint32_t idx) const { - assert(idx < AttributeSpecs.size()); - return AttributeSpecs[idx].getImplicitConstValue(); - } - + bool getAttrIsImplicitConstByIndex(uint32_t idx) const { + assert(idx < AttributeSpecs.size()); + return AttributeSpecs[idx].isImplicitConst(); + } + + int64_t getAttrImplicitConstValueByIndex(uint32_t idx) const { + assert(idx < AttributeSpecs.size()); + return AttributeSpecs[idx].getImplicitConstValue(); + } + /// Get the index of the specified attribute. /// /// Searches the this abbreviation declaration for the index of the specified diff --git a/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFContext.h b/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFContext.h index aeb266e53e..e382fe4aa2 100644 --- a/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFContext.h +++ b/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFContext.h @@ -153,7 +153,7 @@ public: bool verify(raw_ostream &OS, DIDumpOptions DumpOpts = {}) override; using unit_iterator_range = DWARFUnitVector::iterator_range; - using compile_unit_range = DWARFUnitVector::compile_unit_range; + using compile_unit_range = DWARFUnitVector::compile_unit_range; /// Get units from .debug_info in this context. unit_iterator_range info_section_units() { @@ -171,12 +171,12 @@ public: } /// Get compile units in this context. - compile_unit_range compile_units() { - return make_filter_range(info_section_units(), isCompileUnit); - } + compile_unit_range compile_units() { + return make_filter_range(info_section_units(), isCompileUnit); + } - // If you want type_units(), it'll need to be a concat iterator of a filter of - // TUs in info_section + all the (all type) units in types_section + // If you want type_units(), it'll need to be a concat iterator of a filter of + // TUs in info_section + all the (all type) units in types_section /// Get all normal compile/type units in this context. unit_iterator_range normal_units() { @@ -199,13 +199,13 @@ public: } /// Get compile units in the DWO context. - compile_unit_range dwo_compile_units() { - return make_filter_range(dwo_info_section_units(), isCompileUnit); - } + compile_unit_range dwo_compile_units() { + return make_filter_range(dwo_info_section_units(), isCompileUnit); + } - // If you want dwo_type_units(), it'll need to be a concat iterator of a - // filter of TUs in dwo_info_section + all the (all type) units in - // dwo_types_section. + // If you want dwo_type_units(), it'll need to be a concat iterator of a + // filter of TUs in dwo_info_section + all the (all type) units in + // dwo_types_section. /// Get all units in the DWO context. unit_iterator_range dwo_units() { diff --git a/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFDebugAddr.h b/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFDebugAddr.h index 71e6bc5c41..ca499104dc 100644 --- a/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFDebugAddr.h +++ b/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFDebugAddr.h @@ -81,24 +81,24 @@ public: /// Return the full length of this table, including the length field. /// Return None if the length cannot be identified reliably. Optional<uint64_t> getFullLength() const; - - /// Return the DWARF format of this table. - dwarf::DwarfFormat getFormat() const { return Format; } - - /// Return the length of this table. - uint64_t getLength() const { return Length; } - - /// Return the version of this table. - uint16_t getVersion() const { return Version; } - - /// Return the address size of this table. - uint8_t getAddressSize() const { return AddrSize; } - - /// Return the segment selector size of this table. - uint8_t getSegmentSelectorSize() const { return SegSize; } - - /// Return the parsed addresses of this table. - ArrayRef<uint64_t> getAddressEntries() const { return Addrs; } + + /// Return the DWARF format of this table. + dwarf::DwarfFormat getFormat() const { return Format; } + + /// Return the length of this table. + uint64_t getLength() const { return Length; } + + /// Return the version of this table. + uint16_t getVersion() const { return Version; } + + /// Return the address size of this table. + uint8_t getAddressSize() const { return AddrSize; } + + /// Return the segment selector size of this table. + uint8_t getSegmentSelectorSize() const { return SegSize; } + + /// Return the parsed addresses of this table. + ArrayRef<uint64_t> getAddressEntries() const { return Addrs; } }; } // end namespace llvm diff --git a/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFDebugArangeSet.h b/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFDebugArangeSet.h index cdd377bf24..01d88a2f24 100644 --- a/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFDebugArangeSet.h +++ b/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFDebugArangeSet.h @@ -67,8 +67,8 @@ public: DWARFDebugArangeSet() { clear(); } void clear(); - Error extract(DWARFDataExtractor data, uint64_t *offset_ptr, - function_ref<void(Error)> WarningHandler); + Error extract(DWARFDataExtractor data, uint64_t *offset_ptr, + function_ref<void(Error)> WarningHandler); void dump(raw_ostream &OS) const; uint64_t getCompileUnitDIEOffset() const { return HeaderData.CuOffset; } diff --git a/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFDebugFrame.h b/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFDebugFrame.h index f46f9394de..b5824ba1c9 100644 --- a/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFDebugFrame.h +++ b/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFDebugFrame.h @@ -78,8 +78,8 @@ public: /// where a problem occurred in case an error is returned. Error parse(DWARFDataExtractor Data, uint64_t *Offset, uint64_t EndOffset); - void dump(raw_ostream &OS, DIDumpOptions DumpOpts, const MCRegisterInfo *MRI, - bool IsEH, unsigned IndentLevel = 1) const; + void dump(raw_ostream &OS, DIDumpOptions DumpOpts, const MCRegisterInfo *MRI, + bool IsEH, unsigned IndentLevel = 1) const; private: std::vector<Instruction> Instructions; @@ -128,8 +128,8 @@ private: static ArrayRef<OperandType[2]> getOperandTypes(); /// Print \p Opcode's operand number \p OperandIdx which has value \p Operand. - void printOperand(raw_ostream &OS, DIDumpOptions DumpOpts, - const MCRegisterInfo *MRI, bool IsEH, + void printOperand(raw_ostream &OS, DIDumpOptions DumpOpts, + const MCRegisterInfo *MRI, bool IsEH, const Instruction &Instr, unsigned OperandIdx, uint64_t Operand) const; }; @@ -154,8 +154,8 @@ public: CFIProgram &cfis() { return CFIs; } /// Dump the instructions in this CFI fragment - virtual void dump(raw_ostream &OS, DIDumpOptions DumpOpts, - const MCRegisterInfo *MRI, bool IsEH) const = 0; + virtual void dump(raw_ostream &OS, DIDumpOptions DumpOpts, + const MCRegisterInfo *MRI, bool IsEH) const = 0; protected: const FrameKind Kind; @@ -209,7 +209,7 @@ public: uint32_t getLSDAPointerEncoding() const { return LSDAPointerEncoding; } - void dump(raw_ostream &OS, DIDumpOptions DumpOpts, const MCRegisterInfo *MRI, + void dump(raw_ostream &OS, DIDumpOptions DumpOpts, const MCRegisterInfo *MRI, bool IsEH) const override; private: @@ -250,7 +250,7 @@ public: uint64_t getAddressRange() const { return AddressRange; } Optional<uint64_t> getLSDAAddress() const { return LSDAAddress; } - void dump(raw_ostream &OS, DIDumpOptions DumpOpts, const MCRegisterInfo *MRI, + void dump(raw_ostream &OS, DIDumpOptions DumpOpts, const MCRegisterInfo *MRI, bool IsEH) const override; static bool classof(const FrameEntry *FE) { return FE->getKind() == FK_FDE; } @@ -293,7 +293,7 @@ public: ~DWARFDebugFrame(); /// Dump the section data into the given stream. - void dump(raw_ostream &OS, DIDumpOptions DumpOpts, const MCRegisterInfo *MRI, + void dump(raw_ostream &OS, DIDumpOptions DumpOpts, const MCRegisterInfo *MRI, Optional<uint64_t> Offset) const; /// Parse the section from raw data. \p Data is assumed to contain the whole diff --git a/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFDebugLine.h b/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFDebugLine.h index 9997a0fae5..d3ef09da62 100644 --- a/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFDebugLine.h +++ b/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFDebugLine.h @@ -128,8 +128,8 @@ public: bool hasFileAtIndex(uint64_t FileIndex) const; - Optional<uint64_t> getLastValidFileIndex() const; - + Optional<uint64_t> getLastValidFileIndex() const; + bool getFileNameByIndex(uint64_t FileIndex, StringRef CompDir, DILineInfoSpecifier::FileLineInfoKind Kind, @@ -260,10 +260,10 @@ public: return Prologue.hasFileAtIndex(FileIndex); } - Optional<uint64_t> getLastValidFileIndex() const { - return Prologue.getLastValidFileIndex(); - } - + Optional<uint64_t> getLastValidFileIndex() const { + return Prologue.getLastValidFileIndex(); + } + /// Extracts filename by its index in filename table in prologue. /// In Dwarf 4, the files are 1-indexed and the current compilation file /// name is not represented in the list. In DWARF v5, the files are @@ -324,8 +324,8 @@ public: public: using LineToUnitMap = std::map<uint64_t, DWARFUnit *>; - SectionParser(DWARFDataExtractor &Data, const DWARFContext &C, - DWARFUnitVector::iterator_range Units); + SectionParser(DWARFDataExtractor &Data, const DWARFContext &C, + DWARFUnitVector::iterator_range Units); /// Get the next line table from the section. Report any issues via the /// handlers. diff --git a/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFDebugLoc.h b/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFDebugLoc.h index 82dc903921..8346f891c2 100644 --- a/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFDebugLoc.h +++ b/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFDebugLoc.h @@ -79,8 +79,8 @@ public: std::function<Optional<object::SectionedAddress>(uint32_t)> LookupAddr, function_ref<bool(Expected<DWARFLocationExpression>)> Callback) const; - const DWARFDataExtractor &getData() { return Data; } - + const DWARFDataExtractor &getData() { return Data; } + protected: DWARFDataExtractor Data; diff --git a/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFDebugMacro.h b/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFDebugMacro.h index 1da1ebed67..f731a7f8b3 100644 --- a/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFDebugMacro.h +++ b/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFDebugMacro.h @@ -103,9 +103,9 @@ class DWARFDebugMacro { MacroHeader Header; SmallVector<Entry, 4> Macros; uint64_t Offset; - - /// Whether or not this is a .debug_macro section. - bool IsDebugMacro; + + /// Whether or not this is a .debug_macro section. + bool IsDebugMacro; }; /// A list of all the macro entries in the debug_macinfo section. @@ -117,7 +117,7 @@ public: /// Print the macro list found within the debug_macinfo/debug_macro section. void dump(raw_ostream &OS) const; - Error parseMacro(DWARFUnitVector::compile_unit_range Units, + Error parseMacro(DWARFUnitVector::compile_unit_range Units, DataExtractor StringExtractor, DWARFDataExtractor MacroData) { return parseImpl(Units, StringExtractor, MacroData, /*IsMacro=*/true); @@ -133,7 +133,7 @@ public: private: /// Parse the debug_macinfo/debug_macro section accessible via the 'MacroData' /// parameter. - Error parseImpl(Optional<DWARFUnitVector::compile_unit_range> Units, + Error parseImpl(Optional<DWARFUnitVector::compile_unit_range> Units, Optional<DataExtractor> StringExtractor, DWARFDataExtractor Data, bool IsMacro); }; diff --git a/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFDebugRnglists.h b/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFDebugRnglists.h index fd15c6a097..e2fe8a3953 100644 --- a/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFDebugRnglists.h +++ b/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFDebugRnglists.h @@ -41,7 +41,7 @@ struct RangeListEntry : public DWARFListEntryBase { uint64_t Value0; uint64_t Value1; - Error extract(DWARFDataExtractor Data, uint64_t *OffsetPtr); + Error extract(DWARFDataExtractor Data, uint64_t *OffsetPtr); void dump(raw_ostream &OS, uint8_t AddrSize, uint8_t MaxEncodingStringLength, uint64_t &CurrentBase, DIDumpOptions DumpOpts, llvm::function_ref<Optional<object::SectionedAddress>(uint32_t)> @@ -55,7 +55,7 @@ public: /// Build a DWARFAddressRangesVector from a rangelist. DWARFAddressRangesVector getAbsoluteRanges(Optional<object::SectionedAddress> BaseAddr, - uint8_t AddressByteSize, + uint8_t AddressByteSize, function_ref<Optional<object::SectionedAddress>(uint32_t)> LookupPooledAddress) const; diff --git a/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFDie.h b/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFDie.h index 6f656fdd16..e2b027fa8a 100644 --- a/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFDie.h +++ b/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFDie.h @@ -269,7 +269,7 @@ public: /// for this subprogram by resolving DW_AT_sepcification or /// DW_AT_abstract_origin references if necessary. uint64_t getDeclLine() const; - std::string getDeclFile(DILineInfoSpecifier::FileLineInfoKind Kind) const; + std::string getDeclFile(DILineInfoSpecifier::FileLineInfoKind Kind) const; /// Retrieves values of DW_AT_call_file, DW_AT_call_line and DW_AT_call_column /// from DIE (or zeroes if they are missing). This function looks for @@ -470,11 +470,11 @@ inline bool operator==(const std::reverse_iterator<DWARFDie::iterator> &LHS, return LHS.equals(RHS); } -inline bool operator!=(const std::reverse_iterator<DWARFDie::iterator> &LHS, - const std::reverse_iterator<DWARFDie::iterator> &RHS) { - return !(LHS == RHS); -} - +inline bool operator!=(const std::reverse_iterator<DWARFDie::iterator> &LHS, + const std::reverse_iterator<DWARFDie::iterator> &RHS) { + return !(LHS == RHS); +} + inline std::reverse_iterator<DWARFDie::iterator> DWARFDie::rbegin() const { return llvm::make_reverse_iterator(end()); } diff --git a/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFExpression.h b/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFExpression.h index 46d1843370..3e975179a8 100644 --- a/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFExpression.h +++ b/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFExpression.h @@ -17,11 +17,11 @@ #define LLVM_DEBUGINFO_DWARFEXPRESSION_H #include "llvm/ADT/ArrayRef.h" -#include "llvm/ADT/Optional.h" +#include "llvm/ADT/Optional.h" #include "llvm/ADT/iterator.h" #include "llvm/ADT/iterator_range.h" #include "llvm/BinaryFormat/Dwarf.h" -#include "llvm/DebugInfo/DIContext.h" +#include "llvm/DebugInfo/DIContext.h" #include "llvm/Support/DataExtractor.h" namespace llvm { @@ -101,9 +101,9 @@ public: bool extract(DataExtractor Data, uint8_t AddressSize, uint64_t Offset, Optional<dwarf::DwarfFormat> Format); bool isError() { return Error; } - bool print(raw_ostream &OS, DIDumpOptions DumpOpts, - const DWARFExpression *Expr, const MCRegisterInfo *RegInfo, - DWARFUnit *U, bool isEH); + bool print(raw_ostream &OS, DIDumpOptions DumpOpts, + const DWARFExpression *Expr, const MCRegisterInfo *RegInfo, + DWARFUnit *U, bool isEH); bool verify(DWARFUnit *U); }; @@ -152,8 +152,8 @@ public: iterator begin() const { return iterator(this, 0); } iterator end() const { return iterator(this, Data.getData().size()); } - void print(raw_ostream &OS, DIDumpOptions DumpOpts, - const MCRegisterInfo *RegInfo, DWARFUnit *U, + void print(raw_ostream &OS, DIDumpOptions DumpOpts, + const MCRegisterInfo *RegInfo, DWARFUnit *U, bool IsEH = false) const; /// Print the expression in a format intended to be compact and useful to a diff --git a/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFFormValue.h b/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFFormValue.h index e9c717f64d..87183efe5d 100644 --- a/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFFormValue.h +++ b/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFFormValue.h @@ -89,9 +89,9 @@ public: void dump(raw_ostream &OS, DIDumpOptions DumpOpts = DIDumpOptions()) const; void dumpSectionedAddress(raw_ostream &OS, DIDumpOptions DumpOpts, object::SectionedAddress SA) const; - void dumpAddress(raw_ostream &OS, uint64_t Address) const; - static void dumpAddress(raw_ostream &OS, uint8_t AddressSize, - uint64_t Address); + void dumpAddress(raw_ostream &OS, uint64_t Address) const; + static void dumpAddress(raw_ostream &OS, uint8_t AddressSize, + uint64_t Address); static void dumpAddressSection(const DWARFObject &Obj, raw_ostream &OS, DIDumpOptions DumpOpts, uint64_t SectionIndex); diff --git a/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFListTable.h b/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFListTable.h index f4f775c4dc..a6a761f5f5 100644 --- a/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFListTable.h +++ b/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFListTable.h @@ -53,7 +53,7 @@ public: const ListEntries &getEntries() const { return Entries; } bool empty() const { return Entries.empty(); } void clear() { Entries.clear(); } - Error extract(DWARFDataExtractor Data, uint64_t HeaderOffset, + Error extract(DWARFDataExtractor Data, uint64_t HeaderOffset, uint64_t *OffsetPtr, StringRef SectionName, StringRef ListStringName); }; @@ -117,25 +117,25 @@ public: llvm_unreachable("Invalid DWARF format (expected DWARF32 or DWARF64"); } - void dump(DataExtractor Data, raw_ostream &OS, - DIDumpOptions DumpOpts = {}) const; - Optional<uint64_t> getOffsetEntry(DataExtractor Data, uint32_t Index) const { - if (Index > HeaderData.OffsetEntryCount) - return None; - - return getOffsetEntry(Data, getHeaderOffset() + getHeaderSize(Format), Format, Index); + void dump(DataExtractor Data, raw_ostream &OS, + DIDumpOptions DumpOpts = {}) const; + Optional<uint64_t> getOffsetEntry(DataExtractor Data, uint32_t Index) const { + if (Index > HeaderData.OffsetEntryCount) + return None; + + return getOffsetEntry(Data, getHeaderOffset() + getHeaderSize(Format), Format, Index); + } + + static Optional<uint64_t> getOffsetEntry(DataExtractor Data, + uint64_t OffsetTableOffset, + dwarf::DwarfFormat Format, + uint32_t Index) { + uint8_t OffsetByteSize = Format == dwarf::DWARF64 ? 8 : 4; + uint64_t Offset = OffsetTableOffset + OffsetByteSize * Index; + auto R = Data.getUnsigned(&Offset, OffsetByteSize); + return R; } - static Optional<uint64_t> getOffsetEntry(DataExtractor Data, - uint64_t OffsetTableOffset, - dwarf::DwarfFormat Format, - uint32_t Index) { - uint8_t OffsetByteSize = Format == dwarf::DWARF64 ? 8 : 4; - uint64_t Offset = OffsetTableOffset + OffsetByteSize * Index; - auto R = Data.getUnsigned(&Offset, OffsetByteSize); - return R; - } - /// Extract the table header and the array of offsets. Error extract(DWARFDataExtractor Data, uint64_t *OffsetPtr); @@ -183,14 +183,14 @@ public: uint8_t getAddrSize() const { return Header.getAddrSize(); } dwarf::DwarfFormat getFormat() const { return Header.getFormat(); } - void dump(DWARFDataExtractor Data, raw_ostream &OS, + void dump(DWARFDataExtractor Data, raw_ostream &OS, llvm::function_ref<Optional<object::SectionedAddress>(uint32_t)> LookupPooledAddress, DIDumpOptions DumpOpts = {}) const; /// Return the contents of the offset entry designated by a given index. - Optional<uint64_t> getOffsetEntry(DataExtractor Data, uint32_t Index) const { - return Header.getOffsetEntry(Data, Index); + Optional<uint64_t> getOffsetEntry(DataExtractor Data, uint32_t Index) const { + return Header.getOffsetEntry(Data, Index); } /// Return the size of the table header including the length but not including /// the offsets. This is dependent on the table format, which is unambiguously @@ -210,18 +210,18 @@ Error DWARFListTableBase<DWARFListType>::extract(DWARFDataExtractor Data, return E; Data.setAddressSize(Header.getAddrSize()); - Data = DWARFDataExtractor(Data, getHeaderOffset() + Header.length()); - while (Data.isValidOffset(*OffsetPtr)) { + Data = DWARFDataExtractor(Data, getHeaderOffset() + Header.length()); + while (Data.isValidOffset(*OffsetPtr)) { DWARFListType CurrentList; uint64_t Off = *OffsetPtr; - if (Error E = CurrentList.extract(Data, getHeaderOffset(), OffsetPtr, + if (Error E = CurrentList.extract(Data, getHeaderOffset(), OffsetPtr, Header.getSectionName(), Header.getListTypeString())) return E; ListMap[Off] = CurrentList; } - assert(*OffsetPtr == Data.size() && + assert(*OffsetPtr == Data.size() && "mismatch between expected length of table and length " "of extracted data"); return Error::success(); @@ -229,18 +229,18 @@ Error DWARFListTableBase<DWARFListType>::extract(DWARFDataExtractor Data, template <typename ListEntryType> Error DWARFListType<ListEntryType>::extract(DWARFDataExtractor Data, - uint64_t HeaderOffset, + uint64_t HeaderOffset, uint64_t *OffsetPtr, StringRef SectionName, StringRef ListTypeString) { - if (*OffsetPtr < HeaderOffset || *OffsetPtr >= Data.size()) + if (*OffsetPtr < HeaderOffset || *OffsetPtr >= Data.size()) return createStringError(errc::invalid_argument, "invalid %s list offset 0x%" PRIx64, ListTypeString.data(), *OffsetPtr); Entries.clear(); - while (Data.isValidOffset(*OffsetPtr)) { + while (Data.isValidOffset(*OffsetPtr)) { ListEntryType Entry; - if (Error E = Entry.extract(Data, OffsetPtr)) + if (Error E = Entry.extract(Data, OffsetPtr)) return E; Entries.push_back(Entry); if (Entry.isSentinel()) @@ -254,11 +254,11 @@ Error DWARFListType<ListEntryType>::extract(DWARFDataExtractor Data, template <typename DWARFListType> void DWARFListTableBase<DWARFListType>::dump( - DWARFDataExtractor Data, raw_ostream &OS, + DWARFDataExtractor Data, raw_ostream &OS, llvm::function_ref<Optional<object::SectionedAddress>(uint32_t)> LookupPooledAddress, DIDumpOptions DumpOpts) const { - Header.dump(Data, OS, DumpOpts); + Header.dump(Data, OS, DumpOpts); OS << HeaderString << "\n"; // Determine the length of the longest encoding string we have in the table, @@ -285,10 +285,10 @@ DWARFListTableBase<DWARFListType>::findList(DWARFDataExtractor Data, uint64_t Offset) { // Extract the list from the section and enter it into the list map. DWARFListType List; - if (Header.length()) - Data = DWARFDataExtractor(Data, getHeaderOffset() + Header.length()); + if (Header.length()) + Data = DWARFDataExtractor(Data, getHeaderOffset() + Header.length()); if (Error E = - List.extract(Data, Header.length() ? getHeaderOffset() : 0, &Offset, + List.extract(Data, Header.length() ? getHeaderOffset() : 0, &Offset, Header.getSectionName(), Header.getListTypeString())) return std::move(E); return List; diff --git a/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFUnit.h b/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFUnit.h index e519fa7185..e8d37922b7 100644 --- a/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFUnit.h +++ b/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFUnit.h @@ -120,8 +120,8 @@ public: const DWARFUnitIndex &getDWARFUnitIndex(DWARFContext &Context, DWARFSectionKind Kind); -bool isCompileUnit(const std::unique_ptr<DWARFUnit> &U); - +bool isCompileUnit(const std::unique_ptr<DWARFUnit> &U); + /// Describe a collection of units. Intended to hold all units either from /// .debug_info and .debug_types, or from .debug_info.dwo and .debug_types.dwo. class DWARFUnitVector final : public SmallVector<std::unique_ptr<DWARFUnit>, 1> { @@ -136,9 +136,9 @@ public: using iterator = typename UnitVector::iterator; using iterator_range = llvm::iterator_range<typename UnitVector::iterator>; - using compile_unit_range = - decltype(make_filter_range(std::declval<iterator_range>(), isCompileUnit)); - + using compile_unit_range = + decltype(make_filter_range(std::declval<iterator_range>(), isCompileUnit)); + DWARFUnit *getUnitForOffset(uint64_t Offset) const; DWARFUnit *getUnitForIndexEntry(const DWARFUnitIndex::Entry &E); @@ -301,7 +301,7 @@ public: dwarf::DwarfFormat getFormat() const { return Header.getFormat(); } uint8_t getUnitType() const { return Header.getUnitType(); } bool isTypeUnit() const { return Header.isTypeUnit(); } - uint64_t getAbbrOffset() const { return Header.getAbbrOffset(); } + uint64_t getAbbrOffset() const { return Header.getAbbrOffset(); } uint64_t getNextUnitOffset() const { return Header.getNextUnitOffset(); } const DWARFSection &getLineSection() const { return LineSection; } StringRef getStringSection() const { return StringSection; } @@ -415,10 +415,10 @@ public: /// Return a rangelist's offset based on an index. The index designates /// an entry in the rangelist table's offset array and is supplied by /// DW_FORM_rnglistx. - Optional<uint64_t> getRnglistOffset(uint32_t Index); + Optional<uint64_t> getRnglistOffset(uint32_t Index); + + Optional<uint64_t> getLoclistOffset(uint32_t Index); - Optional<uint64_t> getLoclistOffset(uint32_t Index); - Expected<DWARFAddressRangesVector> collectAddressRanges(); Expected<DWARFLocationExpressionsVector> @@ -521,10 +521,10 @@ private: bool parseDWO(); }; -inline bool isCompileUnit(const std::unique_ptr<DWARFUnit> &U) { - return !U->isTypeUnit(); -} - +inline bool isCompileUnit(const std::unique_ptr<DWARFUnit> &U) { + return !U->isTypeUnit(); +} + } // end namespace llvm #endif // LLVM_DEBUGINFO_DWARF_DWARFUNIT_H diff --git a/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFVerifier.h b/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFVerifier.h index 6071eb8a63..2bc2b954c1 100644 --- a/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFVerifier.h +++ b/contrib/libs/llvm12/include/llvm/DebugInfo/DWARF/DWARFVerifier.h @@ -27,14 +27,14 @@ namespace llvm { class raw_ostream; -struct DWARFAddressRange; +struct DWARFAddressRange; struct DWARFAttribute; class DWARFContext; class DWARFDataExtractor; class DWARFDebugAbbrev; class DataExtractor; struct DWARFSection; -class DWARFUnit; +class DWARFUnit; /// A class that verifies DWARF debug information given a DWARF Context. class DWARFVerifier { |