AsmPrinter: Rename begin_values() => values_begin(), NFC

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@238456 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/CodeGen/DIE.h b/include/llvm/CodeGen/DIE.h
index e247d46ba5b503900b974d71413423ccafe385bf..efc27b340f8c7bde475c7e9800fa96c4215402a5 100644 (file)
--- a/include/llvm/CodeGen/DIE.h
+++ b/include/llvm/CodeGen/DIE.h
@@ -503,10 +503,10 @@ public:
   typedef SmallVectorImpl<DIEValue>::const_iterator value_iterator;
   typedef iterator_range<value_iterator> value_range;
 
-  value_iterator begin_values() const { return Values.begin(); }
-  value_iterator end_values() const { return Values.end(); }
+  value_iterator values_begin() const { return Values.begin(); }
+  value_iterator values_end() const { return Values.end(); }
   value_range values() const {
-    return llvm::make_range(begin_values(), end_values());
+    return llvm::make_range(values_begin(), values_end());
   }
 
   void setValue(unsigned I, DIEValue New) {

diff --git a/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp b/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
index 213e968e00bf362d0d8fd69618d432c730bc0588..689184a651ed13533be6aaebe707c1cdefd64663 100644 (file)
--- a/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
+++ b/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
@@ -242,7 +242,7 @@ void DwarfCompileUnit::initStmtList() {
   MCSymbol *LineTableStartSym =
       Asm->OutStreamer->getDwarfLineTableSymbol(getUniqueID());
 
-  stmtListIndex = std::distance(UnitDie.begin_values(), UnitDie.end_values());
+  stmtListIndex = std::distance(UnitDie.values_begin(), UnitDie.values_end());
 
   // DW_AT_stmt_list is a offset of line number information for this
   // compile unit in debug_line section. For split dwarf this is
@@ -255,7 +255,7 @@ void DwarfCompileUnit::initStmtList() {
 }
 
 void DwarfCompileUnit::applyStmtList(DIE &D) {
-  D.addValue(UnitDie.begin_values()[stmtListIndex]);
+  D.addValue(UnitDie.values_begin()[stmtListIndex]);
 }
 
 void DwarfCompileUnit::attachLowHighPC(DIE &D, const MCSymbol *Begin,

diff --git a/tools/dsymutil/DwarfLinker.cpp b/tools/dsymutil/DwarfLinker.cpp
index a62dab67f8c48510dc403d9de8f473c7d22cda88..e3e7e82eab62527bf54d1838559a2d8669154306 100644 (file)
--- a/tools/dsymutil/DwarfLinker.cpp
+++ b/tools/dsymutil/DwarfLinker.cpp
@@ -69,13 +69,13 @@ struct PatchLocation {
   PatchLocation() : Die(nullptr), Index(0) {}
   PatchLocation(DIE &Die, unsigned Index) : Die(&Die), Index(Index) {}
   PatchLocation(DIE &Die)
-      : Die(&Die), Index(std::distance(Die.begin_values(), Die.end_values())) {}
+      : Die(&Die), Index(std::distance(Die.values_begin(), Die.values_end())) {}
 
   void set(uint64_t New) const {
     assert(Die);
     assert((signed)Index <
-           std::distance(Die->begin_values(), Die->end_values()));
-    const auto &Old = Die->begin_values()[Index];
+           std::distance(Die->values_begin(), Die->values_end()));
+    const auto &Old = Die->values_begin()[Index];
     assert(Old.getType() == DIEValue::isInteger);
     Die->setValue(Index,
                   DIEValue(Old.getAttribute(), Old.getForm(), DIEInteger(New)));
@@ -84,9 +84,9 @@ struct PatchLocation {
   uint64_t get() const {
     assert(Die);
     assert((signed)Index <
-           std::distance(Die->begin_values(), Die->end_values()));
-    assert(Die->begin_values()[Index].getType() == DIEValue::isInteger);
-    return Die->begin_values()[Index].getDIEInteger().getValue();
+           std::distance(Die->values_begin(), Die->values_end()));
+    assert(Die->values_begin()[Index].getType() == DIEValue::isInteger);
+    return Die->values_begin()[Index].getDIEInteger().getValue();
   }
 };
 
@@ -2331,13 +2331,13 @@ void DwarfLinker::patchLineTableForUnit(CompileUnit &Unit,
 
   // Update the cloned DW_AT_stmt_list with the correct debug_line offset.
   if (auto *OutputDIE = Unit.getOutputUnitDIE()) {
-    auto Stmt = std::find_if(OutputDIE->begin_values(), OutputDIE->end_values(),
+    auto Stmt = std::find_if(OutputDIE->values_begin(), OutputDIE->values_end(),
                              [](const DIEValue &Value) {
       return Value.getAttribute() == dwarf::DW_AT_stmt_list;
     });
-    assert(Stmt != OutputDIE->end_values() &&
+    assert(Stmt != OutputDIE->values_end() &&
            "Didn't find DW_AT_stmt_list in cloned DIE!");
-    OutputDIE->setValue(Stmt - OutputDIE->begin_values(),
+    OutputDIE->setValue(Stmt - OutputDIE->values_begin(),
                         DIEValue(Stmt->getAttribute(), Stmt->getForm(),
                                  DIEInteger(Streamer->getLineSectionSize())));
   }