diff options
Diffstat (limited to 'lib/MC/MCELFStreamer.cpp')
| -rw-r--r-- | lib/MC/MCELFStreamer.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/MC/MCELFStreamer.cpp b/lib/MC/MCELFStreamer.cpp index c4c8e6e4e7..8ddbfbbe8a 100644 --- a/lib/MC/MCELFStreamer.cpp +++ b/lib/MC/MCELFStreamer.cpp @@ -386,7 +386,9 @@ void MCELFStreamer::EmitInstToData(const MCInst &Inst) { if (Assembler.isBundlingEnabled()) { MCSectionData *SD = getCurrentSectionData(); if (SD->isBundleLocked() && !SD->isBundleGroupBeforeFirstInst()) - DF = getOrCreateDataFragment(); + // If we are bundle-locked, we re-use the current fragment. + // The bundle-locking directive ensures this is a new data fragment. + DF = cast<MCDataFragment>(getCurrentFragment()); else if (!SD->isBundleLocked() && Fixups.size() == 0) { // Optimize memory usage by emitting the instruction to a // MCCompactEncodedInstFragment when not in a bundle-locked group and @@ -394,8 +396,7 @@ void MCELFStreamer::EmitInstToData(const MCInst &Inst) { MCCompactEncodedInstFragment *CEIF = new MCCompactEncodedInstFragment(SD); CEIF->getContents().append(Code.begin(), Code.end()); return; - } - else { + } else { DF = new MCDataFragment(SD); if (SD->getBundleLockState() == MCSectionData::BundleLockedAlignToEnd) { // If this is a new fragment created for a bundle-locked group, and the |