[llvm] [WebAssembly] Add WebAssemblyMCExpr::Specifier (PR #133116)
Fangrui Song via llvm-commits
llvm-commits at lists.llvm.org
Wed Mar 26 09:32:35 PDT 2025
https://github.com/MaskRay updated https://github.com/llvm/llvm-project/pull/133116
>From a727f9fdd77fec8e481856d1d1bb1f73ec029a27 Mon Sep 17 00:00:00 2001
From: Fangrui Song <i at maskray.me>
Date: Wed, 26 Mar 2025 09:21:23 -0700
Subject: [PATCH 1/2] =?UTF-8?q?[=F0=9D=98=80=F0=9D=97=BD=F0=9D=97=BF]=20in?=
=?UTF-8?q?itial=20version?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Created using spr 1.3.5-bogner
---
llvm/include/llvm/MC/MCWasmStreamer.h | 3 -
llvm/lib/MC/MCWasmStreamer.cpp | 45 -------------
llvm/lib/MC/WasmObjectWriter.cpp | 9 ---
.../AsmParser/WebAssemblyAsmParser.cpp | 3 +-
.../AsmParser/WebAssemblyAsmTypeCheck.cpp | 7 +-
.../Disassembler/WebAssemblyDisassembler.cpp | 3 +-
.../WebAssembly/MCTargetDesc/CMakeLists.txt | 1 +
.../MCTargetDesc/WebAssemblyInstPrinter.cpp | 3 +-
.../MCTargetDesc/WebAssemblyMCAsmInfo.cpp | 15 +++--
.../MCTargetDesc/WebAssemblyMCExpr.cpp | 34 ++++++++++
.../MCTargetDesc/WebAssemblyMCExpr.h | 64 +++++++++++++++++++
.../WebAssemblyWasmObjectWriter.cpp | 55 ++++++++--------
.../WebAssembly/WebAssemblyAsmPrinter.cpp | 3 +-
.../WebAssembly/WebAssemblyMCInstLower.cpp | 17 ++---
14 files changed, 156 insertions(+), 106 deletions(-)
create mode 100644 llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyMCExpr.cpp
create mode 100644 llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyMCExpr.h
diff --git a/llvm/include/llvm/MC/MCWasmStreamer.h b/llvm/include/llvm/MC/MCWasmStreamer.h
index 4dffd83b12d0d..71149c0ca3d17 100644
--- a/llvm/include/llvm/MC/MCWasmStreamer.h
+++ b/llvm/include/llvm/MC/MCWasmStreamer.h
@@ -67,11 +67,8 @@ class MCWasmStreamer : public MCObjectStreamer {
void finishImpl() override;
private:
- void emitInstToFragment(const MCInst &Inst, const MCSubtargetInfo &) override;
void emitInstToData(const MCInst &Inst, const MCSubtargetInfo &) override;
- void fixSymbolsInTLSFixups(const MCExpr *expr);
-
bool SeenIdent;
};
diff --git a/llvm/lib/MC/MCWasmStreamer.cpp b/llvm/lib/MC/MCWasmStreamer.cpp
index d4806b3a5ecb6..2d3b5adb58a20 100644
--- a/llvm/lib/MC/MCWasmStreamer.cpp
+++ b/llvm/lib/MC/MCWasmStreamer.cpp
@@ -167,15 +167,6 @@ void MCWasmStreamer::emitIdent(StringRef IdentString) {
// sections in the object format
}
-void MCWasmStreamer::emitInstToFragment(const MCInst &Inst,
- const MCSubtargetInfo &STI) {
- this->MCObjectStreamer::emitInstToFragment(Inst, STI);
- MCRelaxableFragment &F = *cast<MCRelaxableFragment>(getCurrentFragment());
-
- for (auto &Fixup : F.getFixups())
- fixSymbolsInTLSFixups(Fixup.getValue());
-}
-
void MCWasmStreamer::emitInstToData(const MCInst &Inst,
const MCSubtargetInfo &STI) {
MCAssembler &Assembler = getAssembler();
@@ -183,9 +174,6 @@ void MCWasmStreamer::emitInstToData(const MCInst &Inst,
SmallString<256> Code;
Assembler.getEmitter().encodeInstruction(Inst, Code, Fixups, STI);
- for (auto &Fixup : Fixups)
- fixSymbolsInTLSFixups(Fixup.getValue());
-
// Append the encoded instruction to the current data fragment (or create a
// new such fragment if the current fragment is not a data fragment).
MCDataFragment *DF = getOrCreateDataFragment();
@@ -205,39 +193,6 @@ void MCWasmStreamer::finishImpl() {
this->MCObjectStreamer::finishImpl();
}
-void MCWasmStreamer::fixSymbolsInTLSFixups(const MCExpr *expr) {
- switch (expr->getKind()) {
- case MCExpr::Target:
- case MCExpr::Constant:
- break;
-
- case MCExpr::Binary: {
- const MCBinaryExpr *be = cast<MCBinaryExpr>(expr);
- fixSymbolsInTLSFixups(be->getLHS());
- fixSymbolsInTLSFixups(be->getRHS());
- break;
- }
-
- case MCExpr::SymbolRef: {
- const MCSymbolRefExpr &symRef = *cast<MCSymbolRefExpr>(expr);
- switch (symRef.getKind()) {
- case MCSymbolRefExpr::VK_WASM_TLSREL:
- case MCSymbolRefExpr::VK_WASM_GOT_TLS:
- getAssembler().registerSymbol(symRef.getSymbol());
- cast<MCSymbolWasm>(symRef.getSymbol()).setTLS();
- break;
- default:
- break;
- }
- break;
- }
-
- case MCExpr::Unary:
- fixSymbolsInTLSFixups(cast<MCUnaryExpr>(expr)->getSubExpr());
- break;
- }
-}
-
void MCWasmStreamer::emitSymbolDesc(MCSymbol *Symbol, unsigned DescValue) {
llvm_unreachable("Wasm doesn't support this directive");
}
diff --git a/llvm/lib/MC/WasmObjectWriter.cpp b/llvm/lib/MC/WasmObjectWriter.cpp
index 9c919696a0ac2..b67e2174bd7bc 100644
--- a/llvm/lib/MC/WasmObjectWriter.cpp
+++ b/llvm/lib/MC/WasmObjectWriter.cpp
@@ -607,15 +607,6 @@ void WasmObjectWriter::recordRelocation(MCAssembler &Asm,
SymA->setUsedInReloc();
}
- switch (RefA->getKind()) {
- case MCSymbolRefExpr::VK_GOT:
- case MCSymbolRefExpr::VK_WASM_GOT_TLS:
- SymA->setUsedInGOT();
- break;
- default:
- break;
- }
-
WasmRelocationEntry Rec(FixupOffset, SymA, C, Type, &FixupSection);
LLVM_DEBUG(dbgs() << "WasmReloc: " << Rec << "\n");
diff --git a/llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmParser.cpp b/llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmParser.cpp
index 7f351213308e0..4a8d33297f7cc 100644
--- a/llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmParser.cpp
+++ b/llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmParser.cpp
@@ -14,6 +14,7 @@
//===----------------------------------------------------------------------===//
#include "AsmParser/WebAssemblyAsmTypeCheck.h"
+#include "MCTargetDesc/WebAssemblyMCExpr.h"
#include "MCTargetDesc/WebAssemblyMCTargetDesc.h"
#include "MCTargetDesc/WebAssemblyMCTypeUtilities.h"
#include "MCTargetDesc/WebAssemblyTargetStreamer.h"
@@ -701,7 +702,7 @@ class WebAssemblyAsmParser final : public MCTargetAsmParser {
WasmSym->setSignature(Signature);
WasmSym->setType(wasm::WASM_SYMBOL_TYPE_FUNCTION);
const MCExpr *Expr = MCSymbolRefExpr::create(
- WasmSym, MCSymbolRefExpr::VK_WASM_TYPEINDEX, Ctx);
+ WasmSym, WebAssemblyMCExpr::VK_TYPEINDEX, Ctx);
Operands.push_back(std::make_unique<WebAssemblyOperand>(
Loc.getLoc(), Loc.getEndLoc(), WebAssemblyOperand::SymOp{Expr}));
}
diff --git a/llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmTypeCheck.cpp b/llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmTypeCheck.cpp
index 9ebc0dfdab9fe..a7b5476b74f6d 100644
--- a/llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmTypeCheck.cpp
+++ b/llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmTypeCheck.cpp
@@ -14,6 +14,7 @@
//===----------------------------------------------------------------------===//
#include "AsmParser/WebAssemblyAsmTypeCheck.h"
+#include "MCTargetDesc/WebAssemblyMCExpr.h"
#include "MCTargetDesc/WebAssemblyMCTargetDesc.h"
#include "MCTargetDesc/WebAssemblyMCTypeUtilities.h"
#include "MCTargetDesc/WebAssemblyTargetStreamer.h"
@@ -264,9 +265,9 @@ bool WebAssemblyAsmTypeCheck::getGlobal(SMLoc ErrorLoc,
break;
case wasm::WASM_SYMBOL_TYPE_FUNCTION:
case wasm::WASM_SYMBOL_TYPE_DATA:
- switch (SymRef->getKind()) {
- case MCSymbolRefExpr::VK_GOT:
- case MCSymbolRefExpr::VK_WASM_GOT_TLS:
+ switch (getSpecifier(SymRef)) {
+ case WebAssemblyMCExpr::VK_GOT:
+ case WebAssemblyMCExpr::VK_GOT_TLS:
Type = Is64 ? wasm::ValType::I64 : wasm::ValType::I32;
return false;
default:
diff --git a/llvm/lib/Target/WebAssembly/Disassembler/WebAssemblyDisassembler.cpp b/llvm/lib/Target/WebAssembly/Disassembler/WebAssemblyDisassembler.cpp
index 8d4d2717b8041..a9066614dc7f8 100644
--- a/llvm/lib/Target/WebAssembly/Disassembler/WebAssemblyDisassembler.cpp
+++ b/llvm/lib/Target/WebAssembly/Disassembler/WebAssemblyDisassembler.cpp
@@ -14,6 +14,7 @@
///
//===----------------------------------------------------------------------===//
+#include "MCTargetDesc/WebAssemblyMCExpr.h"
#include "MCTargetDesc/WebAssemblyMCTypeUtilities.h"
#include "TargetInfo/WebAssemblyTargetInfo.h"
#include "llvm/BinaryFormat/Wasm.h"
@@ -238,7 +239,7 @@ MCDisassembler::DecodeStatus WebAssemblyDisassembler::getInstruction(
auto *WasmSym = cast<MCSymbolWasm>(Sym);
WasmSym->setType(wasm::WASM_SYMBOL_TYPE_FUNCTION);
const MCExpr *Expr = MCSymbolRefExpr::create(
- WasmSym, MCSymbolRefExpr::VK_WASM_TYPEINDEX, getContext());
+ WasmSym, WebAssemblyMCExpr::VK_TYPEINDEX, getContext());
MI.addOperand(MCOperand::createExpr(Expr));
}
break;
diff --git a/llvm/lib/Target/WebAssembly/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/WebAssembly/MCTargetDesc/CMakeLists.txt
index ccecb0c149188..b5d6d233afad0 100644
--- a/llvm/lib/Target/WebAssembly/MCTargetDesc/CMakeLists.txt
+++ b/llvm/lib/Target/WebAssembly/MCTargetDesc/CMakeLists.txt
@@ -3,6 +3,7 @@ add_llvm_component_library(LLVMWebAssemblyDesc
WebAssemblyInstPrinter.cpp
WebAssemblyMCAsmInfo.cpp
WebAssemblyMCCodeEmitter.cpp
+ WebAssemblyMCExpr.cpp
WebAssemblyMCTargetDesc.cpp
WebAssemblyMCTypeUtilities.cpp
WebAssemblyTargetStreamer.cpp
diff --git a/llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyInstPrinter.cpp b/llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyInstPrinter.cpp
index 51214cfd6f610..5d423d5710bda 100644
--- a/llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyInstPrinter.cpp
+++ b/llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyInstPrinter.cpp
@@ -12,6 +12,7 @@
//===----------------------------------------------------------------------===//
#include "MCTargetDesc/WebAssemblyInstPrinter.h"
+#include "MCTargetDesc/WebAssemblyMCExpr.h"
#include "MCTargetDesc/WebAssemblyMCTargetDesc.h"
#include "MCTargetDesc/WebAssemblyMCTypeUtilities.h"
#include "llvm/ADT/APFloat.h"
@@ -339,7 +340,7 @@ void WebAssemblyInstPrinter::printOperand(const MCInst *MI, unsigned OpNo,
// as a signature here, such that the assembler can recover this
// information.
auto SRE = static_cast<const MCSymbolRefExpr *>(Op.getExpr());
- if (SRE->getKind() == MCSymbolRefExpr::VK_WASM_TYPEINDEX) {
+ if (getSpecifier(SRE) == WebAssemblyMCExpr::VK_TYPEINDEX) {
auto &Sym = static_cast<const MCSymbolWasm &>(SRE->getSymbol());
O << WebAssembly::signatureToString(Sym.getSignature());
} else {
diff --git a/llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyMCAsmInfo.cpp b/llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyMCAsmInfo.cpp
index ffa63ed8146ae..e954c3075deb7 100644
--- a/llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyMCAsmInfo.cpp
+++ b/llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyMCAsmInfo.cpp
@@ -13,6 +13,7 @@
//===----------------------------------------------------------------------===//
#include "WebAssemblyMCAsmInfo.h"
+#include "WebAssemblyMCExpr.h"
#include "WebAssemblyMCTargetDesc.h"
#include "llvm/MC/MCExpr.h"
#include "llvm/TargetParser/Triple.h"
@@ -22,13 +23,13 @@ using namespace llvm;
#define DEBUG_TYPE "wasm-mc-asm-info"
const MCAsmInfo::VariantKindDesc variantKindDescs[] = {
- {MCSymbolRefExpr::VK_WASM_TYPEINDEX, "TYPEINDEX"},
- {MCSymbolRefExpr::VK_WASM_TBREL, "TBREL"},
- {MCSymbolRefExpr::VK_WASM_MBREL, "MBREL"},
- {MCSymbolRefExpr::VK_WASM_TLSREL, "TLSREL"},
- {MCSymbolRefExpr::VK_GOT, "GOT"},
- {MCSymbolRefExpr::VK_WASM_GOT_TLS, "GOT at TLS"},
- {MCSymbolRefExpr::VK_WASM_FUNCINDEX, "FUNCINDEX"},
+ {WebAssemblyMCExpr::VK_TYPEINDEX, "TYPEINDEX"},
+ {WebAssemblyMCExpr::VK_TBREL, "TBREL"},
+ {WebAssemblyMCExpr::VK_MBREL, "MBREL"},
+ {WebAssemblyMCExpr::VK_TLSREL, "TLSREL"},
+ {WebAssemblyMCExpr::VK_GOT, "GOT"},
+ {WebAssemblyMCExpr::VK_GOT_TLS, "GOT at TLS"},
+ {WebAssemblyMCExpr::VK_FUNCINDEX, "FUNCINDEX"},
};
WebAssemblyMCAsmInfo::~WebAssemblyMCAsmInfo() = default; // anchor.
diff --git a/llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyMCExpr.cpp b/llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyMCExpr.cpp
new file mode 100644
index 0000000000000..acc621bbcfc33
--- /dev/null
+++ b/llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyMCExpr.cpp
@@ -0,0 +1,34 @@
+//===- WebAssembly 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
+//
+//===----------------------------------------------------------------------===//
+
+#include "WebAssemblyMCExpr.h"
+#include "llvm/MC/MCContext.h"
+#include "llvm/MC/MCStreamer.h"
+#include "llvm/MC/MCValue.h"
+
+using namespace llvm;
+
+const WebAssemblyMCExpr *
+WebAssemblyMCExpr::create(const MCExpr *Expr, Specifier S, MCContext &Ctx) {
+ return new (Ctx) WebAssemblyMCExpr(Expr, S);
+}
+
+void WebAssemblyMCExpr::printImpl(raw_ostream &OS, const MCAsmInfo *MAI) const {
+}
+
+bool WebAssemblyMCExpr::evaluateAsRelocatableImpl(
+ MCValue &Res, const MCAssembler *Asm) const {
+ if (!getSubExpr()->evaluateAsRelocatable(Res, Asm))
+ return false;
+ Res.setSpecifier(specifier);
+ return !Res.getSubSym();
+}
+
+void WebAssemblyMCExpr::visitUsedExpr(MCStreamer &S) const {
+ S.visitUsedExpr(*Expr);
+}
diff --git a/llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyMCExpr.h b/llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyMCExpr.h
new file mode 100644
index 0000000000000..42fbbbe4d0c42
--- /dev/null
+++ b/llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyMCExpr.h
@@ -0,0 +1,64 @@
+//===- WebAssembly 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
+//
+//===----------------------------------------------------------------------===//
+//
+// The MCTargetExpr subclass describes a relocatable expression with a
+// WebAssembly-specific relocation specifier.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIB_TARGET_WEBASSEMBLY_MCTARGETDESC_WEBASSEMBLYMCEXPR_H
+#define LLVM_LIB_TARGET_WEBASSEMBLY_MCTARGETDESC_WEBASSEMBLYMCEXPR_H
+
+#include "llvm/MC/MCExpr.h"
+
+namespace llvm {
+
+class WebAssemblyMCExpr : public MCTargetExpr {
+public:
+ enum Specifier {
+ VK_None,
+ VK_TYPEINDEX,
+ VK_TBREL,
+ VK_MBREL,
+ VK_TLSREL,
+ VK_GOT,
+ VK_GOT_TLS,
+ VK_FUNCINDEX,
+ };
+
+private:
+ const MCExpr *Expr;
+ const Specifier specifier;
+
+protected:
+ explicit WebAssemblyMCExpr(const MCExpr *Expr, Specifier S)
+ : Expr(Expr), specifier(S) {}
+
+public:
+ static const WebAssemblyMCExpr *create(const MCExpr *, Specifier,
+ MCContext &);
+
+ Specifier getSpecifier() const { return specifier; }
+ const MCExpr *getSubExpr() const { return Expr; }
+
+ void printImpl(raw_ostream &OS, const MCAsmInfo *MAI) const override;
+ bool evaluateAsRelocatableImpl(MCValue &Res,
+ const MCAssembler *Asm) const override;
+ void visitUsedExpr(MCStreamer &Streamer) const override;
+ MCFragment *findAssociatedFragment() const override {
+ return getSubExpr()->findAssociatedFragment();
+ }
+};
+
+static inline WebAssemblyMCExpr::Specifier
+getSpecifier(const MCSymbolRefExpr *SRE) {
+ return WebAssemblyMCExpr::Specifier(SRE->getKind());
+}
+} // namespace llvm
+
+#endif
diff --git a/llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyWasmObjectWriter.cpp b/llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyWasmObjectWriter.cpp
index 7a5ebe342fccf..51fa98dacec3f 100644
--- a/llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyWasmObjectWriter.cpp
+++ b/llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyWasmObjectWriter.cpp
@@ -13,6 +13,7 @@
//===----------------------------------------------------------------------===//
#include "MCTargetDesc/WebAssemblyFixupKinds.h"
+#include "MCTargetDesc/WebAssemblyMCExpr.h"
#include "MCTargetDesc/WebAssemblyMCTargetDesc.h"
#include "llvm/BinaryFormat/Wasm.h"
#include "llvm/MC/MCAsmBackend.h"
@@ -68,33 +69,33 @@ unsigned WebAssemblyWasmObjectWriter::getRelocType(
const MCSymbolRefExpr *RefA = Target.getSymA();
assert(RefA);
auto& SymA = cast<MCSymbolWasm>(RefA->getSymbol());
-
- MCSymbolRefExpr::VariantKind Modifier = Target.getAccessVariant();
-
- switch (Modifier) {
- case MCSymbolRefExpr::VK_GOT:
- case MCSymbolRefExpr::VK_WASM_GOT_TLS:
- return wasm::R_WASM_GLOBAL_INDEX_LEB;
- case MCSymbolRefExpr::VK_WASM_TBREL:
- assert(SymA.isFunction());
- return is64Bit() ? wasm::R_WASM_TABLE_INDEX_REL_SLEB64
- : wasm::R_WASM_TABLE_INDEX_REL_SLEB;
- case MCSymbolRefExpr::VK_WASM_TLSREL:
- return is64Bit() ? wasm::R_WASM_MEMORY_ADDR_TLS_SLEB64
- : wasm::R_WASM_MEMORY_ADDR_TLS_SLEB;
- case MCSymbolRefExpr::VK_WASM_MBREL:
- assert(SymA.isData());
- return is64Bit() ? wasm::R_WASM_MEMORY_ADDR_REL_SLEB64
- : wasm::R_WASM_MEMORY_ADDR_REL_SLEB;
- case MCSymbolRefExpr::VK_WASM_TYPEINDEX:
- return wasm::R_WASM_TYPE_INDEX_LEB;
- case MCSymbolRefExpr::VK_None:
- break;
- case MCSymbolRefExpr::VK_WASM_FUNCINDEX:
- return wasm::R_WASM_FUNCTION_INDEX_I32;
- default:
- report_fatal_error("unknown VariantKind");
- break;
+ auto Spec = WebAssemblyMCExpr::Specifier(Target.getAccessVariant());
+ switch (Spec) {
+ case WebAssemblyMCExpr::VK_GOT:
+ SymA.setUsedInGOT();
+ return wasm::R_WASM_GLOBAL_INDEX_LEB;
+ case WebAssemblyMCExpr::VK_GOT_TLS:
+ SymA.setUsedInGOT();
+ SymA.setTLS();
+ return wasm::R_WASM_GLOBAL_INDEX_LEB;
+ case WebAssemblyMCExpr::VK_TBREL:
+ assert(SymA.isFunction());
+ return is64Bit() ? wasm::R_WASM_TABLE_INDEX_REL_SLEB64
+ : wasm::R_WASM_TABLE_INDEX_REL_SLEB;
+ case WebAssemblyMCExpr::VK_TLSREL:
+ SymA.setTLS();
+ return is64Bit() ? wasm::R_WASM_MEMORY_ADDR_TLS_SLEB64
+ : wasm::R_WASM_MEMORY_ADDR_TLS_SLEB;
+ case WebAssemblyMCExpr::VK_MBREL:
+ assert(SymA.isData());
+ return is64Bit() ? wasm::R_WASM_MEMORY_ADDR_REL_SLEB64
+ : wasm::R_WASM_MEMORY_ADDR_REL_SLEB;
+ case WebAssemblyMCExpr::VK_TYPEINDEX:
+ return wasm::R_WASM_TYPE_INDEX_LEB;
+ case WebAssemblyMCExpr::VK_None:
+ break;
+ case WebAssemblyMCExpr::VK_FUNCINDEX:
+ return wasm::R_WASM_FUNCTION_INDEX_I32;
}
switch (unsigned(Fixup.getKind())) {
diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyAsmPrinter.cpp b/llvm/lib/Target/WebAssembly/WebAssemblyAsmPrinter.cpp
index ded7052295ad4..c02bd623db10f 100644
--- a/llvm/lib/Target/WebAssembly/WebAssemblyAsmPrinter.cpp
+++ b/llvm/lib/Target/WebAssembly/WebAssemblyAsmPrinter.cpp
@@ -14,6 +14,7 @@
//===----------------------------------------------------------------------===//
#include "WebAssemblyAsmPrinter.h"
+#include "MCTargetDesc/WebAssemblyMCExpr.h"
#include "MCTargetDesc/WebAssemblyMCTargetDesc.h"
#include "MCTargetDesc/WebAssemblyTargetStreamer.h"
#include "TargetInfo/WebAssemblyTargetInfo.h"
@@ -590,7 +591,7 @@ void WebAssemblyAsmPrinter::EmitFunctionAttributes(Module &M) {
for (auto &Sym : Symbols) {
OutStreamer->emitValue(
- MCSymbolRefExpr::create(Sym, MCSymbolRefExpr::VK_WASM_FUNCINDEX,
+ MCSymbolRefExpr::create(Sym, WebAssemblyMCExpr::VK_FUNCINDEX,
OutContext),
4);
}
diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyMCInstLower.cpp b/llvm/lib/Target/WebAssembly/WebAssemblyMCInstLower.cpp
index d78e755643fb4..7814339ef0bba 100644
--- a/llvm/lib/Target/WebAssembly/WebAssemblyMCInstLower.cpp
+++ b/llvm/lib/Target/WebAssembly/WebAssemblyMCInstLower.cpp
@@ -13,6 +13,7 @@
//===----------------------------------------------------------------------===//
#include "WebAssemblyMCInstLower.h"
+#include "MCTargetDesc/WebAssemblyMCExpr.h"
#include "MCTargetDesc/WebAssemblyMCTargetDesc.h"
#include "TargetInfo/WebAssemblyTargetInfo.h"
#include "Utils/WebAssemblyTypeUtilities.h"
@@ -91,32 +92,32 @@ MCSymbol *WebAssemblyMCInstLower::GetExternalSymbolSymbol(
MCOperand WebAssemblyMCInstLower::lowerSymbolOperand(const MachineOperand &MO,
MCSymbol *Sym) const {
- MCSymbolRefExpr::VariantKind Kind = MCSymbolRefExpr::VK_None;
+ auto Spec = WebAssemblyMCExpr::VK_None;
unsigned TargetFlags = MO.getTargetFlags();
switch (TargetFlags) {
case WebAssemblyII::MO_NO_FLAG:
break;
case WebAssemblyII::MO_GOT_TLS:
- Kind = MCSymbolRefExpr::VK_WASM_GOT_TLS;
+ Spec = WebAssemblyMCExpr::VK_GOT_TLS;
break;
case WebAssemblyII::MO_GOT:
- Kind = MCSymbolRefExpr::VK_GOT;
+ Spec = WebAssemblyMCExpr::VK_GOT;
break;
case WebAssemblyII::MO_MEMORY_BASE_REL:
- Kind = MCSymbolRefExpr::VK_WASM_MBREL;
+ Spec = WebAssemblyMCExpr::VK_MBREL;
break;
case WebAssemblyII::MO_TLS_BASE_REL:
- Kind = MCSymbolRefExpr::VK_WASM_TLSREL;
+ Spec = WebAssemblyMCExpr::VK_TLSREL;
break;
case WebAssemblyII::MO_TABLE_BASE_REL:
- Kind = MCSymbolRefExpr::VK_WASM_TBREL;
+ Spec = WebAssemblyMCExpr::VK_TBREL;
break;
default:
llvm_unreachable("Unknown target flag on GV operand");
}
- const MCExpr *Expr = MCSymbolRefExpr::create(Sym, Kind, Ctx);
+ const MCExpr *Expr = MCSymbolRefExpr::create(Sym, Spec, Ctx);
if (MO.getOffset() != 0) {
const auto *WasmSym = cast<MCSymbolWasm>(Sym);
@@ -149,7 +150,7 @@ MCOperand WebAssemblyMCInstLower::lowerTypeIndexOperand(
WasmSym->setSignature(Signature);
WasmSym->setType(wasm::WASM_SYMBOL_TYPE_FUNCTION);
const MCExpr *Expr =
- MCSymbolRefExpr::create(WasmSym, MCSymbolRefExpr::VK_WASM_TYPEINDEX, Ctx);
+ MCSymbolRefExpr::create(WasmSym, WebAssemblyMCExpr::VK_TYPEINDEX, Ctx);
return MCOperand::createExpr(Expr);
}
>From 178dc3edaf7921d269eca2750d2f109c63ed589b Mon Sep 17 00:00:00 2001
From: Fangrui Song <i at maskray.me>
Date: Wed, 26 Mar 2025 09:32:26 -0700
Subject: [PATCH 2/2] llvm/include/llvm/MC/MCExpr.h
Created using spr 1.3.5-bogner
---
llvm/include/llvm/MC/MCExpr.h | 7 -------
1 file changed, 7 deletions(-)
diff --git a/llvm/include/llvm/MC/MCExpr.h b/llvm/include/llvm/MC/MCExpr.h
index 5bfbd2d9f8e71..b11bfdb4f32c9 100644
--- a/llvm/include/llvm/MC/MCExpr.h
+++ b/llvm/include/llvm/MC/MCExpr.h
@@ -211,13 +211,6 @@ class MCSymbolRefExpr : public MCExpr {
VK_COFF_IMGREL32, // symbol at imgrel (image-relative)
- VK_WASM_TYPEINDEX, // Reference to a symbol's type (signature)
- VK_WASM_TLSREL, // Memory address relative to __tls_base
- VK_WASM_MBREL, // Memory address relative to __memory_base
- VK_WASM_TBREL, // Table index relative to __table_base
- VK_WASM_GOT_TLS, // Wasm global index of TLS symbol.
- VK_WASM_FUNCINDEX, // Wasm function index.
-
VK_AMDGPU_GOTPCREL32_LO, // symbol at gotpcrel32@lo
VK_AMDGPU_GOTPCREL32_HI, // symbol at gotpcrel32@hi
VK_AMDGPU_REL32_LO, // symbol at rel32@lo
More information about the llvm-commits
mailing list