commit a5f45da27e5c63102780bcfb548873e1d268e5f1
author Duncan P. N. Exon Smith <dexonsmith@apple.com> Sat Oct 10 00:13:11 2015 +0000
committer Duncan P. N. Exon Smith <dexonsmith@apple.com> Sat Oct 10 00:13:11 2015 +0000
tree d9fa5715905c4fb8779771c9b7ee85f67295bcbe
parent d90a4176ffd84517da1fbb47fa33aef1d5ad6e4c

MC: Remove implicit ilist iterator conversions, NFC

llvm-svn: 249922

llvm/lib/MC/MCAssembler.cpp

diff --git a/llvm/lib/MC/MCAssembler.cpp b/llvm/lib/MC/MCAssembler.cpp
index c656b8a..971dc52 100644
--- a/llvm/lib/MC/MCAssembler.cpp
+++ b/llvm/lib/MC/MCAssembler.cpp
@@ -1095,7 +1095,7 @@
       break;
     }
     if (RelaxedFrag && !FirstRelaxedFragment)
-      FirstRelaxedFragment = I;
+      FirstRelaxedFragment = &*I;
   }
   if (FirstRelaxedFragment) {
     Layout.invalidateFragmentsFrom(FirstRelaxedFragment);

llvm/lib/MC/MCMachOStreamer.cpp

diff --git a/llvm/lib/MC/MCMachOStreamer.cpp b/llvm/lib/MC/MCMachOStreamer.cpp
index 50ee08f..f7a0615 100644
--- a/llvm/lib/MC/MCMachOStreamer.cpp
+++ b/llvm/lib/MC/MCMachOStreamer.cpp
@@ -472,7 +472,7 @@
     const MCSymbol *CurrentAtom = nullptr;
     for (MCSection::iterator it2 = it->begin(), ie2 = it->end(); it2 != ie2;
          ++it2) {
-      if (const MCSymbol *Symbol = DefiningSymbolMap.lookup(it2))
+      if (const MCSymbol *Symbol = DefiningSymbolMap.lookup(&*it2))
         CurrentAtom = Symbol;
       it2->setAtom(CurrentAtom);
     }

llvm/lib/MC/MCObjectStreamer.cpp

diff --git a/llvm/lib/MC/MCObjectStreamer.cpp b/llvm/lib/MC/MCObjectStreamer.cpp
index 992b2cf..0da61b5 100644
--- a/llvm/lib/MC/MCObjectStreamer.cpp
+++ b/llvm/lib/MC/MCObjectStreamer.cpp
@@ -94,7 +94,7 @@
   assert(getCurrentSectionOnly() && "No current section!");
 
   if (CurInsertionPoint != getCurrentSectionOnly()->getFragmentList().begin())
-    return std::prev(CurInsertionPoint);
+    return &*std::prev(CurInsertionPoint);
 
   return nullptr;
 }

llvm/lib/MC/MCSection.cpp

diff --git a/llvm/lib/MC/MCSection.cpp b/llvm/lib/MC/MCSection.cpp
index e0d29bb..dbd544a 100644
--- a/llvm/lib/MC/MCSection.cpp
+++ b/llvm/lib/MC/MCSection.cpp
@@ -72,7 +72,7 @@
   if (MI == SubsectionFragmentMap.end())
     IP = end();
   else
-    IP = MI->second;
+    IP = MI->second->getIterator();
   if (!ExactMatch && Subsection != 0) {
     // The GNU as documentation claims that subsections have an alignment of 4,
     // although this appears not to be the case.