Skip to content

Commit 1ae4e30

Browse files
committed
Fix build error after upstream commit
See 1fbfa33 rdar://155811165
1 parent e0d02f0 commit 1ae4e30

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

llvm/lib/MCCAS/MCCASObjectV1.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1539,7 +1539,7 @@ MCAlignFragmentRef::create(MCCASBuilder &MB, const MCAlignFragment &F,
15391539
if (!B)
15401540
return B.takeError();
15411541

1542-
uint64_t Count = FragmentSize / F.getValueSize();
1542+
uint64_t Count = FragmentSize / F.getFillLen();
15431543
if (F.hasEmitNops()) {
15441544
// Write 0 as size and use backend to emit nop.
15451545
writeVBR8(0, B->Data);
@@ -1551,8 +1551,8 @@ MCAlignFragmentRef::create(MCCASBuilder &MB, const MCAlignFragment &F,
15511551
return get(B->build());
15521552
}
15531553
writeVBR8(Count, B->Data);
1554-
writeVBR8(F.getValue(), B->Data);
1555-
writeVBR8(F.getValueSize(), B->Data);
1554+
writeVBR8(F.getFill(), B->Data);
1555+
writeVBR8(F.getFillLen(), B->Data);
15561556
return get(B->build());
15571557
}
15581558

@@ -1923,7 +1923,7 @@ Error MCDataFragmentMerger::tryMerge(const MCFragment &F, unsigned Size,
19231923
static Error writeAlignFragment(MCCASBuilder &Builder,
19241924
const MCAlignFragment &AF, raw_ostream &OS,
19251925
unsigned FragmentSize) {
1926-
uint64_t Count = FragmentSize / AF.getValueSize();
1926+
uint64_t Count = FragmentSize / AF.getFillLen();
19271927
if (AF.hasEmitNops()) {
19281928
if (!Builder.Asm.getBackend().writeNopData(OS, Count,
19291929
AF.getSubtargetInfo()))
@@ -1935,20 +1935,20 @@ static Error writeAlignFragment(MCCASBuilder &Builder,
19351935
auto Endian = Builder.ObjectWriter.Target.isLittleEndian() ? endianness::little
19361936
: endianness::big;
19371937
for (uint64_t I = 0; I != Count; ++I) {
1938-
switch (AF.getValueSize()) {
1938+
switch (AF.getFillLen()) {
19391939
default:
19401940
llvm_unreachable("Invalid size!");
19411941
case 1:
1942-
OS << char(AF.getValue());
1942+
OS << char(AF.getFill());
19431943
break;
19441944
case 2:
1945-
support::endian::write<uint16_t>(OS, AF.getValue(), Endian);
1945+
support::endian::write<uint16_t>(OS, AF.getFill(), Endian);
19461946
break;
19471947
case 4:
1948-
support::endian::write<uint32_t>(OS, AF.getValue(), Endian);
1948+
support::endian::write<uint32_t>(OS, AF.getFill(), Endian);
19491949
break;
19501950
case 8:
1951-
support::endian::write<uint64_t>(OS, AF.getValue(), Endian);
1951+
support::endian::write<uint64_t>(OS, AF.getFill(), Endian);
19521952
break;
19531953
}
19541954
}

0 commit comments

Comments
 (0)