diff options
| author | Derek Schuff <dschuff@chromium.org> | 2012-10-12 16:24:16 -0700 |
|---|---|---|
| committer | Derek Schuff <dschuff@chromium.org> | 2012-10-12 16:24:16 -0700 |
| commit | 5eceb0e04023bffa93f5683f356c09e35f9f4f43 (patch) | |
| tree | 07d52d1eaf89a4b4544b48322dcdbc4f65b102d4 /lib/MC/MCObjectStreamer.cpp | |
| parent | 4db6bb7837c58641c4416e87643833bca4945841 (diff) | |
| parent | 40573998821fde7ffeabe8507f4c9e8c7cf762f6 (diff) | |
Merge commit '40573998821fde7ffeabe8507f4c9e8c7cf762f6'
Conflicts:
include/llvm/MC/MCAssembler.h
lib/Target/ARM/ARMISelLowering.cpp
lib/Target/X86/X86TargetMachine.h
tools/llc/llc.cpp
Diffstat (limited to 'lib/MC/MCObjectStreamer.cpp')
| -rw-r--r-- | lib/MC/MCObjectStreamer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/MC/MCObjectStreamer.cpp b/lib/MC/MCObjectStreamer.cpp index 6f32bf57b6..37a445fae0 100644 --- a/lib/MC/MCObjectStreamer.cpp +++ b/lib/MC/MCObjectStreamer.cpp @@ -195,7 +195,6 @@ void MCObjectStreamer::EmitBundleUnlock() { ".bundle_unlock called, but bundling disabled!"); assert(SD->isBundleLocked() && ".bundle_unlock called when bundle not locked"); - // If there has been at least one fragment emitted inside // this bundle lock, then we need to mark the last emitted // fragment as the group end. @@ -368,6 +367,7 @@ void MCObjectStreamer::EmitFill(uint64_t NumBytes, uint8_t FillValue, // FIXME: A MCFillFragment would be more memory efficient but MCExpr has // problems evaluating expressions across multiple fragments. getOrCreateDataFragment()->getContents().append(NumBytes, FillValue); + getCurrentSectionData()->MarkBundleOffsetUnknown(); } void MCObjectStreamer::FinishImpl() { |