Pull in r322108 from upstream llvm trunk (by Rafael Espíndola):
Make one of the emitFill methods non virtual. NFC. This is just preparatory work to fix [LLVM] PR35858.
This commit is contained in:
parent
893c3ece10
commit
00da656e30
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=328594
@ -161,7 +161,6 @@ class MCObjectStreamer : public MCStreamer {
|
||||
bool EmitRelocDirective(const MCExpr &Offset, StringRef Name,
|
||||
const MCExpr *Expr, SMLoc Loc) override;
|
||||
using MCStreamer::emitFill;
|
||||
void emitFill(uint64_t NumBytes, uint8_t FillValue) override;
|
||||
void emitFill(const MCExpr &NumBytes, uint64_t FillValue,
|
||||
SMLoc Loc = SMLoc()) override;
|
||||
void emitFill(const MCExpr &NumValues, int64_t Size, int64_t Expr,
|
||||
|
@ -662,7 +662,7 @@ class MCStreamer {
|
||||
|
||||
/// \brief Emit NumBytes bytes worth of the value specified by FillValue.
|
||||
/// This implements directives such as '.space'.
|
||||
virtual void emitFill(uint64_t NumBytes, uint8_t FillValue);
|
||||
void emitFill(uint64_t NumBytes, uint8_t FillValue);
|
||||
|
||||
/// \brief Emit \p Size bytes worth of the value specified by \p FillValue.
|
||||
///
|
||||
|
@ -192,9 +192,6 @@ class MCAsmStreamer final : public MCStreamer {
|
||||
|
||||
void EmitGPRel32Value(const MCExpr *Value) override;
|
||||
|
||||
|
||||
void emitFill(uint64_t NumBytes, uint8_t FillValue) override;
|
||||
|
||||
void emitFill(const MCExpr &NumBytes, uint64_t FillValue,
|
||||
SMLoc Loc = SMLoc()) override;
|
||||
|
||||
@ -965,17 +962,12 @@ void MCAsmStreamer::EmitGPRel32Value(const MCExpr *Value) {
|
||||
EmitEOL();
|
||||
}
|
||||
|
||||
/// emitFill - Emit NumBytes bytes worth of the value specified by
|
||||
/// FillValue. This implements directives such as '.space'.
|
||||
void MCAsmStreamer::emitFill(uint64_t NumBytes, uint8_t FillValue) {
|
||||
if (NumBytes == 0) return;
|
||||
|
||||
const MCExpr *E = MCConstantExpr::create(NumBytes, getContext());
|
||||
emitFill(*E, FillValue);
|
||||
}
|
||||
|
||||
void MCAsmStreamer::emitFill(const MCExpr &NumBytes, uint64_t FillValue,
|
||||
SMLoc Loc) {
|
||||
int64_t IntNumBytes;
|
||||
if (NumBytes.evaluateAsAbsolute(IntNumBytes) && IntNumBytes == 0)
|
||||
return;
|
||||
|
||||
if (const char *ZeroDirective = MAI->getZeroDirective()) {
|
||||
// FIXME: Emit location directives
|
||||
OS << ZeroDirective;
|
||||
|
@ -577,11 +577,6 @@ bool MCObjectStreamer::EmitRelocDirective(const MCExpr &Offset, StringRef Name,
|
||||
return false;
|
||||
}
|
||||
|
||||
void MCObjectStreamer::emitFill(uint64_t NumBytes, uint8_t FillValue) {
|
||||
assert(getCurrentSectionOnly() && "need a section");
|
||||
insert(new MCFillFragment(FillValue, NumBytes));
|
||||
}
|
||||
|
||||
void MCObjectStreamer::emitFill(const MCExpr &NumBytes, uint64_t FillValue,
|
||||
SMLoc Loc) {
|
||||
MCDataFragment *DF = getOrCreateDataFragment();
|
||||
@ -593,12 +588,13 @@ void MCObjectStreamer::emitFill(const MCExpr &NumBytes, uint64_t FillValue,
|
||||
return;
|
||||
}
|
||||
|
||||
if (IntNumBytes <= 0) {
|
||||
if (IntNumBytes < 0) {
|
||||
getContext().reportError(Loc, "invalid number of bytes");
|
||||
return;
|
||||
}
|
||||
|
||||
emitFill(IntNumBytes, FillValue);
|
||||
assert(getCurrentSectionOnly() && "need a section");
|
||||
insert(new MCFillFragment(FillValue, IntNumBytes));
|
||||
}
|
||||
|
||||
void MCObjectStreamer::emitFill(const MCExpr &NumValues, int64_t Size,
|
||||
|
@ -184,8 +184,7 @@ void MCStreamer::EmitGPRel32Value(const MCExpr *Value) {
|
||||
/// Emit NumBytes bytes worth of the value specified by FillValue.
|
||||
/// This implements directives such as '.space'.
|
||||
void MCStreamer::emitFill(uint64_t NumBytes, uint8_t FillValue) {
|
||||
for (uint64_t i = 0, e = NumBytes; i != e; ++i)
|
||||
EmitIntValue(FillValue, 1);
|
||||
emitFill(*MCConstantExpr::create(NumBytes, getContext()), FillValue);
|
||||
}
|
||||
|
||||
void MCStreamer::emitFill(uint64_t NumValues, int64_t Size, int64_t Expr) {
|
||||
|
Loading…
Reference in New Issue
Block a user