[llvm] b591f6d - SystemZ: Migrate to newer relocation specifier representation
Fangrui Song via llvm-commits
llvm-commits at lists.llvm.org
Sun Jun 15 19:26:45 PDT 2025
Author: Fangrui Song
Date: 2025-06-15T19:26:40-07:00
New Revision: b591f6dad4079401fadc4a516b32d3900b7946de
URL: https://github.com/llvm/llvm-project/commit/b591f6dad4079401fadc4a516b32d3900b7946de
DIFF: https://github.com/llvm/llvm-project/commit/b591f6dad4079401fadc4a516b32d3900b7946de.diff
LOG: SystemZ: Migrate to newer relocation specifier representation
z/OS creates SystemZMCExpr objects (https://reviews.llvm.org/D153788)
while ELF doesn't. Define the SystemZMCAsmInfoGOFF hooks
instead of the legacy MCSpecifierExpr:: hooks.
Added:
Modified:
llvm/lib/Target/SystemZ/AsmParser/SystemZAsmParser.cpp
llvm/lib/Target/SystemZ/MCTargetDesc/CMakeLists.txt
llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmInfo.cpp
llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmInfo.h
llvm/lib/Target/SystemZ/SystemZAsmPrinter.cpp
llvm/lib/Target/SystemZ/SystemZMCInstLower.cpp
llvm/lib/Target/SystemZ/SystemZMCInstLower.h
Removed:
llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCExpr.cpp
llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCExpr.h
################################################################################
diff --git a/llvm/lib/Target/SystemZ/AsmParser/SystemZAsmParser.cpp b/llvm/lib/Target/SystemZ/AsmParser/SystemZAsmParser.cpp
index 74a8822a12ac7..6ee2a87565baa 100644
--- a/llvm/lib/Target/SystemZ/AsmParser/SystemZAsmParser.cpp
+++ b/llvm/lib/Target/SystemZ/AsmParser/SystemZAsmParser.cpp
@@ -8,7 +8,6 @@
#include "MCTargetDesc/SystemZGNUInstPrinter.h"
#include "MCTargetDesc/SystemZMCAsmInfo.h"
-#include "MCTargetDesc/SystemZMCExpr.h"
#include "MCTargetDesc/SystemZMCTargetDesc.h"
#include "MCTargetDesc/SystemZTargetStreamer.h"
#include "TargetInfo/SystemZTargetInfo.h"
@@ -1707,7 +1706,7 @@ ParseStatus SystemZAsmParser::parsePCRel(OperandVector &Operands,
if (Parser.getTok().isNot(AsmToken::Identifier))
return Error(Parser.getTok().getLoc(), "unexpected token");
- SystemZMCExpr::Specifier Kind = SystemZ::S_None;
+ auto Kind = SystemZ::S_None;
StringRef Name = Parser.getTok().getString();
if (Name == "tls_gdcall")
Kind = SystemZ::S_TLSGD;
diff --git a/llvm/lib/Target/SystemZ/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/SystemZ/MCTargetDesc/CMakeLists.txt
index c95445637d0b2..28f7ced8d7ce7 100644
--- a/llvm/lib/Target/SystemZ/MCTargetDesc/CMakeLists.txt
+++ b/llvm/lib/Target/SystemZ/MCTargetDesc/CMakeLists.txt
@@ -8,7 +8,6 @@ add_llvm_component_library(LLVMSystemZDesc
SystemZMCAsmBackend.cpp
SystemZMCAsmInfo.cpp
SystemZMCCodeEmitter.cpp
- SystemZMCExpr.cpp
SystemZMCTargetDesc.cpp
SystemZTargetStreamer.cpp
diff --git a/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmInfo.cpp b/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmInfo.cpp
index 0f7341e6d03bb..052875bf0d3f6 100644
--- a/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmInfo.cpp
+++ b/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmInfo.cpp
@@ -7,9 +7,9 @@
//===----------------------------------------------------------------------===//
#include "SystemZMCAsmInfo.h"
-#include "MCTargetDesc/SystemZMCExpr.h"
#include "llvm/MC/MCContext.h"
#include "llvm/MC/MCExpr.h"
+#include "llvm/MC/MCValue.h"
using namespace llvm;
@@ -58,3 +58,31 @@ SystemZMCAsmInfoGOFF::SystemZMCAsmInfoGOFF(const Triple &TT) {
bool SystemZMCAsmInfoGOFF::isAcceptableChar(char C) const {
return MCAsmInfo::isAcceptableChar(C) || C == '#';
}
+
+void SystemZMCAsmInfoGOFF::printSpecifierExpr(
+ raw_ostream &OS, const MCSpecifierExpr &Expr) const {
+ switch (Expr.getSpecifier()) {
+ case SystemZ::S_None:
+ OS << "A";
+ break;
+ case SystemZ::S_RCon:
+ OS << "R";
+ break;
+ case SystemZ::S_VCon:
+ OS << "V";
+ break;
+ default:
+ llvm_unreachable("Invalid kind");
+ }
+ OS << '(';
+ printExpr(OS, *Expr.getSubExpr());
+ OS << ')';
+}
+
+bool SystemZMCAsmInfoGOFF::evaluateAsRelocatableImpl(
+ const MCSpecifierExpr &Expr, MCValue &Res, const MCAssembler *Asm) const {
+ if (!Expr.getSubExpr()->evaluateAsRelocatable(Res, Asm))
+ return false;
+ Res.setSpecifier(Expr.getSpecifier());
+ return true;
+}
diff --git a/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmInfo.h b/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmInfo.h
index 6d7d669fa8e12..11c2833b8ada8 100644
--- a/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmInfo.h
+++ b/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmInfo.h
@@ -26,6 +26,10 @@ class SystemZMCAsmInfoGOFF : public MCAsmInfoGOFF {
public:
explicit SystemZMCAsmInfoGOFF(const Triple &TT);
bool isAcceptableChar(char C) const override;
+ void printSpecifierExpr(raw_ostream &OS,
+ const MCSpecifierExpr &Expr) const override;
+ bool evaluateAsRelocatableImpl(const MCSpecifierExpr &Expr, MCValue &Res,
+ const MCAssembler *Asm) const override;
};
namespace SystemZ {
diff --git a/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCExpr.cpp b/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCExpr.cpp
deleted file mode 100644
index 7b82c0cb6609c..0000000000000
--- a/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCExpr.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-//===-- SystemZMCExpr.cpp - SystemZ specific MC expression classes --------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "SystemZMCExpr.h"
-#include "SystemZMCAsmInfo.h"
-#include "llvm/MC/MCAsmInfo.h"
-#include "llvm/MC/MCContext.h"
-using namespace llvm;
-
-#define DEBUG_TYPE "systemzmcexpr"
-
-const SystemZMCExpr *SystemZMCExpr::create(MCSpecifierExpr::Spec S,
- const MCExpr *Expr, MCContext &Ctx) {
- return new (Ctx) SystemZMCExpr(Expr, S);
-}
-
-StringRef SystemZMCExpr::getVariantKindName() const {
- switch (getSpecifier()) {
- case SystemZ::S_None:
- return "A";
- case SystemZ::S_RCon:
- return "R";
- case SystemZ::S_VCon:
- return "V";
- default:
- llvm_unreachable("Invalid kind");
- }
-}
-
-void SystemZMCExpr::printImpl(raw_ostream &OS, const MCAsmInfo *MAI) const {
- OS << getVariantKindName() << '(';
- MAI->printExpr(OS, *Expr);
- OS << ')';
-}
-
-bool SystemZMCExpr::evaluateAsRelocatableImpl(MCValue &Res,
- const MCAssembler *Asm) const {
- if (!getSubExpr()->evaluateAsRelocatable(Res, Asm))
- return false;
- Res.setSpecifier(specifier);
- return true;
-}
diff --git a/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCExpr.h b/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCExpr.h
deleted file mode 100644
index 8e730e50ae9dd..0000000000000
--- a/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCExpr.h
+++ /dev/null
@@ -1,38 +0,0 @@
-//===-- SystemZMCExpr.h - SystemZ specific MC expression classes -*- C++-*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_LIB_TARGET_SYSTEMZ_MCTARGETDESC_SYSTEMZMCEXPR_H
-#define LLVM_LIB_TARGET_SYSTEMZ_MCTARGETDESC_SYSTEMZMCEXPR_H
-
-#include "llvm/MC/MCExpr.h"
-#include "llvm/MC/MCStreamer.h"
-#include "llvm/MC/MCValue.h"
-
-namespace llvm {
-
-class SystemZMCExpr : public MCSpecifierExpr {
-public:
- using Specifier = Spec;
-
-private:
- explicit SystemZMCExpr(const MCExpr *Expr, Spec S)
- : MCSpecifierExpr(Expr, S) {}
-
-public:
- static const SystemZMCExpr *create(Spec Kind, const MCExpr *Expr,
- MCContext &Ctx);
-
- StringRef getVariantKindName() const;
-
- void printImpl(raw_ostream &OS, const MCAsmInfo *MAI) const override;
- bool evaluateAsRelocatableImpl(MCValue &Res,
- const MCAssembler *Asm) const override;
-};
-} // end namespace llvm
-
-#endif
diff --git a/llvm/lib/Target/SystemZ/SystemZAsmPrinter.cpp b/llvm/lib/Target/SystemZ/SystemZAsmPrinter.cpp
index d5e034b5a0096..aaf12b88de132 100644
--- a/llvm/lib/Target/SystemZ/SystemZAsmPrinter.cpp
+++ b/llvm/lib/Target/SystemZ/SystemZAsmPrinter.cpp
@@ -1139,23 +1139,20 @@ void SystemZAsmPrinter::emitADASection() {
// imported functions, that are placed in the ADA to be 8 byte aligned.
EMIT_COMMENT("function descriptor of");
OutStreamer->emitValue(
- SystemZMCExpr::create(SystemZ::S_RCon,
- MCSymbolRefExpr::create(Sym, OutContext),
- OutContext),
+ MCSpecifierExpr::create(MCSymbolRefExpr::create(Sym, OutContext),
+ SystemZ::S_RCon, OutContext),
PointerSize);
OutStreamer->emitValue(
- SystemZMCExpr::create(SystemZ::S_VCon,
- MCSymbolRefExpr::create(Sym, OutContext),
- OutContext),
+ MCSpecifierExpr::create(MCSymbolRefExpr::create(Sym, OutContext),
+ SystemZ::S_VCon, OutContext),
PointerSize);
EmittedBytes += PointerSize * 2;
break;
case SystemZII::MO_ADA_DATA_SYMBOL_ADDR:
EMIT_COMMENT("pointer to data symbol");
OutStreamer->emitValue(
- SystemZMCExpr::create(SystemZ::S_None,
- MCSymbolRefExpr::create(Sym, OutContext),
- OutContext),
+ MCSpecifierExpr::create(MCSymbolRefExpr::create(Sym, OutContext),
+ SystemZ::S_None, OutContext),
PointerSize);
EmittedBytes += PointerSize;
break;
@@ -1168,9 +1165,8 @@ void SystemZAsmPrinter::emitADASection() {
EMIT_COMMENT("pointer to function descriptor");
OutStreamer->emitValue(
- SystemZMCExpr::create(SystemZ::S_VCon,
- MCSymbolRefExpr::create(Alias, OutContext),
- OutContext),
+ MCSpecifierExpr::create(MCSymbolRefExpr::create(Alias, OutContext),
+ SystemZ::S_VCon, OutContext),
PointerSize);
EmittedBytes += PointerSize;
break;
diff --git a/llvm/lib/Target/SystemZ/SystemZMCInstLower.cpp b/llvm/lib/Target/SystemZ/SystemZMCInstLower.cpp
index 4a68c5d6462d7..c1d0994a9e17e 100644
--- a/llvm/lib/Target/SystemZ/SystemZMCInstLower.cpp
+++ b/llvm/lib/Target/SystemZ/SystemZMCInstLower.cpp
@@ -16,8 +16,8 @@
using namespace llvm;
-// Return the VK_* enumeration for MachineOperand target flags Flags.
-static SystemZMCExpr::Specifier getSpecifierForTFlags(unsigned Flags) {
+// Return the S_* enumeration for MachineOperand target flags Flags.
+static SystemZ::Specifier getSpecifierForTFlags(unsigned Flags) {
switch (Flags & SystemZII::MO_SYMBOL_MODIFIER) {
case 0:
return SystemZ::S_None;
@@ -34,7 +34,7 @@ SystemZMCInstLower::SystemZMCInstLower(MCContext &ctx,
: Ctx(ctx), AsmPrinter(asmprinter) {}
const MCExpr *SystemZMCInstLower::getExpr(const MachineOperand &MO,
- SystemZMCExpr::Specifier Spec) const {
+ SystemZ::Specifier Spec) const {
const MCSymbol *Symbol;
bool HasOffset = true;
switch (MO.getType()) {
@@ -85,7 +85,7 @@ MCOperand SystemZMCInstLower::lowerOperand(const MachineOperand &MO) const {
return MCOperand::createImm(MO.getImm());
default: {
- SystemZMCExpr::Specifier Kind = getSpecifierForTFlags(MO.getTargetFlags());
+ auto Kind = getSpecifierForTFlags(MO.getTargetFlags());
return MCOperand::createExpr(getExpr(MO, Kind));
}
}
diff --git a/llvm/lib/Target/SystemZ/SystemZMCInstLower.h b/llvm/lib/Target/SystemZ/SystemZMCInstLower.h
index 90526882c8535..3187d7726c31e 100644
--- a/llvm/lib/Target/SystemZ/SystemZMCInstLower.h
+++ b/llvm/lib/Target/SystemZ/SystemZMCInstLower.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIB_TARGET_SYSTEMZ_SYSTEMZMCINSTLOWER_H
#define LLVM_LIB_TARGET_SYSTEMZ_SYSTEMZMCINSTLOWER_H
-#include "MCTargetDesc/SystemZMCExpr.h"
+#include "MCTargetDesc/SystemZMCAsmInfo.h"
#include "llvm/MC/MCExpr.h"
#include "llvm/Support/Compiler.h"
#include "llvm/Support/DataTypes.h"
@@ -35,8 +35,7 @@ class LLVM_LIBRARY_VISIBILITY SystemZMCInstLower {
MCOperand lowerOperand(const MachineOperand& MO) const;
// Return an MCExpr for symbolic operand MO with variant kind Kind.
- const MCExpr *getExpr(const MachineOperand &MO,
- SystemZMCExpr::Specifier) const;
+ const MCExpr *getExpr(const MachineOperand &MO, SystemZ::Specifier) const;
};
} // end namespace llvm
More information about the llvm-commits
mailing list