[llvm-branch-commits] [llvm] [MC] Rename MCAsmStreamer to MCGNUAsmStreamer (PR #183763)
via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Fri Feb 27 08:22:25 PST 2026
github-actions[bot] wrote:
<!--LLVM CODE FORMAT COMMENT: {clang-format}-->
:warning: C/C++ code formatter, clang-format found issues in your code. :warning:
<details>
<summary>
You can test this locally with the following command:
</summary>
``````````bash
git-clang-format --diff origin/main HEAD --extensions h,cpp -- llvm/lib/MC/MCGNUAsmStreamer.cpp llvm/lib/MC/MCAsmStreamer.cpp llvm/lib/Target/SystemZ/MCTargetDesc/SystemZHLASMAsmStreamer.h llvm/include/llvm/MC/MCAsmStreamer.h --diff_from_common_commit
``````````
:warning:
The reproduction instructions above might return results for more than one PR
in a stack if you are using a stacked PR workflow. You can limit the results by
changing `origin/main` to the base branch/commit you want to compare against.
:warning:
</details>
<details>
<summary>
View the diff from clang-format here.
</summary>
``````````diff
diff --git a/llvm/lib/MC/MCGNUAsmStreamer.cpp b/llvm/lib/MC/MCGNUAsmStreamer.cpp
index c1dd1ef53..7dd14b822 100644
--- a/llvm/lib/MC/MCGNUAsmStreamer.cpp
+++ b/llvm/lib/MC/MCGNUAsmStreamer.cpp
@@ -436,7 +436,8 @@ public:
} // end anonymous namespace.
void MCGNUAsmStreamer::AddComment(const Twine &T, bool EOL) {
- if (!IsVerboseAsm) return;
+ if (!IsVerboseAsm)
+ return;
T.toVector(CommentToEmit);
@@ -452,15 +453,15 @@ void MCGNUAsmStreamer::EmitCommentsAndEOL() {
StringRef Comments = CommentToEmit;
- assert(Comments.back() == '\n' &&
- "Comment array not newline terminated");
+ assert(Comments.back() == '\n' && "Comment array not newline terminated");
do {
// Emit a line of comments.
OS.PadToColumn(MAI->getCommentColumn());
size_t Position = Comments.find('\n');
- OS << MAI->getCommentString() << ' ' << Comments.substr(0, Position) <<'\n';
+ OS << MAI->getCommentString() << ' ' << Comments.substr(0, Position)
+ << '\n';
- Comments = Comments.substr(Position+1);
+ Comments = Comments.substr(Position + 1);
} while (!Comments.empty());
CommentToEmit.clear();
@@ -468,7 +469,7 @@ void MCGNUAsmStreamer::EmitCommentsAndEOL() {
static inline int64_t truncateToSize(int64_t Value, unsigned Bytes) {
assert(Bytes > 0 && Bytes <= 8 && "Invalid size!");
- return Value & ((uint64_t) (int64_t) -1 >> (64 - Bytes * 8));
+ return Value & ((uint64_t)(int64_t)-1 >> (64 - Bytes * 8));
}
void MCGNUAsmStreamer::emitRawComment(const Twine &T, bool TabPrefix) {
@@ -611,21 +612,35 @@ void MCGNUAsmStreamer::emitDataRegion(MCDataRegionType Kind) {
if (!MAI->doesSupportDataRegionDirectives())
return;
switch (Kind) {
- case MCDR_DataRegion: OS << "\t.data_region"; break;
- case MCDR_DataRegionJT8: OS << "\t.data_region jt8"; break;
- case MCDR_DataRegionJT16: OS << "\t.data_region jt16"; break;
- case MCDR_DataRegionJT32: OS << "\t.data_region jt32"; break;
- case MCDR_DataRegionEnd: OS << "\t.end_data_region"; break;
+ case MCDR_DataRegion:
+ OS << "\t.data_region";
+ break;
+ case MCDR_DataRegionJT8:
+ OS << "\t.data_region jt8";
+ break;
+ case MCDR_DataRegionJT16:
+ OS << "\t.data_region jt16";
+ break;
+ case MCDR_DataRegionJT32:
+ OS << "\t.data_region jt32";
+ break;
+ case MCDR_DataRegionEnd:
+ OS << "\t.end_data_region";
+ break;
}
EmitEOL();
}
static const char *getVersionMinDirective(MCVersionMinType Type) {
switch (Type) {
- case MCVM_WatchOSVersionMin: return ".watchos_version_min";
- case MCVM_TvOSVersionMin: return ".tvos_version_min";
- case MCVM_IOSVersionMin: return ".ios_version_min";
- case MCVM_OSXVersionMin: return ".macosx_version_min";
+ case MCVM_WatchOSVersionMin:
+ return ".watchos_version_min";
+ case MCVM_TvOSVersionMin:
+ return ".tvos_version_min";
+ case MCVM_IOSVersionMin:
+ return ".ios_version_min";
+ case MCVM_OSXVersionMin:
+ return ".macosx_version_min";
}
llvm_unreachable("Invalid MC version min type");
}
@@ -714,62 +729,104 @@ void MCGNUAsmStreamer::emitWeakReference(MCSymbol *Alias,
bool MCGNUAsmStreamer::emitSymbolAttribute(MCSymbol *Symbol,
MCSymbolAttr Attribute) {
switch (Attribute) {
- case MCSA_Invalid: llvm_unreachable("Invalid symbol attribute");
+ case MCSA_Invalid:
+ llvm_unreachable("Invalid symbol attribute");
case MCSA_ELF_TypeFunction: /// .type _foo, STT_FUNC # aka @function
case MCSA_ELF_TypeIndFunction: /// .type _foo, STT_GNU_IFUNC
case MCSA_ELF_TypeObject: /// .type _foo, STT_OBJECT # aka @object
case MCSA_ELF_TypeTLS: /// .type _foo, STT_TLS # aka @tls_object
case MCSA_ELF_TypeCommon: /// .type _foo, STT_COMMON # aka @common
case MCSA_ELF_TypeNoType: /// .type _foo, STT_NOTYPE # aka @notype
- case MCSA_ELF_TypeGnuUniqueObject: /// .type _foo, @gnu_unique_object
+ case MCSA_ELF_TypeGnuUniqueObject: /// .type _foo, @gnu_unique_object
if (!MAI->hasDotTypeDotSizeDirective())
return false; // Symbol attribute not supported
OS << "\t.type\t";
Symbol->print(OS, MAI);
OS << ',' << ((MAI->getCommentString()[0] != '@') ? '@' : '%');
switch (Attribute) {
- default: return false;
- case MCSA_ELF_TypeFunction: OS << "function"; break;
- case MCSA_ELF_TypeIndFunction: OS << "gnu_indirect_function"; break;
- case MCSA_ELF_TypeObject: OS << "object"; break;
- case MCSA_ELF_TypeTLS: OS << "tls_object"; break;
- case MCSA_ELF_TypeCommon: OS << "common"; break;
- case MCSA_ELF_TypeNoType: OS << "notype"; break;
- case MCSA_ELF_TypeGnuUniqueObject: OS << "gnu_unique_object"; break;
+ default:
+ return false;
+ case MCSA_ELF_TypeFunction:
+ OS << "function";
+ break;
+ case MCSA_ELF_TypeIndFunction:
+ OS << "gnu_indirect_function";
+ break;
+ case MCSA_ELF_TypeObject:
+ OS << "object";
+ break;
+ case MCSA_ELF_TypeTLS:
+ OS << "tls_object";
+ break;
+ case MCSA_ELF_TypeCommon:
+ OS << "common";
+ break;
+ case MCSA_ELF_TypeNoType:
+ OS << "notype";
+ break;
+ case MCSA_ELF_TypeGnuUniqueObject:
+ OS << "gnu_unique_object";
+ break;
}
EmitEOL();
return true;
case MCSA_Global: // .globl/.global
OS << MAI->getGlobalDirective();
break;
- case MCSA_LGlobal: OS << "\t.lglobl\t"; break;
- case MCSA_Hidden: OS << "\t.hidden\t"; break;
- case MCSA_IndirectSymbol: OS << "\t.indirect_symbol\t"; break;
- case MCSA_Internal: OS << "\t.internal\t"; break;
- case MCSA_LazyReference: OS << "\t.lazy_reference\t"; break;
- case MCSA_Local: OS << "\t.local\t"; break;
+ case MCSA_LGlobal:
+ OS << "\t.lglobl\t";
+ break;
+ case MCSA_Hidden:
+ OS << "\t.hidden\t";
+ break;
+ case MCSA_IndirectSymbol:
+ OS << "\t.indirect_symbol\t";
+ break;
+ case MCSA_Internal:
+ OS << "\t.internal\t";
+ break;
+ case MCSA_LazyReference:
+ OS << "\t.lazy_reference\t";
+ break;
+ case MCSA_Local:
+ OS << "\t.local\t";
+ break;
case MCSA_NoDeadStrip:
if (!MAI->hasNoDeadStrip())
return false;
OS << "\t.no_dead_strip\t";
break;
- case MCSA_SymbolResolver: OS << "\t.symbol_resolver\t"; break;
- case MCSA_AltEntry: OS << "\t.alt_entry\t"; break;
+ case MCSA_SymbolResolver:
+ OS << "\t.symbol_resolver\t";
+ break;
+ case MCSA_AltEntry:
+ OS << "\t.alt_entry\t";
+ break;
case MCSA_PrivateExtern:
OS << "\t.private_extern\t";
break;
- case MCSA_Protected: OS << "\t.protected\t"; break;
- case MCSA_Reference: OS << "\t.reference\t"; break;
+ case MCSA_Protected:
+ OS << "\t.protected\t";
+ break;
+ case MCSA_Reference:
+ OS << "\t.reference\t";
+ break;
case MCSA_Extern:
OS << "\t.extern\t";
break;
- case MCSA_Weak: OS << MAI->getWeakDirective(); break;
+ case MCSA_Weak:
+ OS << MAI->getWeakDirective();
+ break;
case MCSA_WeakDefinition:
OS << "\t.weak_definition\t";
break;
// .weak_reference
- case MCSA_WeakReference: OS << MAI->getWeakRefDirective(); break;
- case MCSA_WeakDefAutoPrivate: OS << "\t.weak_def_can_be_hidden\t"; break;
+ case MCSA_WeakReference:
+ OS << MAI->getWeakRefDirective();
+ break;
+ case MCSA_WeakDefAutoPrivate:
+ OS << "\t.weak_def_can_be_hidden\t";
+ break;
case MCSA_Cold:
// Assemblers currently do not support a .cold directive.
case MCSA_Exported:
@@ -1111,7 +1168,7 @@ void MCGNUAsmStreamer::emitZerofill(MCSection *Section, MCSymbol *Symbol,
".zerofill is a Mach-O specific directive");
// This is a mach-o specific directive.
- const MCSectionMachO *MOSection = ((const MCSectionMachO*)Section);
+ const MCSectionMachO *MOSection = ((const MCSectionMachO *)Section);
OS << MOSection->getSegmentName() << "," << MOSection->getName();
if (Symbol) {
@@ -1157,7 +1214,7 @@ static inline bool isPrintableString(StringRef Data) {
return isPrint(Data.back()) || Data.back() == 0;
}
-static inline char toOctal(int X) { return (X&7)+'0'; }
+static inline char toOctal(int X) { return (X & 7) + '0'; }
static void PrintByteList(StringRef Data, raw_ostream &OS,
MCAsmInfo::AsmCharLiteralSyntax ACLS) {
@@ -1255,7 +1312,8 @@ void MCGNUAsmStreamer::PrintQuotedString(StringRef Data,
void MCGNUAsmStreamer::emitBytes(StringRef Data) {
assert(getCurrentSectionOnly() &&
"Cannot emit contents before setting section!");
- if (Data.empty()) return;
+ if (Data.empty())
+ return;
const auto emitAsString = [this](StringRef Data) {
if (MAI->isAIX()) {
@@ -1343,11 +1401,20 @@ void MCGNUAsmStreamer::emitValueImpl(const MCExpr *Value, unsigned Size,
"Cannot emit contents before setting section!");
const char *Directive = nullptr;
switch (Size) {
- default: break;
- case 1: Directive = MAI->getData8bitsDirective(); break;
- case 2: Directive = MAI->getData16bitsDirective(); break;
- case 4: Directive = MAI->getData32bitsDirective(); break;
- case 8: Directive = MAI->getData64bitsDirective(); break;
+ default:
+ break;
+ case 1:
+ Directive = MAI->getData8bitsDirective();
+ break;
+ case 2:
+ Directive = MAI->getData16bitsDirective();
+ break;
+ case 4:
+ Directive = MAI->getData32bitsDirective();
+ break;
+ case 8:
+ Directive = MAI->getData64bitsDirective();
+ break;
}
if (!Directive) {
@@ -1509,11 +1576,19 @@ void MCGNUAsmStreamer::emitAlignmentDirective(uint64_t ByteAlignment,
// Non-power of two alignment. This is not widely supported by assemblers.
// FIXME: Parameterize this based on MAI.
switch (ValueSize) {
- default: llvm_unreachable("Invalid size for machine code value!");
- case 1: OS << ".balign"; break;
- case 2: OS << ".balignw"; break;
- case 4: OS << ".balignl"; break;
- case 8: llvm_unreachable("Unsupported alignment size!");
+ default:
+ llvm_unreachable("Invalid size for machine code value!");
+ case 1:
+ OS << ".balign";
+ break;
+ case 2:
+ OS << ".balignw";
+ break;
+ case 4:
+ OS << ".balignl";
+ break;
+ case 8:
+ llvm_unreachable("Unsupported alignment size!");
}
OS << ' ' << ByteAlignment;
@@ -2044,7 +2119,7 @@ void MCGNUAsmStreamer::emitCFIEscape(StringRef Values, SMLoc Loc) {
void MCGNUAsmStreamer::emitCFIGnuArgsSize(int64_t Size, SMLoc Loc) {
MCStreamer::emitCFIGnuArgsSize(Size, Loc);
- uint8_t Buffer[16] = { dwarf::DW_CFA_GNU_args_size };
+ uint8_t Buffer[16] = {dwarf::DW_CFA_GNU_args_size};
unsigned Len = encodeULEB128(Size, Buffer + 1) + 1;
PrintCFIEscape(OS, StringRef((const char *)&Buffer[0], Len));
@@ -2390,7 +2465,7 @@ void MCGNUAsmStreamer::emitInstruction(const MCInst &Inst,
getCommentOS() << "\n";
}
- if(getTargetStreamer())
+ if (getTargetStreamer())
getTargetStreamer()->prettyPrintAsm(*InstPrinter, 0, Inst, STI, OS);
else
InstPrinter->printInst(&Inst, 0, "", STI, OS);
@@ -2406,7 +2481,8 @@ void MCGNUAsmStreamer::emitPseudoProbe(
uint64_t Guid, uint64_t Index, uint64_t Type, uint64_t Attr,
uint64_t Discriminator, const MCPseudoProbeInlineStack &InlineStack,
MCSymbol *FnSym) {
- OS << "\t.pseudoprobe\t" << Guid << " " << Index << " " << Type << " " << Attr;
+ OS << "\t.pseudoprobe\t" << Guid << " " << Index << " " << Type << " "
+ << Attr;
if (Discriminator)
OS << " " << Discriminator;
// Emit inline stack like
@@ -2600,6 +2676,6 @@ MCStreamer *llvm::createAsmStreamer(MCContext &Context,
std::unique_ptr<MCInstPrinter> IP,
std::unique_ptr<MCCodeEmitter> CE,
std::unique_ptr<MCAsmBackend> MAB) {
- return new MCGNUAsmStreamer(Context, std::move(OS), std::move(IP), std::move(CE),
- std::move(MAB));
+ return new MCGNUAsmStreamer(Context, std::move(OS), std::move(IP),
+ std::move(CE), std::move(MAB));
}
diff --git a/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZHLASMAsmStreamer.h b/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZHLASMAsmStreamer.h
index 56f922bf3..2e7f70caa 100644
--- a/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZHLASMAsmStreamer.h
+++ b/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZHLASMAsmStreamer.h
@@ -16,8 +16,8 @@
#include "llvm/ADT/SmallString.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/MC/MCAsmBackend.h"
-#include "llvm/MC/MCAsmStreamer.h"
#include "llvm/MC/MCAsmInfo.h"
+#include "llvm/MC/MCAsmStreamer.h"
#include "llvm/MC/MCAssembler.h"
#include "llvm/MC/MCCodeEmitter.h"
#include "llvm/MC/MCContext.h"
``````````
</details>
https://github.com/llvm/llvm-project/pull/183763
More information about the llvm-branch-commits
mailing list