Skip to content

Commit cf89e1c

Browse files
NFC: Rename MCSafeSEHFragment to MCSymbolIdFragment
Summary: This fragment emits a symbol ID and will be useful for more than just Safe SEH tables (e.g., I plan to re-use it for Control Flow Guard tables). This is simply a rename refactor. Reviewers: rnk Subscribers: llvm-commits, hiraditya Differential Revision: https://reviews.llvm.org/D39770 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@317703 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent 27b6b31 commit cf89e1c

File tree

4 files changed

+15
-14
lines changed

4 files changed

+15
-14
lines changed

include/llvm/MC/MCFragment.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class MCFragment : public ilist_node_with_parent<MCFragment, MCSection> {
4242
FT_DwarfFrame,
4343
FT_LEB,
4444
FT_Padding,
45-
FT_SafeSEH,
45+
FT_SymbolId,
4646
FT_CVInlineLines,
4747
FT_CVDefRange,
4848
FT_Dummy
@@ -562,12 +562,13 @@ class MCDwarfCallFrameFragment : public MCFragment {
562562
}
563563
};
564564

565-
class MCSafeSEHFragment : public MCFragment {
565+
/// Represents a symbol table index fragment.
566+
class MCSymbolIdFragment : public MCFragment {
566567
const MCSymbol *Sym;
567568

568569
public:
569-
MCSafeSEHFragment(const MCSymbol *Sym, MCSection *Sec = nullptr)
570-
: MCFragment(FT_SafeSEH, false, 0, Sec), Sym(Sym) {}
570+
MCSymbolIdFragment(const MCSymbol *Sym, MCSection *Sec = nullptr)
571+
: MCFragment(FT_SymbolId, false, 0, Sec), Sym(Sym) {}
571572

572573
/// \name Accessors
573574
/// @{
@@ -578,7 +579,7 @@ class MCSafeSEHFragment : public MCFragment {
578579
/// @}
579580

580581
static bool classof(const MCFragment *F) {
581-
return F->getKind() == MCFragment::FT_SafeSEH;
582+
return F->getKind() == MCFragment::FT_SymbolId;
582583
}
583584
};
584585

lib/MC/MCAssembler.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ uint64_t MCAssembler::computeFragmentSize(const MCAsmLayout &Layout,
290290
case MCFragment::FT_Padding:
291291
return cast<MCPaddingFragment>(F).getSize();
292292

293-
case MCFragment::FT_SafeSEH:
293+
case MCFragment::FT_SymbolId:
294294
return 4;
295295

296296
case MCFragment::FT_Align: {
@@ -563,8 +563,8 @@ static void writeFragment(const MCAssembler &Asm, const MCAsmLayout &Layout,
563563
break;
564564
}
565565

566-
case MCFragment::FT_SafeSEH: {
567-
const MCSafeSEHFragment &SF = cast<MCSafeSEHFragment>(F);
566+
case MCFragment::FT_SymbolId: {
567+
const MCSymbolIdFragment &SF = cast<MCSymbolIdFragment>(F);
568568
OW->write32(SF.getSymbol()->getIndex());
569569
break;
570570
}

lib/MC/MCFragment.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,8 @@ void MCFragment::destroy() {
281281
case FT_Padding:
282282
delete cast<MCPaddingFragment>(this);
283283
return;
284-
case FT_SafeSEH:
285-
delete cast<MCSafeSEHFragment>(this);
284+
case FT_SymbolId:
285+
delete cast<MCSymbolIdFragment>(this);
286286
return;
287287
case FT_CVInlineLines:
288288
delete cast<MCCVInlineLineTableFragment>(this);
@@ -326,7 +326,7 @@ LLVM_DUMP_METHOD void MCFragment::dump() const {
326326
case MCFragment::FT_DwarfFrame: OS << "MCDwarfCallFrameFragment"; break;
327327
case MCFragment::FT_LEB: OS << "MCLEBFragment"; break;
328328
case MCFragment::FT_Padding: OS << "MCPaddingFragment"; break;
329-
case MCFragment::FT_SafeSEH: OS << "MCSafeSEHFragment"; break;
329+
case MCFragment::FT_SymbolId: OS << "MCSymbolIdFragment"; break;
330330
case MCFragment::FT_CVInlineLines: OS << "MCCVInlineLineTableFragment"; break;
331331
case MCFragment::FT_CVDefRange: OS << "MCCVDefRangeTableFragment"; break;
332332
case MCFragment::FT_Dummy: OS << "MCDummyFragment"; break;
@@ -436,8 +436,8 @@ LLVM_DUMP_METHOD void MCFragment::dump() const {
436436
OS << "\n ";
437437
break;
438438
}
439-
case MCFragment::FT_SafeSEH: {
440-
const MCSafeSEHFragment *F = cast<MCSafeSEHFragment>(this);
439+
case MCFragment::FT_SymbolId: {
440+
const MCSymbolIdFragment *F = cast<MCSymbolIdFragment>(this);
441441
OS << "\n ";
442442
OS << " Sym:" << F->getSymbol();
443443
break;

lib/MC/MCWinCOFFStreamer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ void MCWinCOFFStreamer::EmitCOFFSafeSEH(MCSymbol const *Symbol) {
182182
if (SXData->getAlignment() < 4)
183183
SXData->setAlignment(4);
184184

185-
new MCSafeSEHFragment(Symbol, SXData);
185+
new MCSymbolIdFragment(Symbol, SXData);
186186

187187
getAssembler().registerSymbol(*Symbol);
188188
CSymbol->setIsSafeSEH();

0 commit comments

Comments
 (0)