Skip to content

Commit 99e6631

Browse files
committed
MCAssembler: Remove getWriterPtr
Commit 8728e09 (2018) introduced getWriterPtr, which might be nullptr for MCAsmStreamer. This lured call sites to use getWriterPtr when it's guaranteed to be non-null for MCObjectstreamer. Remove this misleading API.
1 parent 7acd4dd commit 99e6631

File tree

3 files changed

+5
-11
lines changed

3 files changed

+5
-11
lines changed

llvm/include/llvm/MC/MCAssembler.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,6 @@ class MCAssembler {
187187

188188
MCCodeEmitter *getEmitterPtr() const { return Emitter.get(); }
189189

190-
MCObjectWriter *getWriterPtr() const { return Writer.get(); }
191-
192190
MCAsmBackend &getBackend() const { return *Backend; }
193191

194192
MCCodeEmitter &getEmitter() const { return *Emitter; }

llvm/lib/MC/MCAssembler.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ void MCAssembler::reset() {
101101
getBackendPtr()->reset();
102102
if (getEmitterPtr())
103103
getEmitterPtr()->reset();
104-
if (getWriterPtr())
105-
getWriterPtr()->reset();
104+
if (Writer)
105+
Writer->reset();
106106
}
107107

108108
bool MCAssembler::registerSection(MCSection &Section) {
@@ -195,9 +195,9 @@ bool MCAssembler::evaluateFixup(const MCFixup &Fixup, const MCFragment *DF,
195195
const MCSymbol &SA = A->getSymbol();
196196
if (A->getKind() != MCSymbolRefExpr::VK_None || SA.isUndefined()) {
197197
IsResolved = false;
198-
} else if (auto *Writer = getWriterPtr()) {
198+
} else {
199199
IsResolved = (FixupFlags & MCFixupKindInfo::FKF_Constant) ||
200-
Writer->isSymbolRefDifferenceFullyResolvedImpl(
200+
getWriter().isSymbolRefDifferenceFullyResolvedImpl(
201201
*this, SA, *DF, false, true);
202202
}
203203
}

llvm/lib/Target/RISCV/MCTargetDesc/RISCVAsmBackend.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -560,11 +560,7 @@ bool RISCVAsmBackend::evaluateTargetFixup(const MCAssembler &Asm,
560560
if (A->getKind() != MCSymbolRefExpr::VK_None || SA.isUndefined())
561561
return false;
562562

563-
auto *Writer = Asm.getWriterPtr();
564-
if (!Writer)
565-
return false;
566-
567-
bool IsResolved = Writer->isSymbolRefDifferenceFullyResolvedImpl(
563+
bool IsResolved = Asm.getWriter().isSymbolRefDifferenceFullyResolvedImpl(
568564
Asm, SA, *AUIPCDF, false, true);
569565
if (!IsResolved)
570566
return false;

0 commit comments

Comments
 (0)