Skip to content

Commit 4e34035

Browse files
MaskRayMaskRay
committed
[MC] Remove RelaxAll parameters from create*Streamer
Related to clean-up opportunities discussed at #90013. After these cleanups, the `RelaxAll` parameter from `createMCObjectStreamer` can be removed as well. As `createMCObjectStreamer` is a more user-facing API and used by two files in mlir/, we postpone the cleanup to the future.
1 parent 72da62b commit 4e34035

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+118
-152
lines changed

‎llvm/include/llvm/MC/MCELFStreamer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ MCELFStreamer *createARMELFStreamer(MCContext &Context,
156156
std::unique_ptr<MCAsmBackend> TAB,
157157
std::unique_ptr<MCObjectWriter> OW,
158158
std::unique_ptr<MCCodeEmitter> Emitter,
159-
bool RelaxAll, bool IsThumb, bool IsAndroid);
159+
bool IsThumb, bool IsAndroid);
160160

161161
} // end namespace llvm
162162

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

Lines changed: 32 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -92,39 +92,33 @@ createAsmStreamer(MCContext &Ctx, std::unique_ptr<formatted_raw_ostream> OS,
9292
MCStreamer *createELFStreamer(MCContext &Ctx,
9393
std::unique_ptr<MCAsmBackend> &&TAB,
9494
std::unique_ptr<MCObjectWriter> &&OW,
95-
std::unique_ptr<MCCodeEmitter> &&CE,
96-
bool RelaxAll);
95+
std::unique_ptr<MCCodeEmitter> &&CE);
9796
MCStreamer *createGOFFStreamer(MCContext &Ctx,
9897
std::unique_ptr<MCAsmBackend> &&TAB,
9998
std::unique_ptr<MCObjectWriter> &&OW,
100-
std::unique_ptr<MCCodeEmitter> &&CE,
101-
bool RelaxAll);
99+
std::unique_ptr<MCCodeEmitter> &&CE);
102100
MCStreamer *createMachOStreamer(MCContext &Ctx,
103101
std::unique_ptr<MCAsmBackend> &&TAB,
104102
std::unique_ptr<MCObjectWriter> &&OW,
105103
std::unique_ptr<MCCodeEmitter> &&CE,
106-
bool RelaxAll, bool DWARFMustBeAtTheEnd,
104+
bool DWARFMustBeAtTheEnd,
107105
bool LabelSections = false);
108106
MCStreamer *createWasmStreamer(MCContext &Ctx,
109107
std::unique_ptr<MCAsmBackend> &&TAB,
110108
std::unique_ptr<MCObjectWriter> &&OW,
111-
std::unique_ptr<MCCodeEmitter> &&CE,
112-
bool RelaxAll);
109+
std::unique_ptr<MCCodeEmitter> &&CE);
113110
MCStreamer *createXCOFFStreamer(MCContext &Ctx,
114111
std::unique_ptr<MCAsmBackend> &&TAB,
115112
std::unique_ptr<MCObjectWriter> &&OW,
116-
std::unique_ptr<MCCodeEmitter> &&CE,
117-
bool RelaxAll);
113+
std::unique_ptr<MCCodeEmitter> &&CE);
118114
MCStreamer *createSPIRVStreamer(MCContext &Ctx,
119115
std::unique_ptr<MCAsmBackend> &&TAB,
120116
std::unique_ptr<MCObjectWriter> &&OW,
121-
std::unique_ptr<MCCodeEmitter> &&CE,
122-
bool RelaxAll);
117+
std::unique_ptr<MCCodeEmitter> &&CE);
123118
MCStreamer *createDXContainerStreamer(MCContext &Ctx,
124119
std::unique_ptr<MCAsmBackend> &&TAB,
125120
std::unique_ptr<MCObjectWriter> &&OW,
126-
std::unique_ptr<MCCodeEmitter> &&CE,
127-
bool RelaxAll);
121+
std::unique_ptr<MCCodeEmitter> &&CE);
128122

129123
MCRelocationInfo *createMCRelocationInfo(const Triple &TT, MCContext &Ctx);
130124

@@ -199,42 +193,42 @@ class Target {
199193
MCStreamer *(*)(const Triple &T, MCContext &Ctx,
200194
std::unique_ptr<MCAsmBackend> &&TAB,
201195
std::unique_ptr<MCObjectWriter> &&OW,
202-
std::unique_ptr<MCCodeEmitter> &&Emitter, bool RelaxAll);
196+
std::unique_ptr<MCCodeEmitter> &&Emitter);
203197
using GOFFStreamerCtorTy =
204198
MCStreamer *(*)(MCContext &Ctx, std::unique_ptr<MCAsmBackend> &&TAB,
205199
std::unique_ptr<MCObjectWriter> &&OW,
206-
std::unique_ptr<MCCodeEmitter> &&Emitter, bool RelaxAll);
200+
std::unique_ptr<MCCodeEmitter> &&Emitter);
207201
using MachOStreamerCtorTy =
208202
MCStreamer *(*)(MCContext &Ctx, std::unique_ptr<MCAsmBackend> &&TAB,
209203
std::unique_ptr<MCObjectWriter> &&OW,
210-
std::unique_ptr<MCCodeEmitter> &&Emitter, bool RelaxAll,
204+
std::unique_ptr<MCCodeEmitter> &&Emitter,
211205
bool DWARFMustBeAtTheEnd);
212206
using COFFStreamerCtorTy =
213207
MCStreamer *(*)(MCContext &Ctx, std::unique_ptr<MCAsmBackend> &&TAB,
214208
std::unique_ptr<MCObjectWriter> &&OW,
215-
std::unique_ptr<MCCodeEmitter> &&Emitter, bool RelaxAll,
209+
std::unique_ptr<MCCodeEmitter> &&Emitter,
216210
bool IncrementalLinkerCompatible);
217211
using WasmStreamerCtorTy =
218212
MCStreamer *(*)(const Triple &T, MCContext &Ctx,
219213
std::unique_ptr<MCAsmBackend> &&TAB,
220214
std::unique_ptr<MCObjectWriter> &&OW,
221-
std::unique_ptr<MCCodeEmitter> &&Emitter, bool RelaxAll);
215+
std::unique_ptr<MCCodeEmitter> &&Emitter);
222216
using XCOFFStreamerCtorTy =
223217
MCStreamer *(*)(const Triple &T, MCContext &Ctx,
224218
std::unique_ptr<MCAsmBackend> &&TAB,
225219
std::unique_ptr<MCObjectWriter> &&OW,
226-
std::unique_ptr<MCCodeEmitter> &&Emitter, bool RelaxAll);
220+
std::unique_ptr<MCCodeEmitter> &&Emitter);
227221
using SPIRVStreamerCtorTy =
228222
MCStreamer *(*)(const Triple &T, MCContext &Ctx,
229223
std::unique_ptr<MCAsmBackend> &&TAB,
230224
std::unique_ptr<MCObjectWriter> &&OW,
231-
std::unique_ptr<MCCodeEmitter> &&Emitter, bool RelaxAll);
232-
225+
std::unique_ptr<MCCodeEmitter> &&Emitter);
226+
233227
using DXContainerStreamerCtorTy =
234228
MCStreamer *(*)(const Triple &T, MCContext &Ctx,
235229
std::unique_ptr<MCAsmBackend> &&TAB,
236230
std::unique_ptr<MCObjectWriter> &&OW,
237-
std::unique_ptr<MCCodeEmitter> &&Emitter, bool RelaxAll);
231+
std::unique_ptr<MCCodeEmitter> &&Emitter);
238232

239233
using NullTargetStreamerCtorTy = MCTargetStreamer *(*)(MCStreamer &S);
240234
using AsmTargetStreamerCtorTy = MCTargetStreamer *(*)(
@@ -566,7 +560,7 @@ class Target {
566560
std::unique_ptr<MCAsmBackend> &&TAB,
567561
std::unique_ptr<MCObjectWriter> &&OW,
568562
std::unique_ptr<MCCodeEmitter> &&Emitter,
569-
const MCSubtargetInfo &STI, bool RelaxAll,
563+
const MCSubtargetInfo &STI, bool,
570564
bool IncrementalLinkerCompatible,
571565
bool DWARFMustBeAtTheEnd) const {
572566
MCStreamer *S = nullptr;
@@ -577,66 +571,63 @@ class Target {
577571
assert((T.isOSWindows() || T.isUEFI()) &&
578572
"only Windows and UEFI COFF are supported");
579573
S = COFFStreamerCtorFn(Ctx, std::move(TAB), std::move(OW),
580-
std::move(Emitter), RelaxAll,
581-
IncrementalLinkerCompatible);
574+
std::move(Emitter), IncrementalLinkerCompatible);
582575
break;
583576
case Triple::MachO:
584577
if (MachOStreamerCtorFn)
585578
S = MachOStreamerCtorFn(Ctx, std::move(TAB), std::move(OW),
586-
std::move(Emitter), RelaxAll,
587-
DWARFMustBeAtTheEnd);
579+
std::move(Emitter), DWARFMustBeAtTheEnd);
588580
else
589581
S = createMachOStreamer(Ctx, std::move(TAB), std::move(OW),
590-
std::move(Emitter), RelaxAll,
591-
DWARFMustBeAtTheEnd);
582+
std::move(Emitter), DWARFMustBeAtTheEnd);
592583
break;
593584
case Triple::ELF:
594585
if (ELFStreamerCtorFn)
595586
S = ELFStreamerCtorFn(T, Ctx, std::move(TAB), std::move(OW),
596-
std::move(Emitter), RelaxAll);
587+
std::move(Emitter));
597588
else
598589
S = createELFStreamer(Ctx, std::move(TAB), std::move(OW),
599-
std::move(Emitter), RelaxAll);
590+
std::move(Emitter));
600591
break;
601592
case Triple::Wasm:
602593
if (WasmStreamerCtorFn)
603594
S = WasmStreamerCtorFn(T, Ctx, std::move(TAB), std::move(OW),
604-
std::move(Emitter), RelaxAll);
595+
std::move(Emitter));
605596
else
606597
S = createWasmStreamer(Ctx, std::move(TAB), std::move(OW),
607-
std::move(Emitter), RelaxAll);
598+
std::move(Emitter));
608599
break;
609600
case Triple::GOFF:
610601
if (GOFFStreamerCtorFn)
611602
S = GOFFStreamerCtorFn(Ctx, std::move(TAB), std::move(OW),
612-
std::move(Emitter), RelaxAll);
603+
std::move(Emitter));
613604
else
614605
S = createGOFFStreamer(Ctx, std::move(TAB), std::move(OW),
615-
std::move(Emitter), RelaxAll);
606+
std::move(Emitter));
616607
break;
617608
case Triple::XCOFF:
618609
if (XCOFFStreamerCtorFn)
619610
S = XCOFFStreamerCtorFn(T, Ctx, std::move(TAB), std::move(OW),
620-
std::move(Emitter), RelaxAll);
611+
std::move(Emitter));
621612
else
622613
S = createXCOFFStreamer(Ctx, std::move(TAB), std::move(OW),
623-
std::move(Emitter), RelaxAll);
614+
std::move(Emitter));
624615
break;
625616
case Triple::SPIRV:
626617
if (SPIRVStreamerCtorFn)
627618
S = SPIRVStreamerCtorFn(T, Ctx, std::move(TAB), std::move(OW),
628-
std::move(Emitter), RelaxAll);
619+
std::move(Emitter));
629620
else
630621
S = createSPIRVStreamer(Ctx, std::move(TAB), std::move(OW),
631-
std::move(Emitter), RelaxAll);
622+
std::move(Emitter));
632623
break;
633624
case Triple::DXContainer:
634625
if (DXContainerStreamerCtorFn)
635626
S = DXContainerStreamerCtorFn(T, Ctx, std::move(TAB), std::move(OW),
636-
std::move(Emitter), RelaxAll);
627+
std::move(Emitter));
637628
else
638629
S = createDXContainerStreamer(Ctx, std::move(TAB), std::move(OW),
639-
std::move(Emitter), RelaxAll);
630+
std::move(Emitter));
640631
break;
641632
}
642633
if (ObjectTargetStreamerCtorFn)

‎llvm/lib/MC/MCDXContainerStreamer.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ void MCDXContainerStreamer::emitInstToData(const MCInst &,
2121

2222
MCStreamer *llvm::createDXContainerStreamer(
2323
MCContext &Context, std::unique_ptr<MCAsmBackend> &&MAB,
24-
std::unique_ptr<MCObjectWriter> &&OW, std::unique_ptr<MCCodeEmitter> &&CE,
25-
bool RelaxAll) {
24+
std::unique_ptr<MCObjectWriter> &&OW, std::unique_ptr<MCCodeEmitter> &&CE) {
2625
auto *S = new MCDXContainerStreamer(Context, std::move(MAB), std::move(OW),
2726
std::move(CE));
2827
return S;

‎llvm/lib/MC/MCELFStreamer.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -892,8 +892,7 @@ void MCELFStreamer::createAttributesSection(
892892
MCStreamer *llvm::createELFStreamer(MCContext &Context,
893893
std::unique_ptr<MCAsmBackend> &&MAB,
894894
std::unique_ptr<MCObjectWriter> &&OW,
895-
std::unique_ptr<MCCodeEmitter> &&CE,
896-
bool RelaxAll) {
895+
std::unique_ptr<MCCodeEmitter> &&CE) {
897896
MCELFStreamer *S =
898897
new MCELFStreamer(Context, std::move(MAB), std::move(OW), std::move(CE));
899898
return S;

‎llvm/lib/MC/MCGOFFStreamer.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ MCGOFFStreamer::~MCGOFFStreamer() {}
2424
MCStreamer *llvm::createGOFFStreamer(MCContext &Context,
2525
std::unique_ptr<MCAsmBackend> &&MAB,
2626
std::unique_ptr<MCObjectWriter> &&OW,
27-
std::unique_ptr<MCCodeEmitter> &&CE,
28-
bool RelaxAll) {
27+
std::unique_ptr<MCCodeEmitter> &&CE) {
2928
MCGOFFStreamer *S =
3029
new MCGOFFStreamer(Context, std::move(MAB), std::move(OW), std::move(CE));
3130
return S;

‎llvm/lib/MC/MCMachOStreamer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ MCStreamer *llvm::createMachOStreamer(MCContext &Context,
564564
std::unique_ptr<MCAsmBackend> &&MAB,
565565
std::unique_ptr<MCObjectWriter> &&OW,
566566
std::unique_ptr<MCCodeEmitter> &&CE,
567-
bool RelaxAll, bool DWARFMustBeAtTheEnd,
567+
bool DWARFMustBeAtTheEnd,
568568
bool LabelSections) {
569569
MCMachOStreamer *S =
570570
new MCMachOStreamer(Context, std::move(MAB), std::move(OW), std::move(CE),

‎llvm/lib/MC/MCSPIRVStreamer.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ void MCSPIRVStreamer::emitInstToData(const MCInst &Inst,
3434
MCStreamer *llvm::createSPIRVStreamer(MCContext &Context,
3535
std::unique_ptr<MCAsmBackend> &&MAB,
3636
std::unique_ptr<MCObjectWriter> &&OW,
37-
std::unique_ptr<MCCodeEmitter> &&CE,
38-
bool RelaxAll) {
37+
std::unique_ptr<MCCodeEmitter> &&CE) {
3938
MCSPIRVStreamer *S = new MCSPIRVStreamer(Context, std::move(MAB),
4039
std::move(OW), std::move(CE));
4140
return S;

‎llvm/lib/MC/MCWasmStreamer.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,8 +275,7 @@ void MCWasmStreamer::emitTBSSSymbol(MCSection *Section, MCSymbol *Symbol,
275275
MCStreamer *llvm::createWasmStreamer(MCContext &Context,
276276
std::unique_ptr<MCAsmBackend> &&MAB,
277277
std::unique_ptr<MCObjectWriter> &&OW,
278-
std::unique_ptr<MCCodeEmitter> &&CE,
279-
bool RelaxAll) {
278+
std::unique_ptr<MCCodeEmitter> &&CE) {
280279
MCWasmStreamer *S =
281280
new MCWasmStreamer(Context, std::move(MAB), std::move(OW), std::move(CE));
282281
return S;

‎llvm/lib/MC/MCXCOFFStreamer.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,7 @@ void MCXCOFFStreamer::emitInstToData(const MCInst &Inst,
162162
MCStreamer *llvm::createXCOFFStreamer(MCContext &Context,
163163
std::unique_ptr<MCAsmBackend> &&MAB,
164164
std::unique_ptr<MCObjectWriter> &&OW,
165-
std::unique_ptr<MCCodeEmitter> &&CE,
166-
bool RelaxAll) {
165+
std::unique_ptr<MCCodeEmitter> &&CE) {
167166
MCXCOFFStreamer *S = new MCXCOFFStreamer(Context, std::move(MAB),
168167
std::move(OW), std::move(CE));
169168
return S;

‎llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFStreamer.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -306,10 +306,11 @@ llvm::createAArch64AsmTargetStreamer(MCStreamer &S, formatted_raw_ostream &OS,
306306
return new AArch64TargetAsmStreamer(S, OS);
307307
}
308308

309-
MCELFStreamer *llvm::createAArch64ELFStreamer(
310-
MCContext &Context, std::unique_ptr<MCAsmBackend> TAB,
311-
std::unique_ptr<MCObjectWriter> OW, std::unique_ptr<MCCodeEmitter> Emitter,
312-
bool RelaxAll) {
309+
MCELFStreamer *
310+
llvm::createAArch64ELFStreamer(MCContext &Context,
311+
std::unique_ptr<MCAsmBackend> TAB,
312+
std::unique_ptr<MCObjectWriter> OW,
313+
std::unique_ptr<MCCodeEmitter> Emitter) {
313314
AArch64ELFStreamer *S = new AArch64ELFStreamer(
314315
Context, std::move(TAB), std::move(OW), std::move(Emitter));
315316
return S;

0 commit comments

Comments
 (0)