diff options
author | Guillaume Chatelet <gchatelet@google.com> | 2022-12-07 14:48:40 +0000 |
---|---|---|
committer | Guillaume Chatelet <gchatelet@google.com> | 2022-12-07 14:51:26 +0000 |
commit | b822063669641570ab5edae72956d18a5bcde8c4 (patch) | |
tree | 4078fb78c08b293e3fe5f39b87a31c2aade9054c /llvm/lib/MC/MCELFStreamer.cpp | |
parent | 4d97a914d7aef6c95cd95669f99e5d32899e165a (diff) | |
download | llvm-b822063669641570ab5edae72956d18a5bcde8c4.zip llvm-b822063669641570ab5edae72956d18a5bcde8c4.tar.gz llvm-b822063669641570ab5edae72956d18a5bcde8c4.tar.bz2 |
Revert D139439 "[Alignment] Use Align in MCStreamer emitZeroFill/emitLocalCommonSymbol"
This breaks Windows bots with
`warning C4334: '<<': result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?)`
Some shift operators are lacking a proper literal unit ('1ULL' instead of
'1'). Will reland once fixed.
This reverts commit c621c1a8e81856e6bf2be79714767d80466e9ede.
Diffstat (limited to 'llvm/lib/MC/MCELFStreamer.cpp')
-rw-r--r-- | llvm/lib/MC/MCELFStreamer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/llvm/lib/MC/MCELFStreamer.cpp b/llvm/lib/MC/MCELFStreamer.cpp index 71d556a..6e0e80f 100644 --- a/llvm/lib/MC/MCELFStreamer.cpp +++ b/llvm/lib/MC/MCELFStreamer.cpp @@ -352,12 +352,12 @@ void MCELFStreamer::emitELFSymverDirective(const MCSymbol *OriginalSym, } void MCELFStreamer::emitLocalCommonSymbol(MCSymbol *S, uint64_t Size, - Align ByteAlignment) { + unsigned ByteAlignment) { auto *Symbol = cast<MCSymbolELF>(S); // FIXME: Should this be caught and done earlier? getAssembler().registerSymbol(*Symbol); Symbol->setBinding(ELF::STB_LOCAL); - emitCommonSymbol(Symbol, Size, ByteAlignment.value()); + emitCommonSymbol(Symbol, Size, ByteAlignment); } void MCELFStreamer::emitValueImpl(const MCExpr *Value, unsigned Size, @@ -727,7 +727,7 @@ void MCELFStreamer::emitSymbolDesc(MCSymbol *Symbol, unsigned DescValue) { } void MCELFStreamer::emitZerofill(MCSection *Section, MCSymbol *Symbol, - uint64_t Size, Align ByteAlignment, + uint64_t Size, unsigned ByteAlignment, SMLoc Loc) { llvm_unreachable("ELF doesn't support this directive"); } |