summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2015-05-25 20:39:23 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2015-05-25 20:39:23 +0000
commit25ffbe17c981a11ee1e4a17f1c731618f9e5d2b7 (patch)
tree81c041b3dbf3a8629b0a4a95bb3986aa63d44830
parent042a39274a5c9a4293a543573bfeb6bde741d87d (diff)
downloadbcm5719-llvm-25ffbe17c981a11ee1e4a17f1c731618f9e5d2b7.tar.gz
bcm5719-llvm-25ffbe17c981a11ee1e4a17f1c731618f9e5d2b7.zip
Insert MCSectionData into the section list directly in getOrCreateSectionData.
Removing the logic from the constructor will make it easier to merge MCSectionData and MCSection. llvm-svn: 238155
-rw-r--r--llvm/include/llvm/MC/MCAssembler.h8
-rw-r--r--llvm/lib/MC/MCAssembler.cpp6
2 files changed, 6 insertions, 8 deletions
diff --git a/llvm/include/llvm/MC/MCAssembler.h b/llvm/include/llvm/MC/MCAssembler.h
index ee7583e0e82..59f8e0ad41b 100644
--- a/llvm/include/llvm/MC/MCAssembler.h
+++ b/llvm/include/llvm/MC/MCAssembler.h
@@ -566,7 +566,7 @@ private:
public:
// Only for use as sentinel.
MCSectionData();
- MCSectionData(MCSection &Section, MCAssembler *A = nullptr);
+ MCSectionData(MCSection &Section);
MCSection &getSection() const { return *Section; }
@@ -971,8 +971,10 @@ public:
if (Created)
*Created = !Entry;
- if (!Entry)
- Entry = new MCSectionData(Section, this);
+ if (!Entry) {
+ Entry = new MCSectionData(Section);
+ Sections.push_back(Entry);
+ }
return *Entry;
}
diff --git a/llvm/lib/MC/MCAssembler.cpp b/llvm/lib/MC/MCAssembler.cpp
index d7712f7fc98..2fa023ee120 100644
--- a/llvm/lib/MC/MCAssembler.cpp
+++ b/llvm/lib/MC/MCAssembler.cpp
@@ -292,11 +292,7 @@ MCEncodedFragmentWithFixups::~MCEncodedFragmentWithFixups() {
MCSectionData::MCSectionData() : Section(nullptr) {}
-MCSectionData::MCSectionData(MCSection &Section, MCAssembler *A)
- : Section(&Section) {
- if (A)
- A->getSectionList().push_back(this);
-}
+MCSectionData::MCSectionData(MCSection &Section) : Section(&Section) {}
MCSectionData::iterator
MCSectionData::getSubsectionInsertionPoint(unsigned Subsection) {
OpenPOWER on IntegriCloud