Skip to content

Commit ea351fe

Browse files
Merge pull request #11287 from swiftlang/MCCASNextFix
MCCAS fixes on next.
2 parents 9f86b3c + 6dac933 commit ea351fe

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

llvm/lib/MCCAS/MCCASObjectV1.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1635,7 +1635,7 @@ MCCVInlineLineTableFragmentRef::create(MCCASBuilder &MB, const MCFragment &F,
16351635
Expected<Builder> B = Builder::startNode(MB.Schema, KindString);
16361636
if (!B)
16371637
return B.takeError();
1638-
llvm::append_range(B->Data, F.getContents());
1638+
B->Data.append(FragmentContents.begin(), FragmentContents.end());
16391639
return get(B->build());
16401640
}
16411641

@@ -1704,7 +1704,7 @@ MCLEBFragmentRef::create(MCCASBuilder &MB, const MCFragment &F,
17041704
Expected<Builder> B = Builder::startNode(MB.Schema, KindString);
17051705
if (!B)
17061706
return B.takeError();
1707-
llvm::append_range(B->Data, F.getContents());
1707+
B->Data.append(FragmentContents.begin(), FragmentContents.end());
17081708
return get(B->build());
17091709
}
17101710

@@ -1904,7 +1904,8 @@ Error MCDataFragmentMerger::tryMerge(const MCFragment &F, unsigned Size,
19041904
F.getKind() == MCFragment::FT_Data ||
19051905
F.getKind() == MCFragment::FT_Dwarf ||
19061906
F.getKind() == MCFragment::FT_DwarfFrame ||
1907-
F.getKind() == MCFragment::FT_Align;
1907+
F.getKind() == MCFragment::FT_Align ||
1908+
F.getKind() == MCFragment::FT_CVDefRange;
19081909

19091910
// If not the same atom, flush merge candidate and return false.
19101911
if (!IsSameAtom || !IsMergeableFragment || Oversized) {

0 commit comments

Comments
 (0)