Skip to content

Commit 18f7ee5

Browse files
MaskRayMaskRay
committed
[MC] Remove unused Register*Streamer
Object streamers that do not need lib/Target customization do not need Register*Streamer.
1 parent 91bf0a0 commit 18f7ee5

File tree

3 files changed

+10
-93
lines changed

3 files changed

+10
-93
lines changed

‎llvm/include/llvm/MC/TargetRegistry.h

Lines changed: 10 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,6 @@ MCStreamer *createWasmStreamer(MCContext &Ctx,
107107
std::unique_ptr<MCAsmBackend> &&TAB,
108108
std::unique_ptr<MCObjectWriter> &&OW,
109109
std::unique_ptr<MCCodeEmitter> &&CE);
110-
MCStreamer *createXCOFFStreamer(MCContext &Ctx,
111-
std::unique_ptr<MCAsmBackend> &&TAB,
112-
std::unique_ptr<MCObjectWriter> &&OW,
113-
std::unique_ptr<MCCodeEmitter> &&CE);
114110
MCStreamer *createSPIRVStreamer(MCContext &Ctx,
115111
std::unique_ptr<MCAsmBackend> &&TAB,
116112
std::unique_ptr<MCObjectWriter> &&OW,
@@ -194,10 +190,6 @@ class Target {
194190
std::unique_ptr<MCAsmBackend> &&TAB,
195191
std::unique_ptr<MCObjectWriter> &&OW,
196192
std::unique_ptr<MCCodeEmitter> &&Emitter);
197-
using GOFFStreamerCtorTy =
198-
MCStreamer *(*)(MCContext &Ctx, std::unique_ptr<MCAsmBackend> &&TAB,
199-
std::unique_ptr<MCObjectWriter> &&OW,
200-
std::unique_ptr<MCCodeEmitter> &&Emitter);
201193
using MachOStreamerCtorTy =
202194
MCStreamer *(*)(MCContext &Ctx, std::unique_ptr<MCAsmBackend> &&TAB,
203195
std::unique_ptr<MCObjectWriter> &&OW,
@@ -206,27 +198,11 @@ class Target {
206198
MCStreamer *(*)(MCContext &Ctx, std::unique_ptr<MCAsmBackend> &&TAB,
207199
std::unique_ptr<MCObjectWriter> &&OW,
208200
std::unique_ptr<MCCodeEmitter> &&Emitter);
209-
using WasmStreamerCtorTy =
210-
MCStreamer *(*)(const Triple &T, MCContext &Ctx,
211-
std::unique_ptr<MCAsmBackend> &&TAB,
212-
std::unique_ptr<MCObjectWriter> &&OW,
213-
std::unique_ptr<MCCodeEmitter> &&Emitter);
214201
using XCOFFStreamerCtorTy =
215202
MCStreamer *(*)(const Triple &T, MCContext &Ctx,
216203
std::unique_ptr<MCAsmBackend> &&TAB,
217204
std::unique_ptr<MCObjectWriter> &&OW,
218205
std::unique_ptr<MCCodeEmitter> &&Emitter);
219-
using SPIRVStreamerCtorTy =
220-
MCStreamer *(*)(const Triple &T, MCContext &Ctx,
221-
std::unique_ptr<MCAsmBackend> &&TAB,
222-
std::unique_ptr<MCObjectWriter> &&OW,
223-
std::unique_ptr<MCCodeEmitter> &&Emitter);
224-
225-
using DXContainerStreamerCtorTy =
226-
MCStreamer *(*)(const Triple &T, MCContext &Ctx,
227-
std::unique_ptr<MCAsmBackend> &&TAB,
228-
std::unique_ptr<MCObjectWriter> &&OW,
229-
std::unique_ptr<MCCodeEmitter> &&Emitter);
230206

231207
using NullTargetStreamerCtorTy = MCTargetStreamer *(*)(MCStreamer &S);
232208
using AsmTargetStreamerCtorTy = MCTargetStreamer *(*)(
@@ -328,13 +304,9 @@ class Target {
328304

329305
// Construction functions for the various object formats, if registered.
330306
COFFStreamerCtorTy COFFStreamerCtorFn = nullptr;
331-
GOFFStreamerCtorTy GOFFStreamerCtorFn = nullptr;
332307
MachOStreamerCtorTy MachOStreamerCtorFn = nullptr;
333308
ELFStreamerCtorTy ELFStreamerCtorFn = nullptr;
334-
WasmStreamerCtorTy WasmStreamerCtorFn = nullptr;
335309
XCOFFStreamerCtorTy XCOFFStreamerCtorFn = nullptr;
336-
SPIRVStreamerCtorTy SPIRVStreamerCtorFn = nullptr;
337-
DXContainerStreamerCtorTy DXContainerStreamerCtorFn = nullptr;
338310

339311
/// Construction function for this target's null TargetStreamer, if
340312
/// registered (default = nullptr).
@@ -586,44 +558,24 @@ class Target {
586558
std::move(Emitter));
587559
break;
588560
case Triple::Wasm:
589-
if (WasmStreamerCtorFn)
590-
S = WasmStreamerCtorFn(T, Ctx, std::move(TAB), std::move(OW),
591-
std::move(Emitter));
592-
else
593-
S = createWasmStreamer(Ctx, std::move(TAB), std::move(OW),
594-
std::move(Emitter));
561+
S = createWasmStreamer(Ctx, std::move(TAB), std::move(OW),
562+
std::move(Emitter));
595563
break;
596564
case Triple::GOFF:
597-
if (GOFFStreamerCtorFn)
598-
S = GOFFStreamerCtorFn(Ctx, std::move(TAB), std::move(OW),
599-
std::move(Emitter));
600-
else
601-
S = createGOFFStreamer(Ctx, std::move(TAB), std::move(OW),
602-
std::move(Emitter));
565+
S = createGOFFStreamer(Ctx, std::move(TAB), std::move(OW),
566+
std::move(Emitter));
603567
break;
604568
case Triple::XCOFF:
605-
if (XCOFFStreamerCtorFn)
606-
S = XCOFFStreamerCtorFn(T, Ctx, std::move(TAB), std::move(OW),
607-
std::move(Emitter));
608-
else
609-
S = createXCOFFStreamer(Ctx, std::move(TAB), std::move(OW),
610-
std::move(Emitter));
569+
S = XCOFFStreamerCtorFn(T, Ctx, std::move(TAB), std::move(OW),
570+
std::move(Emitter));
611571
break;
612572
case Triple::SPIRV:
613-
if (SPIRVStreamerCtorFn)
614-
S = SPIRVStreamerCtorFn(T, Ctx, std::move(TAB), std::move(OW),
615-
std::move(Emitter));
616-
else
617-
S = createSPIRVStreamer(Ctx, std::move(TAB), std::move(OW),
618-
std::move(Emitter));
573+
S = createSPIRVStreamer(Ctx, std::move(TAB), std::move(OW),
574+
std::move(Emitter));
619575
break;
620576
case Triple::DXContainer:
621-
if (DXContainerStreamerCtorFn)
622-
S = DXContainerStreamerCtorFn(T, Ctx, std::move(TAB), std::move(OW),
623-
std::move(Emitter));
624-
else
625-
S = createDXContainerStreamer(Ctx, std::move(TAB), std::move(OW),
626-
std::move(Emitter));
577+
S = createDXContainerStreamer(Ctx, std::move(TAB), std::move(OW),
578+
std::move(Emitter));
627579
break;
628580
}
629581
if (ObjectTargetStreamerCtorFn)
@@ -1007,10 +959,6 @@ struct TargetRegistry {
1007959
T.COFFStreamerCtorFn = Fn;
1008960
}
1009961

1010-
static void RegisterGOFFStreamer(Target &T, Target::GOFFStreamerCtorTy Fn) {
1011-
T.GOFFStreamerCtorFn = Fn;
1012-
}
1013-
1014962
static void RegisterMachOStreamer(Target &T, Target::MachOStreamerCtorTy Fn) {
1015963
T.MachOStreamerCtorFn = Fn;
1016964
}
@@ -1019,18 +967,6 @@ struct TargetRegistry {
1019967
T.ELFStreamerCtorFn = Fn;
1020968
}
1021969

1022-
static void RegisterSPIRVStreamer(Target &T, Target::SPIRVStreamerCtorTy Fn) {
1023-
T.SPIRVStreamerCtorFn = Fn;
1024-
}
1025-
1026-
static void RegisterDXContainerStreamer(Target &T, Target::DXContainerStreamerCtorTy Fn) {
1027-
T.DXContainerStreamerCtorFn = Fn;
1028-
}
1029-
1030-
static void RegisterWasmStreamer(Target &T, Target::WasmStreamerCtorTy Fn) {
1031-
T.WasmStreamerCtorFn = Fn;
1032-
}
1033-
1034970
static void RegisterXCOFFStreamer(Target &T, Target::XCOFFStreamerCtorTy Fn) {
1035971
T.XCOFFStreamerCtorFn = Fn;
1036972
}

‎llvm/lib/MC/MCXCOFFStreamer.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -159,15 +159,6 @@ void MCXCOFFStreamer::emitInstToData(const MCInst &Inst,
159159
DF->getContents().append(Code.begin(), Code.end());
160160
}
161161

162-
MCStreamer *llvm::createXCOFFStreamer(MCContext &Context,
163-
std::unique_ptr<MCAsmBackend> &&MAB,
164-
std::unique_ptr<MCObjectWriter> &&OW,
165-
std::unique_ptr<MCCodeEmitter> &&CE) {
166-
MCXCOFFStreamer *S = new MCXCOFFStreamer(Context, std::move(MAB),
167-
std::move(OW), std::move(CE));
168-
return S;
169-
}
170-
171162
void MCXCOFFStreamer::emitXCOFFLocalCommonSymbol(MCSymbol *LabelSym,
172163
uint64_t Size,
173164
MCSymbol *CsectSym,

‎llvm/lib/Target/SPIRV/MCTargetDesc/SPIRVMCTargetDesc.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,6 @@ createSPIRVMCSubtargetInfo(const Triple &TT, StringRef CPU, StringRef FS) {
4949
return createSPIRVMCSubtargetInfoImpl(TT, CPU, /*TuneCPU*/ CPU, FS);
5050
}
5151

52-
static MCStreamer *
53-
createSPIRVMCStreamer(const Triple &T, MCContext &Ctx,
54-
std::unique_ptr<MCAsmBackend> &&MAB,
55-
std::unique_ptr<MCObjectWriter> &&OW,
56-
std::unique_ptr<MCCodeEmitter> &&Emitter) {
57-
return createSPIRVStreamer(Ctx, std::move(MAB), std::move(OW),
58-
std::move(Emitter));
59-
}
60-
6152
static MCTargetStreamer *createTargetAsmStreamer(MCStreamer &S,
6253
formatted_raw_ostream &,
6354
MCInstPrinter *, bool) {
@@ -94,7 +85,6 @@ extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeSPIRVTargetMC() {
9485
TargetRegistry::RegisterMCInstrInfo(*T, createSPIRVMCInstrInfo);
9586
TargetRegistry::RegisterMCRegInfo(*T, createSPIRVMCRegisterInfo);
9687
TargetRegistry::RegisterMCSubtargetInfo(*T, createSPIRVMCSubtargetInfo);
97-
TargetRegistry::RegisterSPIRVStreamer(*T, createSPIRVMCStreamer);
9888
TargetRegistry::RegisterMCInstPrinter(*T, createSPIRVMCInstPrinter);
9989
TargetRegistry::RegisterMCInstrAnalysis(*T, createSPIRVInstrAnalysis);
10090
TargetRegistry::RegisterMCCodeEmitter(*T, createSPIRVMCCodeEmitter);

0 commit comments

Comments
 (0)