From ccf6a0078a1ed1c7eb172565c7bb4bdcc43d957a Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Sun, 26 Jun 2016 14:49:00 +0000 Subject: [PATCH] Apply clang-tidy's modernize-loop-convert to lib/MC. Only minor manual fixes. No functionality change intended. llvm-svn: 273814 --- lib/MC/ConstantPools.cpp | 17 +++++----- lib/MC/MCAsmStreamer.cpp | 5 ++- lib/MC/MCDwarf.cpp | 43 +++++++++++-------------- lib/MC/MCLinkerOptimizationHint.cpp | 5 ++- lib/MC/MCParser/ELFAsmParser.cpp | 4 +-- lib/MC/WinCOFFObjectWriter.cpp | 49 ++++++++++++++--------------- 6 files changed, 56 insertions(+), 67 deletions(-) diff --git a/lib/MC/ConstantPools.cpp b/lib/MC/ConstantPools.cpp index 9643b759468..17a23d063b7 100644 --- a/lib/MC/ConstantPools.cpp +++ b/lib/MC/ConstantPools.cpp @@ -25,11 +25,10 @@ void ConstantPool::emitEntries(MCStreamer &Streamer) { if (Entries.empty()) return; Streamer.EmitDataRegion(MCDR_DataRegion); - for (EntryVecTy::const_iterator I = Entries.begin(), E = Entries.end(); - I != E; ++I) { - Streamer.EmitCodeAlignment(I->Size); // align naturally - Streamer.EmitLabel(I->Label); - Streamer.EmitValue(I->Value, I->Size, I->Loc); + for (const ConstantPoolEntry &Entry : Entries) { + Streamer.EmitCodeAlignment(Entry.Size); // align naturally + Streamer.EmitLabel(Entry.Label); + Streamer.EmitValue(Entry.Value, Entry.Size, Entry.Loc); } Streamer.EmitDataRegion(MCDR_DataRegionEnd); Entries.clear(); @@ -71,11 +70,9 @@ static void emitConstantPool(MCStreamer &Streamer, MCSection *Section, void AssemblerConstantPools::emitAll(MCStreamer &Streamer) { // Dump contents of assembler constant pools. - for (ConstantPoolMapTy::iterator CPI = ConstantPools.begin(), - CPE = ConstantPools.end(); - CPI != CPE; ++CPI) { - MCSection *Section = CPI->first; - ConstantPool &CP = CPI->second; + for (auto &CPI : ConstantPools) { + MCSection *Section = CPI.first; + ConstantPool &CP = CPI.second; emitConstantPool(Streamer, Section, CP); } diff --git a/lib/MC/MCAsmStreamer.cpp b/lib/MC/MCAsmStreamer.cpp index e842cb95d8a..3ff66ed395b 100644 --- a/lib/MC/MCAsmStreamer.cpp +++ b/lib/MC/MCAsmStreamer.cpp @@ -352,12 +352,11 @@ void MCAsmStreamer::EmitLOHDirective(MCLOHType Kind, const MCLOHArgs &Args) { OS << "\t" << MCLOHDirectiveName() << " " << str << "\t"; bool IsFirst = true; - for (MCLOHArgs::const_iterator It = Args.begin(), EndIt = Args.end(); - It != EndIt; ++It) { + for (const MCSymbol *Arg : Args) { if (!IsFirst) OS << ", "; IsFirst = false; - (*It)->print(OS, MAI); + Arg->print(OS, MAI); } EmitEOL(); } diff --git a/lib/MC/MCDwarf.cpp b/lib/MC/MCDwarf.cpp index 57252a07d9e..54b2c918c84 100644 --- a/lib/MC/MCDwarf.cpp +++ b/lib/MC/MCDwarf.cpp @@ -109,47 +109,44 @@ EmitDwarfLineTable(MCObjectStreamer *MCOS, MCSection *Section, MCSymbol *LastLabel = nullptr; // Loop through each MCDwarfLineEntry and encode the dwarf line number table. - for (auto it = LineEntries.begin(), - ie = LineEntries.end(); - it != ie; ++it) { + for (const MCDwarfLineEntry &LineEntry : LineEntries) { + int64_t LineDelta = static_cast(LineEntry.getLine()) - LastLine; - int64_t LineDelta = static_cast(it->getLine()) - LastLine; - - if (FileNum != it->getFileNum()) { - FileNum = it->getFileNum(); + if (FileNum != LineEntry.getFileNum()) { + FileNum = LineEntry.getFileNum(); MCOS->EmitIntValue(dwarf::DW_LNS_set_file, 1); MCOS->EmitULEB128IntValue(FileNum); } - if (Column != it->getColumn()) { - Column = it->getColumn(); + if (Column != LineEntry.getColumn()) { + Column = LineEntry.getColumn(); MCOS->EmitIntValue(dwarf::DW_LNS_set_column, 1); MCOS->EmitULEB128IntValue(Column); } - if (Discriminator != it->getDiscriminator()) { - Discriminator = it->getDiscriminator(); + if (Discriminator != LineEntry.getDiscriminator()) { + Discriminator = LineEntry.getDiscriminator(); unsigned Size = getULEB128Size(Discriminator); MCOS->EmitIntValue(dwarf::DW_LNS_extended_op, 1); MCOS->EmitULEB128IntValue(Size + 1); MCOS->EmitIntValue(dwarf::DW_LNE_set_discriminator, 1); MCOS->EmitULEB128IntValue(Discriminator); } - if (Isa != it->getIsa()) { - Isa = it->getIsa(); + if (Isa != LineEntry.getIsa()) { + Isa = LineEntry.getIsa(); MCOS->EmitIntValue(dwarf::DW_LNS_set_isa, 1); MCOS->EmitULEB128IntValue(Isa); } - if ((it->getFlags() ^ Flags) & DWARF2_FLAG_IS_STMT) { - Flags = it->getFlags(); + if ((LineEntry.getFlags() ^ Flags) & DWARF2_FLAG_IS_STMT) { + Flags = LineEntry.getFlags(); MCOS->EmitIntValue(dwarf::DW_LNS_negate_stmt, 1); } - if (it->getFlags() & DWARF2_FLAG_BASIC_BLOCK) + if (LineEntry.getFlags() & DWARF2_FLAG_BASIC_BLOCK) MCOS->EmitIntValue(dwarf::DW_LNS_set_basic_block, 1); - if (it->getFlags() & DWARF2_FLAG_PROLOGUE_END) + if (LineEntry.getFlags() & DWARF2_FLAG_PROLOGUE_END) MCOS->EmitIntValue(dwarf::DW_LNS_set_prologue_end, 1); - if (it->getFlags() & DWARF2_FLAG_EPILOGUE_BEGIN) + if (LineEntry.getFlags() & DWARF2_FLAG_EPILOGUE_BEGIN) MCOS->EmitIntValue(dwarf::DW_LNS_set_epilogue_begin, 1); - MCSymbol *Label = it->getLabel(); + MCSymbol *Label = LineEntry.getLabel(); // At this point we want to emit/create the sequence to encode the delta in // line numbers and the increment of the address from the previous Label @@ -159,7 +156,7 @@ EmitDwarfLineTable(MCObjectStreamer *MCOS, MCSection *Section, asmInfo->getPointerSize()); Discriminator = 0; - LastLine = it->getLine(); + LastLine = LineEntry.getLine(); LastLabel = Label; } @@ -1162,8 +1159,7 @@ void FrameEmitterImpl::EmitCFIInstruction(const MCCFIInstruction &Instr) { /// Emit frame instructions to describe the layout of the frame. void FrameEmitterImpl::EmitCFIInstructions(ArrayRef Instrs, MCSymbol *BaseLabel) { - for (unsigned i = 0, N = Instrs.size(); i < N; ++i) { - const MCCFIInstruction &Instr = Instrs[i]; + for (const MCCFIInstruction &Instr : Instrs) { MCSymbol *Label = Instr.getLabel(); // Throw out move if the label is invalid. if (Label && !Label->isDefined()) continue; // Not emitted, in dead code. @@ -1500,8 +1496,7 @@ void MCDwarfFrameEmitter::Emit(MCObjectStreamer &Streamer, MCAsmBackend *MAB, bool NeedsEHFrameSection = !MOFI->getSupportsCompactUnwindWithoutEHFrame(); if (IsEH && MOFI->getCompactUnwindSection()) { bool SectionEmitted = false; - for (unsigned i = 0, n = FrameArray.size(); i < n; ++i) { - const MCDwarfFrameInfo &Frame = FrameArray[i]; + for (const MCDwarfFrameInfo &Frame : FrameArray) { if (Frame.CompactUnwindEncoding == 0) continue; if (!SectionEmitted) { Streamer.SwitchSection(MOFI->getCompactUnwindSection()); diff --git a/lib/MC/MCLinkerOptimizationHint.cpp b/lib/MC/MCLinkerOptimizationHint.cpp index 9dd1439f0fb..f71fc783012 100644 --- a/lib/MC/MCLinkerOptimizationHint.cpp +++ b/lib/MC/MCLinkerOptimizationHint.cpp @@ -28,9 +28,8 @@ void MCLOHDirective::emit_impl(raw_ostream &OutStream, const MCAsmLayout &Layout) const { encodeULEB128(Kind, OutStream); encodeULEB128(Args.size(), OutStream); - for (LOHArgs::const_iterator It = Args.begin(), EndIt = Args.end(); - It != EndIt; ++It) - encodeULEB128(ObjWriter.getSymbolAddress(**It, Layout), OutStream); + for (const MCSymbol *Arg : Args) + encodeULEB128(ObjWriter.getSymbolAddress(*Arg, Layout), OutStream); } void MCLOHDirective::emit(MachObjectWriter &ObjWriter, diff --git a/lib/MC/MCParser/ELFAsmParser.cpp b/lib/MC/MCParser/ELFAsmParser.cpp index 1e02f05abc4..5650373a12d 100644 --- a/lib/MC/MCParser/ELFAsmParser.cpp +++ b/lib/MC/MCParser/ELFAsmParser.cpp @@ -262,8 +262,8 @@ bool ELFAsmParser::ParseSectionName(StringRef &SectionName) { static unsigned parseSectionFlags(StringRef flagsStr, bool *UseLastGroup) { unsigned flags = 0; - for (unsigned i = 0; i < flagsStr.size(); i++) { - switch (flagsStr[i]) { + for (char i : flagsStr) { + switch (i) { case 'a': flags |= ELF::SHF_ALLOC; break; diff --git a/lib/MC/WinCOFFObjectWriter.cpp b/lib/MC/WinCOFFObjectWriter.cpp index 5a44099138f..f316a5af387 100644 --- a/lib/MC/WinCOFFObjectWriter.cpp +++ b/lib/MC/WinCOFFObjectWriter.cpp @@ -536,48 +536,47 @@ void WinCOFFObjectWriter::WriteSymbol(const COFFSymbol &S) { void WinCOFFObjectWriter::WriteAuxiliarySymbols( const COFFSymbol::AuxiliarySymbols &S) { - for (COFFSymbol::AuxiliarySymbols::const_iterator i = S.begin(), e = S.end(); - i != e; ++i) { - switch (i->AuxType) { + for (const AuxSymbol &i : S) { + switch (i.AuxType) { case ATFunctionDefinition: - writeLE32(i->Aux.FunctionDefinition.TagIndex); - writeLE32(i->Aux.FunctionDefinition.TotalSize); - writeLE32(i->Aux.FunctionDefinition.PointerToLinenumber); - writeLE32(i->Aux.FunctionDefinition.PointerToNextFunction); - WriteZeros(sizeof(i->Aux.FunctionDefinition.unused)); + writeLE32(i.Aux.FunctionDefinition.TagIndex); + writeLE32(i.Aux.FunctionDefinition.TotalSize); + writeLE32(i.Aux.FunctionDefinition.PointerToLinenumber); + writeLE32(i.Aux.FunctionDefinition.PointerToNextFunction); + WriteZeros(sizeof(i.Aux.FunctionDefinition.unused)); if (UseBigObj) WriteZeros(COFF::Symbol32Size - COFF::Symbol16Size); break; case ATbfAndefSymbol: - WriteZeros(sizeof(i->Aux.bfAndefSymbol.unused1)); - writeLE16(i->Aux.bfAndefSymbol.Linenumber); - WriteZeros(sizeof(i->Aux.bfAndefSymbol.unused2)); - writeLE32(i->Aux.bfAndefSymbol.PointerToNextFunction); - WriteZeros(sizeof(i->Aux.bfAndefSymbol.unused3)); + WriteZeros(sizeof(i.Aux.bfAndefSymbol.unused1)); + writeLE16(i.Aux.bfAndefSymbol.Linenumber); + WriteZeros(sizeof(i.Aux.bfAndefSymbol.unused2)); + writeLE32(i.Aux.bfAndefSymbol.PointerToNextFunction); + WriteZeros(sizeof(i.Aux.bfAndefSymbol.unused3)); if (UseBigObj) WriteZeros(COFF::Symbol32Size - COFF::Symbol16Size); break; case ATWeakExternal: - writeLE32(i->Aux.WeakExternal.TagIndex); - writeLE32(i->Aux.WeakExternal.Characteristics); - WriteZeros(sizeof(i->Aux.WeakExternal.unused)); + writeLE32(i.Aux.WeakExternal.TagIndex); + writeLE32(i.Aux.WeakExternal.Characteristics); + WriteZeros(sizeof(i.Aux.WeakExternal.unused)); if (UseBigObj) WriteZeros(COFF::Symbol32Size - COFF::Symbol16Size); break; case ATFile: writeBytes( - StringRef(reinterpret_cast(&i->Aux), + StringRef(reinterpret_cast(&i.Aux), UseBigObj ? COFF::Symbol32Size : COFF::Symbol16Size)); break; case ATSectionDefinition: - writeLE32(i->Aux.SectionDefinition.Length); - writeLE16(i->Aux.SectionDefinition.NumberOfRelocations); - writeLE16(i->Aux.SectionDefinition.NumberOfLinenumbers); - writeLE32(i->Aux.SectionDefinition.CheckSum); - writeLE16(static_cast(i->Aux.SectionDefinition.Number)); - write8(i->Aux.SectionDefinition.Selection); - WriteZeros(sizeof(i->Aux.SectionDefinition.unused)); - writeLE16(static_cast(i->Aux.SectionDefinition.Number >> 16)); + writeLE32(i.Aux.SectionDefinition.Length); + writeLE16(i.Aux.SectionDefinition.NumberOfRelocations); + writeLE16(i.Aux.SectionDefinition.NumberOfLinenumbers); + writeLE32(i.Aux.SectionDefinition.CheckSum); + writeLE16(static_cast(i.Aux.SectionDefinition.Number)); + write8(i.Aux.SectionDefinition.Selection); + WriteZeros(sizeof(i.Aux.SectionDefinition.unused)); + writeLE16(static_cast(i.Aux.SectionDefinition.Number >> 16)); if (UseBigObj) WriteZeros(COFF::Symbol32Size - COFF::Symbol16Size); break;