MCAtom extending methods need to extend the range of the atom as well.

llvm-svn: 141557

2 files changed, 20 insertions, 9 deletions

diff --git a/llvm/include/llvm/MC/MCAtom.h b/llvm/include/llvm/MC/MCAtom.h
index 6805c39756c..682cf7cd76c 100644
--- a/llvm/include/llvm/MC/MCAtom.h
+++ b/llvm/include/llvm/MC/MCAtom.h
@@ -49,15 +49,8 @@ public:
   bool isTextAtom() { return Type == TextAtom; }
   bool isDataAtom() { return Type == DataAtom; }
 
-  void addInst(const MCInst &I, uint64_t Address) {
-    assert(Type == TextAtom && "Trying to add MCInst to a non-text atom!");
-    Text.push_back(std::make_pair(Address, I));
-  }
-
-  void addData(const MCData &D) {
-    assert(Type == DataAtom && "Trying to add MCData to a non-data atom!");
-    Data.push_back(D);
-  }
+  void addInst(const MCInst &I, uint64_t Address, unsigned Size);
+  void addData(const MCData &D);
 
   /// split - Splits the atom in two at a given address, which must align with
   /// and instruction boundary if this is a TextAtom.  Returns the newly created
diff --git a/llvm/lib/MC/MCAtom.cpp b/llvm/lib/MC/MCAtom.cpp
index cd7dbf334b0..d71444324f3 100644
--- a/llvm/lib/MC/MCAtom.cpp
+++ b/llvm/lib/MC/MCAtom.cpp
@@ -13,6 +13,24 @@
 
 using namespace llvm;
 
+void MCAtom::addInst(const MCInst &I, uint64_t Address, unsigned Size) {
+  assert(Type == TextAtom && "Trying to add MCInst to a non-text atom!");
+
+  assert(Address < End+Size &&
+         "Instruction not contiguous with end of atom!");
+  if (Address > End)
+    Parent->remap(this, Begin, End+Size);
+
+  Text.push_back(std::make_pair(Address, I));
+}
+
+void MCAtom::addData(const MCData &D) {
+  assert(Type == DataAtom && "Trying to add MCData to a non-data atom!");
+  Parent->remap(this, Begin, End+1);
+
+  Data.push_back(D);
+}
+
 MCAtom *MCAtom::split(uint64_t SplitPt) {
   assert((SplitPt > Begin && SplitPt <= End) &&
          "Splitting at point not contained in atom!");