Skip to content
This repository was archived by the owner on Apr 23, 2020. It is now read-only.

Commit e99ebe7

Browse files
committed
Make getTargetStreamer return a possibly null pointer.
This will allow it to be called from target independent parts of the main streamer that don't know if there is a registered target streamer or not. This in turn will allow targets to perform extra actions at specified points in the interface: add extra flags for some labels, extra work during finalization, etc. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@199174 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent f619e90 commit e99ebe7

File tree

9 files changed

+12
-12
lines changed

9 files changed

+12
-12
lines changed

include/llvm/MC/MCStreamer.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,8 @@ class MCStreamer {
171171

172172
MCContext &getContext() const { return Context; }
173173

174-
MCTargetStreamer &getTargetStreamer() {
175-
assert(TargetStreamer);
176-
return *TargetStreamer;
174+
MCTargetStreamer *getTargetStreamer() {
175+
return TargetStreamer.get();
177176
}
178177

179178
unsigned getNumFrameInfos() { return FrameInfos.size(); }

lib/CodeGen/AsmPrinter/ARMException.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ ARMException::ARMException(AsmPrinter *A)
4848
ARMException::~ARMException() {}
4949

5050
ARMTargetStreamer &ARMException::getTargetStreamer() {
51-
MCTargetStreamer &TS = Asm->OutStreamer.getTargetStreamer();
51+
MCTargetStreamer &TS = *Asm->OutStreamer.getTargetStreamer();
5252
return static_cast<ARMTargetStreamer &>(TS);
5353
}
5454

lib/Target/ARM/ARMAsmPrinter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,7 @@ static ARMBuildAttrs::CPUArch getArchForCPU(StringRef CPU,
616616
}
617617

618618
void ARMAsmPrinter::emitAttributes() {
619-
MCTargetStreamer &TS = OutStreamer.getTargetStreamer();
619+
MCTargetStreamer &TS = *OutStreamer.getTargetStreamer();
620620
ARMTargetStreamer &ATS = static_cast<ARMTargetStreamer &>(TS);
621621

622622
ATS.switchVendor("aeabi");
@@ -983,7 +983,7 @@ void ARMAsmPrinter::EmitUnwindingInstruction(const MachineInstr *MI) {
983983
assert(MI->getFlag(MachineInstr::FrameSetup) &&
984984
"Only instruction which are involved into frame setup code are allowed");
985985

986-
MCTargetStreamer &TS = OutStreamer.getTargetStreamer();
986+
MCTargetStreamer &TS = *OutStreamer.getTargetStreamer();
987987
ARMTargetStreamer &ATS = static_cast<ARMTargetStreamer &>(TS);
988988
const MachineFunction &MF = *MI->getParent()->getParent();
989989
const TargetRegisterInfo *RegInfo = MF.getTarget().getRegisterInfo();

lib/Target/ARM/AsmParser/ARMAsmParser.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ class ARMAsmParser : public MCTargetAsmParser {
192192
}
193193

194194
ARMTargetStreamer &getTargetStreamer() {
195-
MCTargetStreamer &TS = getParser().getStreamer().getTargetStreamer();
195+
MCTargetStreamer &TS = *getParser().getStreamer().getTargetStreamer();
196196
return static_cast<ARMTargetStreamer &>(TS);
197197
}
198198

lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -925,7 +925,7 @@ void ARMTargetELFStreamer::emitInst(uint32_t Inst, char Suffix) {
925925
}
926926

927927
void ARMELFStreamer::FinishImpl() {
928-
MCTargetStreamer &TS = getTargetStreamer();
928+
MCTargetStreamer &TS = *getTargetStreamer();
929929
ARMTargetStreamer &ATS = static_cast<ARMTargetStreamer &>(TS);
930930
ATS.finishAttributeSection();
931931

lib/Target/Mips/AsmParser/MipsAsmParser.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ namespace {
5757
class MipsAsmParser : public MCTargetAsmParser {
5858

5959
MipsTargetStreamer &getTargetStreamer() {
60-
MCTargetStreamer &TS = Parser.getStreamer().getTargetStreamer();
60+
MCTargetStreamer &TS = *Parser.getStreamer().getTargetStreamer();
6161
return static_cast<MipsTargetStreamer &>(TS);
6262
}
6363

lib/Target/Mips/MipsAsmPrinter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
using namespace llvm;
4747

4848
MipsTargetStreamer &MipsAsmPrinter::getTargetStreamer() {
49-
return static_cast<MipsTargetStreamer &>(OutStreamer.getTargetStreamer());
49+
return static_cast<MipsTargetStreamer &>(*OutStreamer.getTargetStreamer());
5050
}
5151

5252
bool MipsAsmPrinter::runOnMachineFunction(MachineFunction &MF) {

lib/Target/PowerPC/PPCAsmPrinter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -769,7 +769,7 @@ bool PPCLinuxAsmPrinter::doFinalization(Module &M) {
769769
bool isPPC64 = TD->getPointerSizeInBits() == 64;
770770

771771
PPCTargetStreamer &TS =
772-
static_cast<PPCTargetStreamer &>(OutStreamer.getTargetStreamer());
772+
static_cast<PPCTargetStreamer &>(*OutStreamer.getTargetStreamer());
773773

774774
if (isPPC64 && !TOC.empty()) {
775775
const MCSectionELF *Section = OutStreamer.getContext().getELFSection(".toc",

lib/Target/Sparc/SparcAsmPrinter.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ using namespace llvm;
3737
namespace {
3838
class SparcAsmPrinter : public AsmPrinter {
3939
SparcTargetStreamer &getTargetStreamer() {
40-
return static_cast<SparcTargetStreamer&>(OutStreamer.getTargetStreamer());
40+
return static_cast<SparcTargetStreamer &>(
41+
*OutStreamer.getTargetStreamer());
4142
}
4243
public:
4344
explicit SparcAsmPrinter(TargetMachine &TM, MCStreamer &Streamer)

0 commit comments

Comments
 (0)