Use std::unique_ptr. NFC.

[oota-llvm.git] / lib / MC / MCSection.cpp

diff --git a/lib/MC/MCSection.cpp b/lib/MC/MCSection.cpp
index 6ad6496fcb92ea5faf35408cae433545d7ac4255..dbd544a44ce32afd56ae34891ecd5f975c65e1b4 100644 (file)
--- a/lib/MC/MCSection.cpp
+++ b/lib/MC/MCSection.cpp
@@ -20,7 +20,8 @@ using namespace llvm;
 //===----------------------------------------------------------------------===//
 
 MCSection::MCSection(SectionVariant V, SectionKind K, MCSymbol *Begin)
-    : Begin(Begin), HasInstructions(false), Data(*this), Variant(V), Kind(K) {}
+    : Begin(Begin), BundleGroupBeforeFirstInst(false), HasInstructions(false),
+      IsRegistered(false), DummyFragment(this), Variant(V), Kind(K) {}
 
 MCSymbol *MCSection::getEndSymbol(MCContext &Ctx) {
   if (!End)
@@ -52,26 +53,57 @@ void MCSection::setBundleLockState(BundleLockStateType NewState) {
   ++BundleLockNestingDepth;
 }
 
-MCSectionData::iterator MCSection::begin() { return Data.begin(); }
-
-MCSectionData::iterator MCSection::end() { return Data.end(); }
+MCSection::iterator
+MCSection::getSubsectionInsertionPoint(unsigned Subsection) {
+  if (Subsection == 0 && SubsectionFragmentMap.empty())
+    return end();
+
+  SmallVectorImpl<std::pair<unsigned, MCFragment *>>::iterator MI =
+      std::lower_bound(SubsectionFragmentMap.begin(),
+                       SubsectionFragmentMap.end(),
+                       std::make_pair(Subsection, (MCFragment *)nullptr));
+  bool ExactMatch = false;
+  if (MI != SubsectionFragmentMap.end()) {
+    ExactMatch = MI->first == Subsection;
+    if (ExactMatch)
+      ++MI;
+  }
+  iterator IP;
+  if (MI == SubsectionFragmentMap.end())
+    IP = end();
+  else
+    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.
+    MCFragment *F = new MCDataFragment();
+    SubsectionFragmentMap.insert(MI, std::make_pair(Subsection, F));
+    getFragmentList().insert(IP, F);
+    F->setParent(this);
+  }
 
-MCSectionData::FragmentListType &MCSection::getFragmentList() {
-  return Data.getFragmentList();
+  return IP;
 }
 
-MCSectionData::iterator MCSectionData::begin() { return Fragments.begin(); }
-
-MCSectionData::iterator MCSectionData::end() { return Fragments.end(); }
+#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
+void MCSection::dump() {
+  raw_ostream &OS = llvm::errs();
 
-MCSectionData::reverse_iterator MCSectionData::rbegin() {
-  return Fragments.rbegin();
+  OS << "<MCSection";
+  OS << " Fragments:[\n      ";
+  for (auto it = begin(), ie = end(); it != ie; ++it) {
+    if (it != begin())
+      OS << ",\n      ";
+    it->dump();
+  }
+  OS << "]>";
 }
+#endif
 
-MCSectionData::reverse_iterator MCSectionData::rend() {
-  return Fragments.rend();
-}
+MCSection::iterator MCSection::begin() { return Fragments.begin(); }
+
+MCSection::iterator MCSection::end() { return Fragments.end(); }
 
-size_t MCSectionData::size() const { return Fragments.size(); }
+MCSection::reverse_iterator MCSection::rbegin() { return Fragments.rbegin(); }
 
-bool MCSectionData::empty() const { return Fragments.empty(); }
+MCSection::reverse_iterator MCSection::rend() { return Fragments.rend(); }