Skip to content

Commit de5aa8d

Browse files
committed
[MC] Remove unused MCCompactEncodedInstFragment
This has been used after #94950.
1 parent 34d4827 commit de5aa8d

File tree

4 files changed

+1
-49
lines changed

4 files changed

+1
-49
lines changed

llvm/include/llvm/MC/MCFragment.h

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ class MCFragment {
3838
enum FragmentType : uint8_t {
3939
FT_Align,
4040
FT_Data,
41-
FT_CompactEncodedInst,
4241
FT_Fill,
4342
FT_Nops,
4443
FT_Relaxable,
@@ -136,7 +135,6 @@ class MCEncodedFragment : public MCFragment {
136135
default:
137136
return false;
138137
case MCFragment::FT_Relaxable:
139-
case MCFragment::FT_CompactEncodedInst:
140138
case MCFragment::FT_Data:
141139
case MCFragment::FT_Dwarf:
142140
case MCFragment::FT_DwarfFrame:
@@ -240,21 +238,6 @@ class MCDataFragment : public MCEncodedFragmentWithFixups<32, 4> {
240238
void setLinkerRelaxable() { LinkerRelaxable = true; }
241239
};
242240

243-
/// This is a compact (memory-size-wise) fragment for holding an encoded
244-
/// instruction (non-relaxable) that has no fixups registered. When applicable,
245-
/// it can be used instead of MCDataFragment and lead to lower memory
246-
/// consumption.
247-
///
248-
class MCCompactEncodedInstFragment : public MCEncodedFragmentWithContents<4> {
249-
public:
250-
MCCompactEncodedInstFragment()
251-
: MCEncodedFragmentWithContents(FT_CompactEncodedInst, true) {}
252-
253-
static bool classof(const MCFragment *F) {
254-
return F->getKind() == MCFragment::FT_CompactEncodedInst;
255-
}
256-
};
257-
258241
/// A relaxable fragment holds on to its MCInst, since it may need to be
259242
/// relaxed during the assembler layout and relaxation stage.
260243
///

llvm/lib/MC/MCAssembler.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ STATISTIC(EmittedRelaxableFragments,
5656
"Number of emitted assembler fragments - relaxable");
5757
STATISTIC(EmittedDataFragments,
5858
"Number of emitted assembler fragments - data");
59-
STATISTIC(EmittedCompactEncodedInstFragments,
60-
"Number of emitted assembler fragments - compact encoded inst");
6159
STATISTIC(EmittedAlignFragments,
6260
"Number of emitted assembler fragments - align");
6361
STATISTIC(EmittedFillFragments,
@@ -253,8 +251,6 @@ uint64_t MCAssembler::computeFragmentSize(const MCFragment &F) const {
253251
return cast<MCDataFragment>(F).getContents().size();
254252
case MCFragment::FT_Relaxable:
255253
return cast<MCRelaxableFragment>(F).getContents().size();
256-
case MCFragment::FT_CompactEncodedInst:
257-
return cast<MCCompactEncodedInstFragment>(F).getContents().size();
258254
case MCFragment::FT_Fill: {
259255
auto &FF = cast<MCFillFragment>(F);
260256
int64_t NumValues = 0;
@@ -662,11 +658,6 @@ static void writeFragment(raw_ostream &OS, const MCAssembler &Asm,
662658
OS << cast<MCRelaxableFragment>(F).getContents();
663659
break;
664660

665-
case MCFragment::FT_CompactEncodedInst:
666-
++stats::EmittedCompactEncodedInstFragments;
667-
OS << cast<MCCompactEncodedInstFragment>(F).getContents();
668-
break;
669-
670661
case MCFragment::FT_Fill: {
671662
++stats::EmittedFillFragments;
672663
const MCFillFragment &FF = cast<MCFillFragment>(F);

llvm/lib/MC/MCFragment.cpp

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@ void MCFragment::destroy() {
3737
case FT_Data:
3838
cast<MCDataFragment>(this)->~MCDataFragment();
3939
return;
40-
case FT_CompactEncodedInst:
41-
cast<MCCompactEncodedInstFragment>(this)->~MCCompactEncodedInstFragment();
42-
return;
4340
case FT_Fill:
4441
cast<MCFillFragment>(this)->~MCFillFragment();
4542
return;
@@ -107,8 +104,6 @@ LLVM_DUMP_METHOD void MCFragment::dump() const {
107104
switch (getKind()) {
108105
case MCFragment::FT_Align: OS << "MCAlignFragment"; break;
109106
case MCFragment::FT_Data: OS << "MCDataFragment"; break;
110-
case MCFragment::FT_CompactEncodedInst:
111-
OS << "MCCompactEncodedInstFragment"; break;
112107
case MCFragment::FT_Fill: OS << "MCFillFragment"; break;
113108
case MCFragment::FT_Nops:
114109
OS << "MCFNopsFragment";
@@ -168,19 +163,6 @@ LLVM_DUMP_METHOD void MCFragment::dump() const {
168163
}
169164
break;
170165
}
171-
case MCFragment::FT_CompactEncodedInst: {
172-
const auto *CEIF =
173-
cast<MCCompactEncodedInstFragment>(this);
174-
OS << "\n ";
175-
OS << " Contents:[";
176-
const SmallVectorImpl<char> &Contents = CEIF->getContents();
177-
for (unsigned i = 0, e = Contents.size(); i != e; ++i) {
178-
if (i) OS << ",";
179-
OS << hexdigit((Contents[i] >> 4) & 0xF) << hexdigit(Contents[i] & 0xF);
180-
}
181-
OS << "] (" << Contents.size() << " bytes)";
182-
break;
183-
}
184166
case MCFragment::FT_Fill: {
185167
const auto *FF = cast<MCFillFragment>(this);
186168
OS << " Value:" << static_cast<unsigned>(FF->getValue())

llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -437,8 +437,6 @@ static size_t getSizeForInstFragment(const MCFragment *F) {
437437
return cast<MCDataFragment>(*F).getContents().size();
438438
case MCFragment::FT_Relaxable:
439439
return cast<MCRelaxableFragment>(*F).getContents().size();
440-
case MCFragment::FT_CompactEncodedInst:
441-
return cast<MCCompactEncodedInstFragment>(*F).getContents().size();
442440
}
443441
}
444442

@@ -884,9 +882,7 @@ bool X86AsmBackend::finishLayout(const MCAssembler &Asm) const {
884882
if (LabeledFragments.count(&F))
885883
Relaxable.clear();
886884

887-
if (F.getKind() == MCFragment::FT_Data ||
888-
F.getKind() == MCFragment::FT_CompactEncodedInst)
889-
// Skip and ignore
885+
if (F.getKind() == MCFragment::FT_Data) // Skip and ignore
890886
continue;
891887

892888
if (F.getKind() == MCFragment::FT_Relaxable) {

0 commit comments

Comments
 (0)