From 93ef2f5a9783f8237bcbddd30384dec7d00fad3f Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Wed, 7 Oct 2015 13:38:49 +0000 Subject: [PATCH] Don't repeat names in comments and don't indent in namespaces. NFC. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@249546 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/MC/MCSectionCOFF.h | 107 +++++++++++++++---------------- include/llvm/MC/MCSectionELF.h | 26 ++++---- include/llvm/MC/MCSectionMachO.h | 25 ++++---- lib/Target/NVPTX/NVPTXSection.h | 5 +- 4 files changed, 78 insertions(+), 85 deletions(-) diff --git a/include/llvm/MC/MCSectionCOFF.h b/include/llvm/MC/MCSectionCOFF.h index efd0f0ba7b9..7dcec1e2b27 100644 --- a/include/llvm/MC/MCSectionCOFF.h +++ b/include/llvm/MC/MCSectionCOFF.h @@ -20,61 +20,58 @@ namespace llvm { class MCSymbol; -/// MCSectionCOFF - This represents a section on Windows - class MCSectionCOFF : public MCSection { - // The memory for this string is stored in the same MCContext as *this. - StringRef SectionName; - - // FIXME: The following fields should not be mutable, but are for now so - // the asm parser can honor the .linkonce directive. - - /// Characteristics - This is the Characteristics field of a section, - /// drawn from the enums below. - mutable unsigned Characteristics; - - /// The COMDAT symbol of this section. Only valid if this is a COMDAT - /// section. Two COMDAT sections are merged if they have the same - /// COMDAT symbol. - MCSymbol *COMDATSymbol; - - /// Selection - This is the Selection field for the section symbol, if - /// it is a COMDAT section (Characteristics & IMAGE_SCN_LNK_COMDAT) != 0 - mutable int Selection; - - private: - friend class MCContext; - MCSectionCOFF(StringRef Section, unsigned Characteristics, - MCSymbol *COMDATSymbol, int Selection, SectionKind K, - MCSymbol *Begin) - : MCSection(SV_COFF, K, Begin), SectionName(Section), - Characteristics(Characteristics), COMDATSymbol(COMDATSymbol), - Selection(Selection) { - assert ((Characteristics & 0x00F00000) == 0 && - "alignment must not be set upon section creation"); - } - ~MCSectionCOFF() override; - - public: - /// ShouldOmitSectionDirective - Decides whether a '.section' directive - /// should be printed before the section name - bool ShouldOmitSectionDirective(StringRef Name, const MCAsmInfo &MAI) const; - - StringRef getSectionName() const { return SectionName; } - unsigned getCharacteristics() const { return Characteristics; } - MCSymbol *getCOMDATSymbol() const { return COMDATSymbol; } - int getSelection() const { return Selection; } - - void setSelection(int Selection) const; - - void PrintSwitchToSection(const MCAsmInfo &MAI, raw_ostream &OS, - const MCExpr *Subsection) const override; - bool UseCodeAlign() const override; - bool isVirtualSection() const override; - - static bool classof(const MCSection *S) { - return S->getVariant() == SV_COFF; - } - }; +/// This represents a section on Windows +class MCSectionCOFF : public MCSection { + // The memory for this string is stored in the same MCContext as *this. + StringRef SectionName; + + // FIXME: The following fields should not be mutable, but are for now so the + // asm parser can honor the .linkonce directive. + + /// This is the Characteristics field of a section, drawn from the enums + /// below. + mutable unsigned Characteristics; + + /// The COMDAT symbol of this section. Only valid if this is a COMDAT section. + /// Two COMDAT sections are merged if they have the same COMDAT symbol. + MCSymbol *COMDATSymbol; + + /// This is the Selection field for the section symbol, if it is a COMDAT + /// section (Characteristics & IMAGE_SCN_LNK_COMDAT) != 0 + mutable int Selection; + +private: + friend class MCContext; + MCSectionCOFF(StringRef Section, unsigned Characteristics, + MCSymbol *COMDATSymbol, int Selection, SectionKind K, + MCSymbol *Begin) + : MCSection(SV_COFF, K, Begin), SectionName(Section), + Characteristics(Characteristics), COMDATSymbol(COMDATSymbol), + Selection(Selection) { + assert((Characteristics & 0x00F00000) == 0 && + "alignment must not be set upon section creation"); + } + ~MCSectionCOFF() override; + +public: + /// Decides whether a '.section' directive should be printed before the + /// section name + bool ShouldOmitSectionDirective(StringRef Name, const MCAsmInfo &MAI) const; + + StringRef getSectionName() const { return SectionName; } + unsigned getCharacteristics() const { return Characteristics; } + MCSymbol *getCOMDATSymbol() const { return COMDATSymbol; } + int getSelection() const { return Selection; } + + void setSelection(int Selection) const; + + void PrintSwitchToSection(const MCAsmInfo &MAI, raw_ostream &OS, + const MCExpr *Subsection) const override; + bool UseCodeAlign() const override; + bool isVirtualSection() const override; + + static bool classof(const MCSection *S) { return S->getVariant() == SV_COFF; } +}; } // end namespace llvm diff --git a/include/llvm/MC/MCSectionELF.h b/include/llvm/MC/MCSectionELF.h index f6730371fe1..38740612edd 100644 --- a/include/llvm/MC/MCSectionELF.h +++ b/include/llvm/MC/MCSectionELF.h @@ -25,25 +25,24 @@ namespace llvm { class MCSymbol; -/// MCSectionELF - This represents a section on linux, lots of unix variants -/// and some bare metal systems. -class MCSectionELF : public MCSection { - /// SectionName - This is the name of the section. The referenced memory is - /// owned by TargetLoweringObjectFileELF's ELFUniqueMap. +/// This represents a section on linux, lots of unix variants and some bare +/// metal systems. +class MCSectionELF final : public MCSection { + /// This is the name of the section. The referenced memory is owned by + /// TargetLoweringObjectFileELF's ELFUniqueMap. StringRef SectionName; - /// Type - This is the sh_type field of a section, drawn from the enums below. + /// This is the sh_type field of a section, drawn from the enums below. unsigned Type; - /// Flags - This is the sh_flags field of a section, drawn from the enums. - /// below. + /// This is the sh_flags field of a section, drawn from the enums below. unsigned Flags; unsigned UniqueID; - /// EntrySize - The size of each entry in this section. This size only - /// makes sense for sections that contain fixed-sized entries. If a - /// section does not contain fixed-sized entries 'EntrySize' will be 0. + /// The size of each entry in this section. This size only makes sense for + /// sections that contain fixed-sized entries. If a section does not contain + /// fixed-sized entries 'EntrySize' will be 0. unsigned EntrySize; const MCSymbolELF *Group; @@ -67,9 +66,8 @@ private: void setSectionName(StringRef Name) { SectionName = Name; } public: - - /// ShouldOmitSectionDirective - Decides whether a '.section' directive - /// should be printed before the section name + /// Decides whether a '.section' directive should be printed before the + /// section name bool ShouldOmitSectionDirective(StringRef Name, const MCAsmInfo &MAI) const; StringRef getSectionName() const { return SectionName; } diff --git a/include/llvm/MC/MCSectionMachO.h b/include/llvm/MC/MCSectionMachO.h index 97227517c82..860c27fa6e6 100644 --- a/include/llvm/MC/MCSectionMachO.h +++ b/include/llvm/MC/MCSectionMachO.h @@ -20,19 +20,18 @@ namespace llvm { -/// MCSectionMachO - This represents a section on a Mach-O system (used by -/// Mac OS X). On a Mac system, these are also described in -/// /usr/include/mach-o/loader.h. +/// This represents a section on a Mach-O system (used by Mac OS X). On a Mac +/// system, these are also described in /usr/include/mach-o/loader.h. class MCSectionMachO : public MCSection { char SegmentName[16]; // Not necessarily null terminated! char SectionName[16]; // Not necessarily null terminated! - /// TypeAndAttributes - This is the SECTION_TYPE and SECTION_ATTRIBUTES - /// field of a section, drawn from the enums below. + /// This is the SECTION_TYPE and SECTION_ATTRIBUTES field of a section, drawn + /// from the enums below. unsigned TypeAndAttributes; - /// Reserved2 - The 'reserved2' field of a section, used to represent the - /// size of stubs, for example. + /// The 'reserved2' field of a section, used to represent the size of stubs, + /// for example. unsigned Reserved2; MCSectionMachO(StringRef Segment, StringRef Section, unsigned TAA, @@ -64,12 +63,12 @@ public: return (TypeAndAttributes & Value) != 0; } - /// ParseSectionSpecifier - Parse the section specifier indicated by "Spec". - /// This is a string that can appear after a .section directive in a mach-o - /// flavored .s file. If successful, this fills in the specified Out - /// parameters and returns an empty string. When an invalid section - /// specifier is present, this returns a string indicating the problem. - /// If no TAA was parsed, TAA is not altered, and TAAWasSet becomes false. + /// Parse the section specifier indicated by "Spec". This is a string that can + /// appear after a .section directive in a mach-o flavored .s file. If + /// successful, this fills in the specified Out parameters and returns an + /// empty string. When an invalid section specifier is present, this returns + /// a string indicating the problem. If no TAA was parsed, TAA is not altered, + /// and TAAWasSet becomes false. static std::string ParseSectionSpecifier(StringRef Spec, // In. StringRef &Segment, // Out. StringRef &Section, // Out. diff --git a/lib/Target/NVPTX/NVPTXSection.h b/lib/Target/NVPTX/NVPTXSection.h index 0d2627d62eb..3108ce2faa0 100644 --- a/lib/Target/NVPTX/NVPTXSection.h +++ b/lib/Target/NVPTX/NVPTXSection.h @@ -19,9 +19,8 @@ #include namespace llvm { -/// NVPTXSection - Represents a section in PTX -/// PTX does not have sections. We create this class in order to use -/// the ASMPrint interface. +/// Represents a section in PTX PTX does not have sections. We create this class +/// in order to use the ASMPrint interface. /// class NVPTXSection : public MCSection { virtual void anchor(); -- 2.34.1