Skip to content

Commit 52e240a

Browse files
aheejinaheejin
committed
[WebAssembly] Remove exnref and br_on_exn
This removes `exnref` type and `br_on_exn` instruction. This is effectively NFC because most uses of these were already removed in the previous CLs. Reviewed By: dschuff, tlively Differential Revision: https://reviews.llvm.org/D94041
1 parent 9e4eade commit 52e240a

27 files changed

+50
-187
lines changed

‎lld/wasm/WriterUtils.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ std::string toString(ValType type) {
3030
return "f64";
3131
case ValType::V128:
3232
return "v128";
33-
case ValType::EXNREF:
34-
return "exnref";
3533
case ValType::FUNCREF:
3634
return "funcref";
3735
case ValType::EXTERNREF:

‎llvm/include/llvm/BinaryFormat/Wasm.h

-2
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,6 @@ enum : unsigned {
244244
WASM_TYPE_F64 = 0x7C,
245245
WASM_TYPE_V128 = 0x7B,
246246
WASM_TYPE_FUNCREF = 0x70,
247-
WASM_TYPE_EXNREF = 0x68,
248247
WASM_TYPE_EXTERNREF = 0x6F,
249248
WASM_TYPE_FUNC = 0x60,
250249
WASM_TYPE_NORESULT = 0x40, // for blocks with no result values
@@ -379,7 +378,6 @@ enum class ValType {
379378
F32 = WASM_TYPE_F32,
380379
F64 = WASM_TYPE_F64,
381380
V128 = WASM_TYPE_V128,
382-
EXNREF = WASM_TYPE_EXNREF,
383381
FUNCREF = WASM_TYPE_FUNCREF,
384382
EXTERNREF = WASM_TYPE_EXTERNREF,
385383
};

‎llvm/include/llvm/CodeGen/ValueTypes.td

+3-4
Original file line numberDiff line numberDiff line change
@@ -193,10 +193,9 @@ def x86mmx : ValueType<64 , 157>; // X86 MMX value
193193
def FlagVT : ValueType<0 , 158>; // Pre-RA sched glue
194194
def isVoid : ValueType<0 , 159>; // Produces no value
195195
def untyped: ValueType<8 , 160>; // Produces an untyped value
196-
def exnref : ValueType<0 , 161>; // WebAssembly's exnref type
197-
def funcref : ValueType<0 , 162>; // WebAssembly's funcref type
198-
def externref : ValueType<0 , 163>; // WebAssembly's externref type
199-
def x86amx : ValueType<8192, 164>; // X86 AMX value
196+
def funcref : ValueType<0 , 161>; // WebAssembly's funcref type
197+
def externref : ValueType<0 , 162>; // WebAssembly's externref type
198+
def x86amx : ValueType<8192, 163>; // X86 AMX value
200199

201200

202201
def token : ValueType<0 , 248>; // TokenTy

‎llvm/include/llvm/Support/MachineValueType.h

+4-6
Original file line numberDiff line numberDiff line change
@@ -244,13 +244,12 @@ namespace llvm {
244244
// unspecified type. The register class
245245
// will be determined by the opcode.
246246

247-
exnref = 161, // WebAssembly's exnref type
248-
funcref = 162, // WebAssembly's funcref type
249-
externref = 163, // WebAssembly's externref type
250-
x86amx = 164, // This is an X86 AMX value
247+
funcref = 161, // WebAssembly's funcref type
248+
externref = 162, // WebAssembly's externref type
249+
x86amx = 163, // This is an X86 AMX value
251250

252251
FIRST_VALUETYPE = 1, // This is always the beginning of the list.
253-
LAST_VALUETYPE = 165, // This always remains at the end of the list.
252+
LAST_VALUETYPE = 164, // This always remains at the end of the list.
254253

255254
// This is the current maximum for LAST_VALUETYPE.
256255
// MVT::MAX_ALLOWED_VALUETYPE is used for asserts and to size bit vectors
@@ -977,7 +976,6 @@ namespace llvm {
977976
case v1024f32: return TypeSize::Fixed(32768);
978977
case v2048i32:
979978
case v2048f32: return TypeSize::Fixed(65536);
980-
case exnref:
981979
case funcref:
982980
case externref: return TypeSize::Fixed(0); // opaque type
983981
}

‎llvm/lib/CodeGen/AsmPrinter/WasmException.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
using namespace llvm;
1919

2020
void WasmException::endModule() {
21-
// This is the symbol used in 'throw' and 'br_on_exn' instruction to denote
22-
// this is a C++ exception. This symbol has to be emitted somewhere once in
23-
// the module. Check if the symbol has already been created, i.e., we have at
24-
// least one 'throw' or 'br_on_exn' instruction in the module, and emit the
25-
// symbol only if so.
21+
// This is the symbol used in 'throw' and 'catch' instruction to denote this
22+
// is a C++ exception. This symbol has to be emitted somewhere once in the
23+
// module. Check if the symbol has already been created, i.e., we have at
24+
// least one 'throw' or 'catch' instruction in the module, and emit the symbol
25+
// only if so.
2626
SmallString<60> NameStr;
2727
Mangler::getNameWithPrefix(NameStr, "__cpp_exception", Asm->getDataLayout());
2828
if (Asm->OutContext.lookupSymbol(NameStr)) {

‎llvm/lib/CodeGen/ValueTypes.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ std::string EVT::getEVTString() const {
167167
case MVT::x86amx: return "x86amx";
168168
case MVT::Metadata: return "Metadata";
169169
case MVT::Untyped: return "Untyped";
170-
case MVT::exnref: return "exnref";
171170
case MVT::funcref: return "funcref";
172171
case MVT::externref: return "externref";
173172
}

‎llvm/lib/ObjectYAML/WasmYAML.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,6 @@ void ScalarEnumerationTraits<WasmYAML::ValueType>::enumeration(
572572
ECase(F64);
573573
ECase(V128);
574574
ECase(FUNCREF);
575-
ECase(EXNREF);
576575
ECase(EXTERNREF);
577576
ECase(FUNC);
578577
#undef ECase

‎llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmParser.cpp

-3
Original file line numberDiff line numberDiff line change
@@ -340,8 +340,6 @@ class WebAssemblyAsmParser final : public MCTargetAsmParser {
340340
Type == "i32x4" || Type == "i64x2" || Type == "f32x4" ||
341341
Type == "f64x2")
342342
return wasm::ValType::V128;
343-
if (Type == "exnref")
344-
return wasm::ValType::EXNREF;
345343
if (Type == "funcref")
346344
return wasm::ValType::FUNCREF;
347345
if (Type == "externref")
@@ -359,7 +357,6 @@ class WebAssemblyAsmParser final : public MCTargetAsmParser {
359357
.Case("v128", WebAssembly::BlockType::V128)
360358
.Case("funcref", WebAssembly::BlockType::Funcref)
361359
.Case("externref", WebAssembly::BlockType::Externref)
362-
.Case("exnref", WebAssembly::BlockType::Exnref)
363360
.Case("void", WebAssembly::BlockType::Void)
364361
.Default(WebAssembly::BlockType::Invalid);
365362
}

‎llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyInstPrinter.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -345,8 +345,6 @@ const char *WebAssembly::anyTypeToString(unsigned Ty) {
345345
return "externref";
346346
case wasm::WASM_TYPE_FUNC:
347347
return "func";
348-
case wasm::WASM_TYPE_EXNREF:
349-
return "exnref";
350348
case wasm::WASM_TYPE_NORESULT:
351349
return "void";
352350
default:

‎llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyMCTargetDesc.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,6 @@ wasm::ValType WebAssembly::toValType(const MVT &Ty) {
151151
return wasm::ValType::FUNCREF;
152152
case MVT::externref:
153153
return wasm::ValType::EXTERNREF;
154-
case MVT::exnref:
155-
return wasm::ValType::EXNREF;
156154
default:
157155
llvm_unreachable("unexpected type");
158156
}

‎llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyMCTargetDesc.h

-7
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ enum class BlockType : unsigned {
140140
V128 = unsigned(wasm::ValType::V128),
141141
Externref = unsigned(wasm::ValType::EXTERNREF),
142142
Funcref = unsigned(wasm::ValType::FUNCREF),
143-
Exnref = unsigned(wasm::ValType::EXNREF),
144143
// Multivalue blocks (and other non-void blocks) are only emitted when the
145144
// blocks will never be exited and are at the ends of functions (see
146145
// WebAssemblyCFGStackify::fixEndsAtEndOfFunction). They also are never made
@@ -328,8 +327,6 @@ inline bool isArgument(unsigned Opc) {
328327
case WebAssembly::ARGUMENT_funcref_S:
329328
case WebAssembly::ARGUMENT_externref:
330329
case WebAssembly::ARGUMENT_externref_S:
331-
case WebAssembly::ARGUMENT_exnref:
332-
case WebAssembly::ARGUMENT_exnref_S:
333330
return true;
334331
default:
335332
return false;
@@ -352,8 +349,6 @@ inline bool isCopy(unsigned Opc) {
352349
case WebAssembly::COPY_FUNCREF_S:
353350
case WebAssembly::COPY_EXTERNREF:
354351
case WebAssembly::COPY_EXTERNREF_S:
355-
case WebAssembly::COPY_EXNREF:
356-
case WebAssembly::COPY_EXNREF_S:
357352
return true;
358353
default:
359354
return false;
@@ -376,8 +371,6 @@ inline bool isTee(unsigned Opc) {
376371
case WebAssembly::TEE_FUNCREF_S:
377372
case WebAssembly::TEE_EXTERNREF:
378373
case WebAssembly::TEE_EXTERNREF_S:
379-
case WebAssembly::TEE_EXNREF:
380-
case WebAssembly::TEE_EXNREF_S:
381374
return true;
382375
default:
383376
return false;

‎llvm/lib/Target/WebAssembly/WebAssemblyAsmPrinter.cpp

-10
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,6 @@ static char getInvokeSig(wasm::ValType VT) {
119119
return 'd';
120120
case wasm::ValType::V128:
121121
return 'V';
122-
case wasm::ValType::EXNREF:
123-
return 'E';
124122
case wasm::ValType::FUNCREF:
125123
return 'F';
126124
case wasm::ValType::EXTERNREF:
@@ -463,14 +461,6 @@ void WebAssemblyAsmPrinter::emitInstruction(const MachineInstr *MI) {
463461
// This is a compiler barrier that prevents instruction reordering during
464462
// backend compilation, and should not be emitted.
465463
break;
466-
case WebAssembly::EXTRACT_EXCEPTION_I32:
467-
case WebAssembly::EXTRACT_EXCEPTION_I32_S:
468-
// These are pseudo instructions that simulates popping values from stack.
469-
// We print these only when we have -wasm-keep-registers on for assembly
470-
// readability.
471-
if (!WasmKeepRegisters)
472-
break;
473-
LLVM_FALLTHROUGH;
474464
default: {
475465
WebAssemblyMCInstLower MCInstLowering(OutContext, *this);
476466
MCInst TmpInst;

‎llvm/lib/Target/WebAssembly/WebAssemblyCFGStackify.cpp

+1-26
Original file line numberDiff line numberDiff line change
@@ -242,20 +242,12 @@ void WebAssemblyCFGStackify::placeBlockMarker(MachineBasicBlock &MBB) {
242242
// which reduces overall stack height.
243243
MachineBasicBlock *Header = nullptr;
244244
bool IsBranchedTo = false;
245-
bool IsBrOnExn = false;
246-
MachineInstr *BrOnExn = nullptr;
247245
int MBBNumber = MBB.getNumber();
248246
for (MachineBasicBlock *Pred : MBB.predecessors()) {
249247
if (Pred->getNumber() < MBBNumber) {
250248
Header = Header ? MDT.findNearestCommonDominator(Header, Pred) : Pred;
251-
if (explicitlyBranchesTo(Pred, &MBB)) {
249+
if (explicitlyBranchesTo(Pred, &MBB))
252250
IsBranchedTo = true;
253-
if (Pred->getFirstTerminator()->getOpcode() == WebAssembly::BR_ON_EXN) {
254-
IsBrOnExn = true;
255-
assert(!BrOnExn && "There should be only one br_on_exn per block");
256-
BrOnExn = &*Pred->getFirstTerminator();
257-
}
258-
}
259251
}
260252
}
261253
if (!Header)
@@ -340,22 +332,7 @@ void WebAssemblyCFGStackify::placeBlockMarker(MachineBasicBlock &MBB) {
340332
}
341333

342334
// Add the BLOCK.
343-
344-
// 'br_on_exn' extracts exnref object and pushes variable number of values
345-
// depending on its tag. For C++ exception, its a single i32 value, and the
346-
// generated code will be in the form of:
347-
// block i32
348-
// br_on_exn 0, $__cpp_exception
349-
// rethrow
350-
// end_block
351335
WebAssembly::BlockType ReturnType = WebAssembly::BlockType::Void;
352-
if (IsBrOnExn) {
353-
const char *TagName = BrOnExn->getOperand(1).getSymbolName();
354-
if (std::strcmp(TagName, "__cpp_exception") != 0)
355-
llvm_unreachable("Only C++ exception is supported");
356-
ReturnType = WebAssembly::BlockType::I32;
357-
}
358-
359336
auto InsertPos = getLatestInsertPos(Header, BeforeSet, AfterSet);
360337
MachineInstr *Begin =
361338
BuildMI(*Header, InsertPos, Header->findDebugLoc(InsertPos),
@@ -776,8 +753,6 @@ static unsigned getCopyOpcode(const TargetRegisterClass *RC) {
776753
return WebAssembly::COPY_FUNCREF;
777754
if (RC == &WebAssembly::EXTERNREFRegClass)
778755
return WebAssembly::COPY_EXTERNREF;
779-
if (RC == &WebAssembly::EXNREFRegClass)
780-
return WebAssembly::COPY_EXNREF;
781756
llvm_unreachable("Unexpected register class");
782757
}
783758

‎llvm/lib/Target/WebAssembly/WebAssemblyExplicitLocals.cpp

-10
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,6 @@ static unsigned getDropOpcode(const TargetRegisterClass *RC) {
100100
return WebAssembly::DROP_FUNCREF;
101101
if (RC == &WebAssembly::EXTERNREFRegClass)
102102
return WebAssembly::DROP_EXTERNREF;
103-
if (RC == &WebAssembly::EXNREFRegClass)
104-
return WebAssembly::DROP_EXNREF;
105103
llvm_unreachable("Unexpected register class");
106104
}
107105

@@ -117,8 +115,6 @@ static unsigned getLocalGetOpcode(const TargetRegisterClass *RC) {
117115
return WebAssembly::LOCAL_GET_F64;
118116
if (RC == &WebAssembly::V128RegClass)
119117
return WebAssembly::LOCAL_GET_V128;
120-
if (RC == &WebAssembly::EXNREFRegClass)
121-
return WebAssembly::LOCAL_GET_EXNREF;
122118
if (RC == &WebAssembly::FUNCREFRegClass)
123119
return WebAssembly::LOCAL_GET_FUNCREF;
124120
if (RC == &WebAssembly::EXTERNREFRegClass)
@@ -138,8 +134,6 @@ static unsigned getLocalSetOpcode(const TargetRegisterClass *RC) {
138134
return WebAssembly::LOCAL_SET_F64;
139135
if (RC == &WebAssembly::V128RegClass)
140136
return WebAssembly::LOCAL_SET_V128;
141-
if (RC == &WebAssembly::EXNREFRegClass)
142-
return WebAssembly::LOCAL_SET_EXNREF;
143137
if (RC == &WebAssembly::FUNCREFRegClass)
144138
return WebAssembly::LOCAL_SET_FUNCREF;
145139
if (RC == &WebAssembly::EXTERNREFRegClass)
@@ -159,8 +153,6 @@ static unsigned getLocalTeeOpcode(const TargetRegisterClass *RC) {
159153
return WebAssembly::LOCAL_TEE_F64;
160154
if (RC == &WebAssembly::V128RegClass)
161155
return WebAssembly::LOCAL_TEE_V128;
162-
if (RC == &WebAssembly::EXNREFRegClass)
163-
return WebAssembly::LOCAL_TEE_EXNREF;
164156
if (RC == &WebAssembly::FUNCREFRegClass)
165157
return WebAssembly::LOCAL_TEE_FUNCREF;
166158
if (RC == &WebAssembly::EXTERNREFRegClass)
@@ -180,8 +172,6 @@ static MVT typeForRegClass(const TargetRegisterClass *RC) {
180172
return MVT::f64;
181173
if (RC == &WebAssembly::V128RegClass)
182174
return MVT::v16i8;
183-
if (RC == &WebAssembly::EXNREFRegClass)
184-
return MVT::exnref;
185175
if (RC == &WebAssembly::FUNCREFRegClass)
186176
return MVT::funcref;
187177
if (RC == &WebAssembly::EXTERNREFRegClass)

‎llvm/lib/Target/WebAssembly/WebAssemblyFastISel.cpp

-13
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ class WebAssemblyFastISel final : public FastISel {
130130
case MVT::i64:
131131
case MVT::f32:
132132
case MVT::f64:
133-
case MVT::exnref:
134133
case MVT::funcref:
135134
case MVT::externref:
136135
return VT;
@@ -716,10 +715,6 @@ bool WebAssemblyFastISel::fastLowerArguments() {
716715
Opc = WebAssembly::ARGUMENT_externref;
717716
RC = &WebAssembly::EXTERNREFRegClass;
718717
break;
719-
case MVT::exnref:
720-
Opc = WebAssembly::ARGUMENT_exnref;
721-
RC = &WebAssembly::EXNREFRegClass;
722-
break;
723718
default:
724719
return false;
725720
}
@@ -818,9 +813,6 @@ bool WebAssemblyFastISel::selectCall(const Instruction *I) {
818813
case MVT::v2f64:
819814
ResultReg = createResultReg(&WebAssembly::V128RegClass);
820815
break;
821-
case MVT::exnref:
822-
ResultReg = createResultReg(&WebAssembly::EXNREFRegClass);
823-
break;
824816
case MVT::funcref:
825817
ResultReg = createResultReg(&WebAssembly::FUNCREFRegClass);
826818
break;
@@ -943,10 +935,6 @@ bool WebAssemblyFastISel::selectSelect(const Instruction *I) {
943935
Opc = WebAssembly::SELECT_F64;
944936
RC = &WebAssembly::F64RegClass;
945937
break;
946-
case MVT::exnref:
947-
Opc = WebAssembly::SELECT_EXNREF;
948-
RC = &WebAssembly::EXNREFRegClass;
949-
break;
950938
case MVT::funcref:
951939
Opc = WebAssembly::SELECT_FUNCREF;
952940
RC = &WebAssembly::FUNCREFRegClass;
@@ -1358,7 +1346,6 @@ bool WebAssemblyFastISel::selectRet(const Instruction *I) {
13581346
case MVT::v2f64:
13591347
case MVT::funcref:
13601348
case MVT::externref:
1361-
case MVT::exnref:
13621349
break;
13631350
default:
13641351
return false;

‎llvm/lib/Target/WebAssembly/WebAssemblyInstrControl.td

+1-16
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ defm END_TRY : NRI<(outs), (ins), [], "end_try", 0x0b>;
145145

146146
// Catching an exception: catch / catch_all
147147
let hasCtrlDep = 1, hasSideEffects = 1 in {
148-
// TODO Currently 'catch' can only extract an i32, which is sufficient for C++
148+
// Currently 'catch' can only extract an i32, which is sufficient for C++
149149
// support, but according to the spec 'catch' can extract any number of values
150150
// based on the event type.
151151
defm CATCH : I<(outs I32:$dst), (ins event_op:$tag),
@@ -156,21 +156,6 @@ defm CATCH : I<(outs I32:$dst), (ins event_op:$tag),
156156
defm CATCH_ALL : NRI<(outs), (ins), [], "catch_all", 0x05>;
157157
}
158158

159-
// Querying / extracing exception: br_on_exn
160-
// br_on_exn queries an exnref to see if it matches the corresponding exception
161-
// tag index. If true it branches to the given label and pushes the
162-
// corresponding argument values of the exception onto the stack.
163-
let isBranch = 1, isTerminator = 1, hasCtrlDep = 1 in
164-
defm BR_ON_EXN : I<(outs), (ins bb_op:$dst, event_op:$tag, EXNREF:$exn),
165-
(outs), (ins bb_op:$dst, event_op:$tag), [],
166-
"br_on_exn \t$dst, $tag, $exn", "br_on_exn \t$dst, $tag",
167-
0x0a>;
168-
// This is a pseudo instruction that simulates popping a value from stack, which
169-
// has been pushed by br_on_exn
170-
let isCodeGenOnly = 1, hasSideEffects = 1 in
171-
defm EXTRACT_EXCEPTION_I32 : NRI<(outs I32:$dst), (ins), [],
172-
"extract_exception\t$dst">;
173-
174159
// Pseudo instructions: cleanupret / catchret
175160
let isTerminator = 1, hasSideEffects = 1, isBarrier = 1, hasCtrlDep = 1,
176161
isPseudo = 1, isEHScopeReturn = 1 in {

0 commit comments

Comments
 (0)