Skip to content

Commit f6d368f

Browse files
MaskRayMaskRay
committed
[𝘀𝗽𝗿] initial version
Created using spr 1.3.5-bogner
1 parent 0283bb3 commit f6d368f

File tree

13 files changed

+71
-80
lines changed

13 files changed

+71
-80
lines changed

‎llvm/include/llvm/DWARFLinker/Classic/DWARFStreamer.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,6 @@ class DwarfStreamer : public DwarfEmitter {
286286
MCAsmBackend *MAB; // Owned by MCStreamer
287287
std::unique_ptr<MCInstrInfo> MII;
288288
std::unique_ptr<MCSubtargetInfo> MSTI;
289-
MCInstPrinter *MIP; // Owned by AsmPrinter
290289
MCCodeEmitter *MCE; // Owned by MCStreamer
291290
MCStreamer *MS; // Owned by AsmPrinter
292291
std::unique_ptr<TargetMachine> TM;

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

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,11 @@ MCStreamer *createNullStreamer(MCContext &Ctx);
8484
///
8585
/// \param ShowInst - Whether to show the MCInst representation inline with
8686
/// the assembly.
87-
MCStreamer *
88-
createAsmStreamer(MCContext &Ctx, std::unique_ptr<formatted_raw_ostream> OS,
89-
MCInstPrinter *InstPrint, std::unique_ptr<MCCodeEmitter> &&CE,
90-
std::unique_ptr<MCAsmBackend> &&TAB);
87+
MCStreamer *createAsmStreamer(MCContext &Ctx,
88+
std::unique_ptr<formatted_raw_ostream> OS,
89+
std::unique_ptr<MCInstPrinter> InstPrint,
90+
std::unique_ptr<MCCodeEmitter> CE,
91+
std::unique_ptr<MCAsmBackend> TAB);
9192

9293
MCStreamer *createELFStreamer(MCContext &Ctx,
9394
std::unique_ptr<MCAsmBackend> &&TAB,
@@ -208,10 +209,10 @@ class Target {
208209
using AsmTargetStreamerCtorTy =
209210
MCTargetStreamer *(*)(MCStreamer &S, formatted_raw_ostream &OS,
210211
MCInstPrinter *InstPrint);
211-
using AsmStreamerCtorTy =
212-
MCStreamer *(*)(MCContext &Ctx, std::unique_ptr<formatted_raw_ostream> OS,
213-
MCInstPrinter *IP, std::unique_ptr<MCCodeEmitter> CE,
214-
std::unique_ptr<MCAsmBackend> TAB);
212+
using AsmStreamerCtorTy = MCStreamer
213+
*(*)(MCContext & Ctx, std::unique_ptr<formatted_raw_ostream> OS,
214+
std::unique_ptr<MCInstPrinter> IP, std::unique_ptr<MCCodeEmitter> CE,
215+
std::unique_ptr<MCAsmBackend> TAB);
215216
using ObjectTargetStreamerCtorTy =
216217
MCTargetStreamer *(*)(MCStreamer &S, const MCSubtargetInfo &STI);
217218
using MCRelocationInfoCtorTy = MCRelocationInfo *(*)(const Triple &TT,
@@ -559,15 +560,9 @@ class Target {
559560

560561
MCStreamer *createAsmStreamer(MCContext &Ctx,
561562
std::unique_ptr<formatted_raw_ostream> OS,
562-
MCInstPrinter *IP,
563+
std::unique_ptr<MCInstPrinter> IP,
563564
std::unique_ptr<MCCodeEmitter> CE,
564565
std::unique_ptr<MCAsmBackend> TAB) const;
565-
LLVM_DEPRECATED("Use the overload without the 3 unused bool", "")
566-
MCStreamer *
567-
createAsmStreamer(MCContext &Ctx, std::unique_ptr<formatted_raw_ostream> OS,
568-
bool IsVerboseAsm, bool UseDwarfDirectory,
569-
MCInstPrinter *IP, std::unique_ptr<MCCodeEmitter> &&CE,
570-
std::unique_ptr<MCAsmBackend> &&TAB, bool ShowInst) const;
571566

572567
MCTargetStreamer *createAsmTargetStreamer(MCStreamer &S,
573568
formatted_raw_ostream &OS,

‎llvm/lib/CodeGen/CodeGenTargetMachineImpl.cpp‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -162,16 +162,13 @@ CodeGenTargetMachineImpl::createMCStreamer(raw_pwrite_stream &Out,
162162

163163
switch (FileType) {
164164
case CodeGenFileType::AssemblyFile: {
165-
MCInstPrinter *InstPrinter = getTarget().createMCInstPrinter(
165+
std::unique_ptr<MCInstPrinter> InstPrinter(getTarget().createMCInstPrinter(
166166
getTargetTriple(),
167167
Options.MCOptions.OutputAsmVariant.value_or(MAI.getAssemblerDialect()),
168-
MAI, MII, MRI);
169-
for (StringRef Opt : Options.MCOptions.InstPrinterOptions) {
170-
if (!InstPrinter->applyTargetSpecificCLOption(Opt)) {
171-
delete InstPrinter;
168+
MAI, MII, MRI));
169+
for (StringRef Opt : Options.MCOptions.InstPrinterOptions)
170+
if (!InstPrinter->applyTargetSpecificCLOption(Opt))
172171
return createStringError("invalid InstPrinter option '" + Opt + "'");
173-
}
174-
}
175172

176173
// Create a code emitter if asked to show the encoding.
177174
std::unique_ptr<MCCodeEmitter> MCE;
@@ -182,7 +179,8 @@ CodeGenTargetMachineImpl::createMCStreamer(raw_pwrite_stream &Out,
182179
getTarget().createMCAsmBackend(STI, MRI, Options.MCOptions));
183180
auto FOut = std::make_unique<formatted_raw_ostream>(Out);
184181
MCStreamer *S = getTarget().createAsmStreamer(
185-
Context, std::move(FOut), InstPrinter, std::move(MCE), std::move(MAB));
182+
Context, std::move(FOut), std::move(InstPrinter), std::move(MCE),
183+
std::move(MAB));
186184
AsmStreamer.reset(S);
187185
break;
188186
}

‎llvm/lib/DWARFLinker/Classic/DWARFStreamer.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include "llvm/MC/MCAsmBackend.h"
1515
#include "llvm/MC/MCCodeEmitter.h"
1616
#include "llvm/MC/MCDwarf.h"
17+
#include "llvm/MC/MCInstPrinter.h"
1718
#include "llvm/MC/MCObjectWriter.h"
1819
#include "llvm/MC/MCSection.h"
1920
#include "llvm/MC/MCStreamer.h"
@@ -100,10 +101,10 @@ Error DwarfStreamer::init(Triple TheTriple,
100101

101102
switch (OutFileType) {
102103
case DWARFLinker::OutputFileType::Assembly: {
103-
MIP = TheTarget->createMCInstPrinter(TheTriple, MAI->getAssemblerDialect(),
104-
*MAI, *MII, *MRI);
104+
std::unique_ptr<MCInstPrinter> MIP(TheTarget->createMCInstPrinter(
105+
TheTriple, MAI->getAssemblerDialect(), *MAI, *MII, *MRI));
105106
MS = TheTarget->createAsmStreamer(
106-
*MC, std::make_unique<formatted_raw_ostream>(OutFile), MIP,
107+
*MC, std::make_unique<formatted_raw_ostream>(OutFile), std::move(MIP),
107108
std::unique_ptr<MCCodeEmitter>(MCE),
108109
std::unique_ptr<MCAsmBackend>(MAB));
109110
break;

‎llvm/lib/DWARFLinker/Parallel/DWARFEmitterImpl.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include "DWARFLinkerCompileUnit.h"
1111
#include "llvm/MC/MCAsmBackend.h"
1212
#include "llvm/MC/MCCodeEmitter.h"
13+
#include "llvm/MC/MCInstPrinter.h"
1314
#include "llvm/MC/MCObjectWriter.h"
1415
#include "llvm/MC/MCSubtargetInfo.h"
1516
#include "llvm/MC/MCTargetOptions.h"
@@ -79,10 +80,10 @@ Error DwarfEmitterImpl::init(Triple TheTriple,
7980

8081
switch (OutFileType) {
8182
case DWARFLinker::OutputFileType::Assembly: {
82-
MIP = TheTarget->createMCInstPrinter(TheTriple, MAI->getAssemblerDialect(),
83-
*MAI, *MII, *MRI);
83+
std::unique_ptr<MCInstPrinter> MIP(TheTarget->createMCInstPrinter(
84+
TheTriple, MAI->getAssemblerDialect(), *MAI, *MII, *MRI));
8485
MS = TheTarget->createAsmStreamer(
85-
*MC, std::make_unique<formatted_raw_ostream>(OutFile), MIP,
86+
*MC, std::make_unique<formatted_raw_ostream>(OutFile), std::move(MIP),
8687
std::unique_ptr<MCCodeEmitter>(MCE),
8788
std::unique_ptr<MCAsmBackend>(MAB));
8889
break;

‎llvm/lib/DWARFLinker/Parallel/DWARFEmitterImpl.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include "llvm/DWARFLinker/Parallel/DWARFLinker.h"
1717
#include "llvm/MC/MCAsmInfo.h"
1818
#include "llvm/MC/MCContext.h"
19+
#include "llvm/MC/MCInstPrinter.h"
1920
#include "llvm/MC/MCInstrInfo.h"
2021
#include "llvm/MC/MCObjectFileInfo.h"
2122
#include "llvm/MC/MCRegisterInfo.h"
@@ -110,7 +111,7 @@ class DwarfEmitterImpl {
110111
MCAsmBackend *MAB; // Owned by MCStreamer
111112
std::unique_ptr<MCInstrInfo> MII;
112113
std::unique_ptr<MCSubtargetInfo> MSTI;
113-
MCInstPrinter *MIP; // Owned by AsmPrinter
114+
std::unique_ptr<MCInstPrinter> MIP; // Owned by AsmPrinter
114115
MCCodeEmitter *MCE; // Owned by MCStreamer
115116
MCStreamer *MS; // Owned by AsmPrinter
116117
std::unique_ptr<TargetMachine> TM;

‎llvm/lib/MC/MCAsmStreamer.cpp‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,11 @@ class MCAsmStreamer final : public MCStreamer {
7474

7575
public:
7676
MCAsmStreamer(MCContext &Context, std::unique_ptr<formatted_raw_ostream> os,
77-
MCInstPrinter *printer, std::unique_ptr<MCCodeEmitter> emitter,
77+
std::unique_ptr<MCInstPrinter> printer,
78+
std::unique_ptr<MCCodeEmitter> emitter,
7879
std::unique_ptr<MCAsmBackend> asmbackend)
7980
: MCStreamer(Context), OSOwner(std::move(os)), OS(*OSOwner),
80-
MAI(Context.getAsmInfo()), InstPrinter(printer),
81+
MAI(Context.getAsmInfo()), InstPrinter(std::move(printer)),
8182
Assembler(std::make_unique<MCAssembler>(
8283
Context, std::move(asmbackend), std::move(emitter),
8384
(asmbackend) ? asmbackend->createObjectWriter(NullStream)
@@ -2649,9 +2650,9 @@ void MCAsmStreamer::emitDwarfAdvanceLineAddr(int64_t LineDelta,
26492650

26502651
MCStreamer *llvm::createAsmStreamer(MCContext &Context,
26512652
std::unique_ptr<formatted_raw_ostream> OS,
2652-
MCInstPrinter *IP,
2653-
std::unique_ptr<MCCodeEmitter> &&CE,
2654-
std::unique_ptr<MCAsmBackend> &&MAB) {
2655-
return new MCAsmStreamer(Context, std::move(OS), IP, std::move(CE),
2653+
std::unique_ptr<MCInstPrinter> IP,
2654+
std::unique_ptr<MCCodeEmitter> CE,
2655+
std::unique_ptr<MCAsmBackend> MAB) {
2656+
return new MCAsmStreamer(Context, std::move(OS), std::move(IP), std::move(CE),
26562657
std::move(MAB));
26572658
}

‎llvm/lib/MC/TargetRegistry.cpp‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include "llvm/MC/MCAsmBackend.h"
1313
#include "llvm/MC/MCCodeEmitter.h"
1414
#include "llvm/MC/MCContext.h"
15+
#include "llvm/MC/MCInstPrinter.h"
1516
#include "llvm/MC/MCObjectStreamer.h"
1617
#include "llvm/MC/MCObjectWriter.h"
1718
#include "llvm/Support/raw_ostream.h"
@@ -88,33 +89,23 @@ MCStreamer *Target::createMCObjectStreamer(
8889

8990
MCStreamer *Target::createAsmStreamer(MCContext &Ctx,
9091
std::unique_ptr<formatted_raw_ostream> OS,
91-
MCInstPrinter *IP,
92+
std::unique_ptr<MCInstPrinter> IP,
9293
std::unique_ptr<MCCodeEmitter> CE,
9394
std::unique_ptr<MCAsmBackend> TAB) const {
95+
MCInstPrinter *Printer = IP.get();
9496
formatted_raw_ostream &OSRef = *OS;
9597
MCStreamer *S;
9698
if (AsmStreamerCtorFn)
97-
S = AsmStreamerCtorFn(Ctx, std::move(OS), IP, std::move(CE),
99+
S = AsmStreamerCtorFn(Ctx, std::move(OS), std::move(IP), std::move(CE),
98100
std::move(TAB));
99101
else
100-
S = llvm::createAsmStreamer(Ctx, std::move(OS), IP, std::move(CE),
101-
std::move(TAB));
102+
S = llvm::createAsmStreamer(Ctx, std::move(OS), std::move(IP),
103+
std::move(CE), std::move(TAB));
102104

103-
createAsmTargetStreamer(*S, OSRef, IP);
105+
createAsmTargetStreamer(*S, OSRef, Printer);
104106
return S;
105107
}
106108

107-
MCStreamer *Target::createAsmStreamer(MCContext &Ctx,
108-
std::unique_ptr<formatted_raw_ostream> OS,
109-
bool IsVerboseAsm, bool UseDwarfDirectory,
110-
MCInstPrinter *IP,
111-
std::unique_ptr<MCCodeEmitter> &&CE,
112-
std::unique_ptr<MCAsmBackend> &&TAB,
113-
bool ShowInst) const {
114-
return createAsmStreamer(Ctx, std::move(OS), IP, std::move(CE),
115-
std::move(TAB));
116-
}
117-
118109
iterator_range<TargetRegistry::iterator> TargetRegistry::targets() {
119110
return make_range(iterator(FirstTarget), iterator());
120111
}

‎llvm/lib/Target/SystemZ/MCTargetDesc/SystemZHLASMAsmStreamer.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ class SystemZHLASMAsmStreamer final : public MCStreamer {
4646
public:
4747
SystemZHLASMAsmStreamer(MCContext &Context,
4848
std::unique_ptr<formatted_raw_ostream> os,
49-
MCInstPrinter *printer,
49+
std::unique_ptr<MCInstPrinter> printer,
5050
std::unique_ptr<MCCodeEmitter> emitter,
5151
std::unique_ptr<MCAsmBackend> asmbackend)
5252
: MCStreamer(Context), FOSOwner(std::move(os)), FOS(*FOSOwner), OS(Str),
53-
MAI(Context.getAsmInfo()), InstPrinter(printer),
53+
MAI(Context.getAsmInfo()), InstPrinter(std::move(printer)),
5454
Assembler(std::make_unique<MCAssembler>(
5555
Context, std::move(asmbackend), std::move(emitter),
5656
(asmbackend) ? asmbackend->createObjectWriter(NullStream)

‎llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCTargetDesc.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -192,19 +192,18 @@ static MCTargetStreamer *createAsmTargetStreamer(MCStreamer &S,
192192
return new SystemZTargetGNUStreamer(S, OS);
193193
}
194194

195-
static MCStreamer *createAsmStreamer(MCContext &Ctx,
196-
std::unique_ptr<formatted_raw_ostream> OS,
197-
MCInstPrinter *IP,
198-
std::unique_ptr<MCCodeEmitter> CE,
199-
std::unique_ptr<MCAsmBackend> TAB) {
195+
static MCStreamer *createSystemZAsmStreamer(
196+
MCContext &Ctx, std::unique_ptr<formatted_raw_ostream> OS,
197+
std::unique_ptr<MCInstPrinter> IP, std::unique_ptr<MCCodeEmitter> CE,
198+
std::unique_ptr<MCAsmBackend> TAB) {
200199

201200
auto TT = Ctx.getTargetTriple();
202201
if (TT.isOSzOS() && !GNUAsOnzOSCL)
203-
return new SystemZHLASMAsmStreamer(Ctx, std::move(OS), IP, std::move(CE),
204-
std::move(TAB));
202+
return new SystemZHLASMAsmStreamer(Ctx, std::move(OS), std::move(IP),
203+
std::move(CE), std::move(TAB));
205204

206-
return llvm::createAsmStreamer(Ctx, std::move(OS), IP, std::move(CE),
207-
std::move(TAB));
205+
return llvm::createAsmStreamer(Ctx, std::move(OS), std::move(IP),
206+
std::move(CE), std::move(TAB));
208207
}
209208

210209
static MCTargetStreamer *
@@ -254,7 +253,8 @@ extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeSystemZTargetMC() {
254253
createSystemZMCInstPrinter);
255254

256255
// Register the asm streamer.
257-
TargetRegistry::RegisterAsmStreamer(getTheSystemZTarget(), createAsmStreamer);
256+
TargetRegistry::RegisterAsmStreamer(getTheSystemZTarget(),
257+
createSystemZAsmStreamer);
258258

259259
// Register the asm target streamer.
260260
TargetRegistry::RegisterAsmTargetStreamer(getTheSystemZTarget(),

0 commit comments

Comments
 (0)