summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/binaryen-c.cpp18
-rw-r--r--src/binaryen-c.h8
-rw-r--r--src/gen-s-parser.inc4
-rw-r--r--src/ir/ReFinalize.cpp2
-rw-r--r--src/ir/cost.h2
-rw-r--r--src/ir/effects.h2
-rw-r--r--src/ir/possible-contents.cpp2
-rw-r--r--src/ir/properties.cpp2
-rw-r--r--src/ir/properties.h2
-rw-r--r--src/js/binaryen.js-post.js14
-rw-r--r--src/passes/Print.cpp2
-rw-r--r--src/tools/fuzzing/fuzzing.cpp2
-rw-r--r--src/wasm-binary.h6
-rw-r--r--src/wasm-builder.h8
-rw-r--r--src/wasm-delegations-fields.def8
-rw-r--r--src/wasm-delegations.def2
-rw-r--r--src/wasm-interpreter.h4
-rw-r--r--src/wasm-ir-builder.h2
-rw-r--r--src/wasm-s-parser.h2
-rw-r--r--src/wasm.h8
-rw-r--r--src/wasm/wasm-binary.cpp8
-rw-r--r--src/wasm/wasm-ir-builder.cpp8
-rw-r--r--src/wasm/wasm-s-parser.cpp4
-rw-r--r--src/wasm/wasm-stack.cpp4
-rw-r--r--src/wasm/wasm-validator.cpp4
-rw-r--r--src/wasm/wasm.cpp2
-rw-r--r--src/wasm/wat-parser.cpp12
-rw-r--r--src/wasm2js.h2
28 files changed, 72 insertions, 72 deletions
diff --git a/src/binaryen-c.cpp b/src/binaryen-c.cpp
index fd00c25c0..598156782 100644
--- a/src/binaryen-c.cpp
+++ b/src/binaryen-c.cpp
@@ -1732,10 +1732,10 @@ BinaryenExpressionRef BinaryenRethrow(BinaryenModuleRef module,
Builder(*(Module*)module).makeRethrow(target));
}
-BinaryenExpressionRef BinaryenI31New(BinaryenModuleRef module,
+BinaryenExpressionRef BinaryenRefI31(BinaryenModuleRef module,
BinaryenExpressionRef value) {
return static_cast<Expression*>(
- Builder(*(Module*)module).makeI31New((Expression*)value));
+ Builder(*(Module*)module).makeRefI31((Expression*)value));
}
BinaryenExpressionRef BinaryenI31Get(BinaryenModuleRef module,
@@ -3952,18 +3952,18 @@ void BinaryenTupleExtractSetIndex(BinaryenExpressionRef expr,
assert(expression->is<TupleExtract>());
static_cast<TupleExtract*>(expression)->index = index;
}
-// I31New
-BinaryenExpressionRef BinaryenI31NewGetValue(BinaryenExpressionRef expr) {
+// RefI31
+BinaryenExpressionRef BinaryenRefI31GetValue(BinaryenExpressionRef expr) {
auto* expression = (Expression*)expr;
- assert(expression->is<I31New>());
- return static_cast<I31New*>(expression)->value;
+ assert(expression->is<RefI31>());
+ return static_cast<RefI31*>(expression)->value;
}
-void BinaryenI31NewSetValue(BinaryenExpressionRef expr,
+void BinaryenRefI31SetValue(BinaryenExpressionRef expr,
BinaryenExpressionRef valueExpr) {
auto* expression = (Expression*)expr;
- assert(expression->is<I31New>());
+ assert(expression->is<RefI31>());
assert(valueExpr);
- static_cast<I31New*>(expression)->value = (Expression*)valueExpr;
+ static_cast<RefI31*>(expression)->value = (Expression*)valueExpr;
}
// I31Get
BinaryenExpressionRef BinaryenI31GetGetI31(BinaryenExpressionRef expr) {
diff --git a/src/binaryen-c.h b/src/binaryen-c.h
index f4f4f2d74..4321ec452 100644
--- a/src/binaryen-c.h
+++ b/src/binaryen-c.h
@@ -1028,7 +1028,7 @@ BINARYEN_API BinaryenExpressionRef BinaryenTupleExtract(
BinaryenModuleRef module, BinaryenExpressionRef tuple, BinaryenIndex index);
BINARYEN_API BinaryenExpressionRef BinaryenPop(BinaryenModuleRef module,
BinaryenType type);
-BINARYEN_API BinaryenExpressionRef BinaryenI31New(BinaryenModuleRef module,
+BINARYEN_API BinaryenExpressionRef BinaryenRefI31(BinaryenModuleRef module,
BinaryenExpressionRef value);
BINARYEN_API BinaryenExpressionRef BinaryenI31Get(BinaryenModuleRef module,
BinaryenExpressionRef i31,
@@ -2306,13 +2306,13 @@ BinaryenTupleExtractGetIndex(BinaryenExpressionRef expr);
BINARYEN_API void BinaryenTupleExtractSetIndex(BinaryenExpressionRef expr,
BinaryenIndex index);
-// I31New
+// RefI31
// Gets the value expression of an `i31.new` expression.
BINARYEN_API BinaryenExpressionRef
-BinaryenI31NewGetValue(BinaryenExpressionRef expr);
+BinaryenRefI31GetValue(BinaryenExpressionRef expr);
// Sets the value expression of an `i31.new` expression.
-BINARYEN_API void BinaryenI31NewSetValue(BinaryenExpressionRef expr,
+BINARYEN_API void BinaryenRefI31SetValue(BinaryenExpressionRef expr,
BinaryenExpressionRef valueExpr);
// I31Get
diff --git a/src/gen-s-parser.inc b/src/gen-s-parser.inc
index 57fd2ffed..5b812c6d1 100644
--- a/src/gen-s-parser.inc
+++ b/src/gen-s-parser.inc
@@ -1203,7 +1203,7 @@ switch (buf[0]) {
}
}
case 'n':
- if (op == "i31.new"sv) { return makeI31New(s); }
+ if (op == "i31.new"sv) { return makeRefI31(s); }
goto parse_error;
default: goto parse_error;
}
@@ -5593,7 +5593,7 @@ switch (buf[0]) {
}
case 'n':
if (op == "i31.new"sv) {
- auto ret = makeI31New(ctx, pos);
+ auto ret = makeRefI31(ctx, pos);
CHECK_ERR(ret);
return *ret;
}
diff --git a/src/ir/ReFinalize.cpp b/src/ir/ReFinalize.cpp
index bcbac85cc..b0dea7627 100644
--- a/src/ir/ReFinalize.cpp
+++ b/src/ir/ReFinalize.cpp
@@ -132,7 +132,7 @@ void ReFinalize::visitUnreachable(Unreachable* curr) { curr->finalize(); }
void ReFinalize::visitPop(Pop* curr) { curr->finalize(); }
void ReFinalize::visitTupleMake(TupleMake* curr) { curr->finalize(); }
void ReFinalize::visitTupleExtract(TupleExtract* curr) { curr->finalize(); }
-void ReFinalize::visitI31New(I31New* curr) { curr->finalize(); }
+void ReFinalize::visitRefI31(RefI31* curr) { curr->finalize(); }
void ReFinalize::visitI31Get(I31Get* curr) { curr->finalize(); }
void ReFinalize::visitCallRef(CallRef* curr) { curr->finalize(); }
void ReFinalize::visitRefTest(RefTest* curr) { curr->finalize(); }
diff --git a/src/ir/cost.h b/src/ir/cost.h
index c34ca1fb6..e7287de77 100644
--- a/src/ir/cost.h
+++ b/src/ir/cost.h
@@ -598,7 +598,7 @@ struct CostAnalyzer : public OverriddenVisitor<CostAnalyzer, CostType> {
CostType visitNop(Nop* curr) { return 0; }
CostType visitUnreachable(Unreachable* curr) { return 0; }
CostType visitDataDrop(DataDrop* curr) { return 5; }
- CostType visitI31New(I31New* curr) { return 3 + visit(curr->value); }
+ CostType visitRefI31(RefI31* curr) { return 3 + visit(curr->value); }
CostType visitI31Get(I31Get* curr) { return 2 + visit(curr->i31); }
CostType visitRefTest(RefTest* curr) {
// Casts have a very high cost because in the VM they end up implemented as
diff --git a/src/ir/effects.h b/src/ir/effects.h
index 5670e3ef6..171a17803 100644
--- a/src/ir/effects.h
+++ b/src/ir/effects.h
@@ -718,7 +718,7 @@ private:
}
void visitTupleMake(TupleMake* curr) {}
void visitTupleExtract(TupleExtract* curr) {}
- void visitI31New(I31New* curr) {}
+ void visitRefI31(RefI31* curr) {}
void visitI31Get(I31Get* curr) {
// traps when the ref is null
if (curr->i31->type.isNullable()) {
diff --git a/src/ir/possible-contents.cpp b/src/ir/possible-contents.cpp
index b44046b39..b23d8220a 100644
--- a/src/ir/possible-contents.cpp
+++ b/src/ir/possible-contents.cpp
@@ -678,7 +678,7 @@ struct InfoCollector
totalPops++;
#endif
}
- void visitI31New(I31New* curr) {
+ void visitRefI31(RefI31* curr) {
// TODO: optimize like struct references
addRoot(curr);
}
diff --git a/src/ir/properties.cpp b/src/ir/properties.cpp
index b564b3bf1..63b7cedd1 100644
--- a/src/ir/properties.cpp
+++ b/src/ir/properties.cpp
@@ -40,7 +40,7 @@ bool isGenerative(Expression* curr, FeatureSet features) {
// to whether it is valid in a wasm constant expression.
static bool isValidInConstantExpression(Module& wasm, Expression* expr) {
if (isSingleConstantExpression(expr) || expr->is<StructNew>() ||
- expr->is<ArrayNew>() || expr->is<ArrayNewFixed>() || expr->is<I31New>() ||
+ expr->is<ArrayNew>() || expr->is<ArrayNewFixed>() || expr->is<RefI31>() ||
expr->is<StringConst>()) {
return true;
}
diff --git a/src/ir/properties.h b/src/ir/properties.h
index 7f247f72f..e8a17b106 100644
--- a/src/ir/properties.h
+++ b/src/ir/properties.h
@@ -117,7 +117,7 @@ inline Literal getLiteral(const Expression* curr) {
return Literal(n->type);
} else if (auto* r = curr->dynCast<RefFunc>()) {
return Literal(r->func, r->type.getHeapType());
- } else if (auto* i = curr->dynCast<I31New>()) {
+ } else if (auto* i = curr->dynCast<RefI31>()) {
if (auto* c = i->value->dynCast<Const>()) {
return Literal::makeI31(c->value.geti32());
}
diff --git a/src/js/binaryen.js-post.js b/src/js/binaryen.js-post.js
index d57d5955e..b6ea4d490 100644
--- a/src/js/binaryen.js-post.js
+++ b/src/js/binaryen.js-post.js
@@ -105,7 +105,7 @@ function initializeConstants() {
'TupleMake',
'TupleExtract',
'Pop',
- 'I31New',
+ 'RefI31',
'I31Get',
'CallRef',
'RefTest',
@@ -2419,7 +2419,7 @@ function wrapModule(module, self = {}) {
self['i31'] = {
'new'(value) {
- return Module['_BinaryenI31New'](module, value);
+ return Module['_BinaryenRefI31'](module, value);
},
'get_s'(i31) {
return Module['_BinaryenI31Get'](module, i31, 1);
@@ -3271,11 +3271,11 @@ Module['getExpressionInfo'] = function(expr) {
'tuple': Module['_BinaryenTupleExtractGetTuple'](expr),
'index': Module['_BinaryenTupleExtractGetIndex'](expr)
};
- case Module['I31NewId']:
+ case Module['RefI31Id']:
return {
'id': id,
'type': type,
- 'value': Module['_BinaryenI31NewGetValue'](expr)
+ 'value': Module['_BinaryenRefI31GetValue'](expr)
};
case Module['I31GetId']:
return {
@@ -4837,12 +4837,12 @@ Module['TupleExtract'] = makeExpressionWrapper({
}
});
-Module['I31New'] = makeExpressionWrapper({
+Module['RefI31'] = makeExpressionWrapper({
'getValue'(expr) {
- return Module['_BinaryenI31NewGetValue'](expr);
+ return Module['_BinaryenRefI31GetValue'](expr);
},
'setValue'(expr, valueExpr) {
- Module['_BinaryenI31NewSetValue'](expr, valueExpr);
+ Module['_BinaryenRefI31SetValue'](expr, valueExpr);
}
});
diff --git a/src/passes/Print.cpp b/src/passes/Print.cpp
index 87e30c882..203d922d0 100644
--- a/src/passes/Print.cpp
+++ b/src/passes/Print.cpp
@@ -1959,7 +1959,7 @@ struct PrintExpressionContents
printMedium(o, "tuple.extract ");
o << curr->index;
}
- void visitI31New(I31New* curr) { printMedium(o, "i31.new"); }
+ void visitRefI31(RefI31* curr) { printMedium(o, "i31.new"); }
void visitI31Get(I31Get* curr) {
printMedium(o, curr->signed_ ? "i31.get_s" : "i31.get_u");
}
diff --git a/src/tools/fuzzing/fuzzing.cpp b/src/tools/fuzzing/fuzzing.cpp
index 2317e7d49..1aa52e70d 100644
--- a/src/tools/fuzzing/fuzzing.cpp
+++ b/src/tools/fuzzing/fuzzing.cpp
@@ -2341,7 +2341,7 @@ Expression* TranslateToFuzzReader::makeBasicRef(Type type) {
if (type.isNullable() && oneIn(4)) {
return builder.makeRefNull(HeapType::none);
}
- return builder.makeI31New(makeConst(Type::i32));
+ return builder.makeRefI31(makeConst(Type::i32));
}
case HeapType::struct_: {
assert(wasm.features.hasGC());
diff --git a/src/wasm-binary.h b/src/wasm-binary.h
index 9a857ca14..8c8ae70e6 100644
--- a/src/wasm-binary.h
+++ b/src/wasm-binary.h
@@ -1188,7 +1188,7 @@ enum ASTNodes {
BrOnCastFail = 0x19,
ExternInternalize = 0x1a,
ExternExternalize = 0x1b,
- I31New = 0x1c,
+ RefI31 = 0x1c,
I31GetS = 0x1d,
I31GetU = 0x1e,
#else
@@ -1209,7 +1209,7 @@ enum ASTNodes {
ArrayNew = 0x1b,
ArrayNewDefault = 0x1c,
ArrayNewData = 0x1d,
- I31New = 0x20,
+ RefI31 = 0x20,
I31GetS = 0x21,
I31GetU = 0x22,
RefTest = 0x40,
@@ -1838,7 +1838,7 @@ public:
bool maybeVisitMemoryFill(Expression*& out, uint32_t code);
bool maybeVisitTableSize(Expression*& out, uint32_t code);
bool maybeVisitTableGrow(Expression*& out, uint32_t code);
- bool maybeVisitI31New(Expression*& out, uint32_t code);
+ bool maybeVisitRefI31(Expression*& out, uint32_t code);
bool maybeVisitI31Get(Expression*& out, uint32_t code);
bool maybeVisitRefTest(Expression*& out, uint32_t code);
bool maybeVisitRefCast(Expression*& out, uint32_t code);
diff --git a/src/wasm-builder.h b/src/wasm-builder.h
index 2093b9419..b9db66983 100644
--- a/src/wasm-builder.h
+++ b/src/wasm-builder.h
@@ -856,8 +856,8 @@ public:
ret->finalize();
return ret;
}
- I31New* makeI31New(Expression* value) {
- auto* ret = wasm.allocator.alloc<I31New>();
+ RefI31* makeRefI31(Expression* value) {
+ auto* ret = wasm.allocator.alloc<RefI31>();
ret->value = value;
ret->finalize();
return ret;
@@ -1209,7 +1209,7 @@ public:
return makeRefFunc(value.getFunc(), type.getHeapType());
}
if (type.isRef() && type.getHeapType() == HeapType::i31) {
- return makeI31New(makeConst(value.geti31()));
+ return makeRefI31(makeConst(value.geti31()));
}
if (type.isString()) {
// TODO: more than ascii support
@@ -1359,7 +1359,7 @@ public:
return ExpressionManipulator::refNull(curr, curr->type);
}
if (curr->type.isRef() && curr->type.getHeapType() == HeapType::i31) {
- Expression* ret = makeI31New(makeConst(0));
+ Expression* ret = makeRefI31(makeConst(0));
if (curr->type.isNullable()) {
// To keep the type identical, wrap it in a block that adds nullability.
ret = makeBlock({ret}, curr->type);
diff --git a/src/wasm-delegations-fields.def b/src/wasm-delegations-fields.def
index cd8976f82..43cb28325 100644
--- a/src/wasm-delegations-fields.def
+++ b/src/wasm-delegations-fields.def
@@ -618,10 +618,10 @@ switch (DELEGATE_ID) {
DELEGATE_END(TupleExtract);
break;
}
- case Expression::Id::I31NewId: {
- DELEGATE_START(I31New);
- DELEGATE_FIELD_CHILD(I31New, value);
- DELEGATE_END(I31New);
+ case Expression::Id::RefI31Id: {
+ DELEGATE_START(RefI31);
+ DELEGATE_FIELD_CHILD(RefI31, value);
+ DELEGATE_END(RefI31);
break;
}
case Expression::Id::I31GetId: {
diff --git a/src/wasm-delegations.def b/src/wasm-delegations.def
index eecd981cd..e6aa865ec 100644
--- a/src/wasm-delegations.def
+++ b/src/wasm-delegations.def
@@ -67,7 +67,7 @@ DELEGATE(Throw);
DELEGATE(Rethrow);
DELEGATE(TupleMake);
DELEGATE(TupleExtract);
-DELEGATE(I31New);
+DELEGATE(RefI31);
DELEGATE(I31Get);
DELEGATE(CallRef);
DELEGATE(RefTest);
diff --git a/src/wasm-interpreter.h b/src/wasm-interpreter.h
index 2a522c732..1d8c60883 100644
--- a/src/wasm-interpreter.h
+++ b/src/wasm-interpreter.h
@@ -1409,8 +1409,8 @@ public:
WASM_UNREACHABLE("throw");
}
Flow visitRethrow(Rethrow* curr) { WASM_UNREACHABLE("unimp"); }
- Flow visitI31New(I31New* curr) {
- NOTE_ENTER("I31New");
+ Flow visitRefI31(RefI31* curr) {
+ NOTE_ENTER("RefI31");
Flow flow = visit(curr->value);
if (flow.breaking()) {
return flow;
diff --git a/src/wasm-ir-builder.h b/src/wasm-ir-builder.h
index 3805a3e38..6c85a2f37 100644
--- a/src/wasm-ir-builder.h
+++ b/src/wasm-ir-builder.h
@@ -130,7 +130,7 @@ public:
// [[nodiscard]] Result<> makeRethrow();
// [[nodiscard]] Result<> makeTupleMake();
// [[nodiscard]] Result<> makeTupleExtract();
- [[nodiscard]] Result<> makeI31New();
+ [[nodiscard]] Result<> makeRefI31();
[[nodiscard]] Result<> makeI31Get(bool signed_);
// [[nodiscard]] Result<> makeCallRef();
// [[nodiscard]] Result<> makeRefTest();
diff --git a/src/wasm-s-parser.h b/src/wasm-s-parser.h
index 84299f04b..ad2d83e64 100644
--- a/src/wasm-s-parser.h
+++ b/src/wasm-s-parser.h
@@ -285,7 +285,7 @@ private:
Expression* makeTupleMake(Element& s);
Expression* makeTupleExtract(Element& s);
Expression* makeCallRef(Element& s, bool isReturn);
- Expression* makeI31New(Element& s);
+ Expression* makeRefI31(Element& s);
Expression* makeI31Get(Element& s, bool signed_);
Expression* makeRefTest(Element& s);
Expression* makeRefCast(Element& s);
diff --git a/src/wasm.h b/src/wasm.h
index c2c2db79e..ab40d5330 100644
--- a/src/wasm.h
+++ b/src/wasm.h
@@ -703,7 +703,7 @@ public:
RethrowId,
TupleMakeId,
TupleExtractId,
- I31NewId,
+ RefI31Id,
I31GetId,
CallRefId,
RefTestId,
@@ -1478,10 +1478,10 @@ public:
void finalize();
};
-class I31New : public SpecificExpression<Expression::I31NewId> {
+class RefI31 : public SpecificExpression<Expression::RefI31Id> {
public:
- I31New() = default;
- I31New(MixedArena& allocator) {}
+ RefI31() = default;
+ RefI31(MixedArena& allocator) {}
Expression* value;
diff --git a/src/wasm/wasm-binary.cpp b/src/wasm/wasm-binary.cpp
index d43640e26..969c15aaa 100644
--- a/src/wasm/wasm-binary.cpp
+++ b/src/wasm/wasm-binary.cpp
@@ -4055,7 +4055,7 @@ BinaryConsts::ASTNodes WasmBinaryReader::readExpression(Expression*& curr) {
}
case BinaryConsts::GCPrefix: {
auto opcode = getU32LEB();
- if (maybeVisitI31New(curr, opcode)) {
+ if (maybeVisitRefI31(curr, opcode)) {
break;
}
if (maybeVisitI31Get(curr, opcode)) {
@@ -6959,11 +6959,11 @@ void WasmBinaryReader::visitCallRef(CallRef* curr) {
curr->finalize();
}
-bool WasmBinaryReader::maybeVisitI31New(Expression*& out, uint32_t code) {
- if (code != BinaryConsts::I31New) {
+bool WasmBinaryReader::maybeVisitRefI31(Expression*& out, uint32_t code) {
+ if (code != BinaryConsts::RefI31) {
return false;
}
- auto* curr = allocator.alloc<I31New>();
+ auto* curr = allocator.alloc<RefI31>();
curr->value = popNonVoidExpression();
curr->finalize();
out = curr;
diff --git a/src/wasm/wasm-ir-builder.cpp b/src/wasm/wasm-ir-builder.cpp
index 7e163fe4e..6445cc3c9 100644
--- a/src/wasm/wasm-ir-builder.cpp
+++ b/src/wasm/wasm-ir-builder.cpp
@@ -661,10 +661,10 @@ Result<> IRBuilder::makeRefEq() {
// Result<> IRBuilder::makeTupleExtract() {}
-Result<> IRBuilder::makeI31New() {
- I31New curr;
- CHECK_ERR(visitI31New(&curr));
- push(builder.makeI31New(curr.value));
+Result<> IRBuilder::makeRefI31() {
+ RefI31 curr;
+ CHECK_ERR(visitRefI31(&curr));
+ push(builder.makeRefI31(curr.value));
return Ok{};
}
diff --git a/src/wasm/wasm-s-parser.cpp b/src/wasm/wasm-s-parser.cpp
index d4dd99c2c..40bd6288d 100644
--- a/src/wasm/wasm-s-parser.cpp
+++ b/src/wasm/wasm-s-parser.cpp
@@ -2838,8 +2838,8 @@ Expression* SExpressionWasmBuilder::makeCallRef(Element& s, bool isReturn) {
target, operands, sigType.getSignature().results, isReturn);
}
-Expression* SExpressionWasmBuilder::makeI31New(Element& s) {
- auto ret = allocator.alloc<I31New>();
+Expression* SExpressionWasmBuilder::makeRefI31(Element& s) {
+ auto ret = allocator.alloc<RefI31>();
ret->value = parseExpression(s[1]);
ret->finalize();
return ret;
diff --git a/src/wasm/wasm-stack.cpp b/src/wasm/wasm-stack.cpp
index 115013307..1ddf69d41 100644
--- a/src/wasm/wasm-stack.cpp
+++ b/src/wasm/wasm-stack.cpp
@@ -1989,8 +1989,8 @@ void BinaryInstWriter::visitTupleExtract(TupleExtract* curr) {
o << int8_t(BinaryConsts::LocalGet) << U32LEB(scratch);
}
-void BinaryInstWriter::visitI31New(I31New* curr) {
- o << int8_t(BinaryConsts::GCPrefix) << U32LEB(BinaryConsts::I31New);
+void BinaryInstWriter::visitRefI31(RefI31* curr) {
+ o << int8_t(BinaryConsts::GCPrefix) << U32LEB(BinaryConsts::RefI31);
}
void BinaryInstWriter::visitI31Get(I31Get* curr) {
diff --git a/src/wasm/wasm-validator.cpp b/src/wasm/wasm-validator.cpp
index d6575f7d4..0d45a4773 100644
--- a/src/wasm/wasm-validator.cpp
+++ b/src/wasm/wasm-validator.cpp
@@ -448,7 +448,7 @@ public:
void visitTupleMake(TupleMake* curr);
void visitTupleExtract(TupleExtract* curr);
void visitCallRef(CallRef* curr);
- void visitI31New(I31New* curr);
+ void visitRefI31(RefI31* curr);
void visitI31Get(I31Get* curr);
void visitRefTest(RefTest* curr);
void visitRefCast(RefCast* curr);
@@ -2502,7 +2502,7 @@ void FunctionValidator::visitCallRef(CallRef* curr) {
}
}
-void FunctionValidator::visitI31New(I31New* curr) {
+void FunctionValidator::visitRefI31(RefI31* curr) {
shouldBeTrue(
getModule()->features.hasGC(), curr, "i31.new requires gc [--enable-gc]");
shouldBeSubType(curr->value->type,
diff --git a/src/wasm/wasm.cpp b/src/wasm/wasm.cpp
index d7bc106e4..ca7e265f8 100644
--- a/src/wasm/wasm.cpp
+++ b/src/wasm/wasm.cpp
@@ -903,7 +903,7 @@ void TupleExtract::finalize() {
}
}
-void I31New::finalize() {
+void RefI31::finalize() {
if (value->type == Type::unreachable) {
type = Type::unreachable;
} else {
diff --git a/src/wasm/wat-parser.cpp b/src/wasm/wat-parser.cpp
index bdd1af0d8..6a18b2f87 100644
--- a/src/wasm/wat-parser.cpp
+++ b/src/wasm/wat-parser.cpp
@@ -760,7 +760,7 @@ struct NullInstrParserCtx {
InstrT makeRefEq(Index) { return Ok{}; }
- InstrT makeI31New(Index) { return Ok{}; }
+ InstrT makeRefI31(Index) { return Ok{}; }
InstrT makeI31Get(Index, bool) { return Ok{}; }
template<typename HeapTypeT> InstrT makeStructNew(Index, HeapTypeT) {
@@ -1762,8 +1762,8 @@ struct ParseDefsCtx : TypeParserCtx<ParseDefsCtx> {
Result<> makeRefEq(Index pos) { return withLoc(pos, irBuilder.makeRefEq()); }
- Result<> makeI31New(Index pos) {
- return withLoc(pos, irBuilder.makeI31New());
+ Result<> makeRefI31(Index pos) {
+ return withLoc(pos, irBuilder.makeRefI31());
}
Result<> makeI31Get(Index pos, bool signed_) {
@@ -1947,7 +1947,7 @@ template<typename Ctx>
Result<typename Ctx::InstrT> makeTupleExtract(Ctx&, Index);
template<typename Ctx>
Result<typename Ctx::InstrT> makeCallRef(Ctx&, Index, bool isReturn);
-template<typename Ctx> Result<typename Ctx::InstrT> makeI31New(Ctx&, Index);
+template<typename Ctx> Result<typename Ctx::InstrT> makeRefI31(Ctx&, Index);
template<typename Ctx>
Result<typename Ctx::InstrT> makeI31Get(Ctx&, Index, bool signed_);
template<typename Ctx> Result<typename Ctx::InstrT> makeRefTest(Ctx&, Index);
@@ -3042,8 +3042,8 @@ Result<typename Ctx::InstrT> makeCallRef(Ctx& ctx, Index pos, bool isReturn) {
}
template<typename Ctx>
-Result<typename Ctx::InstrT> makeI31New(Ctx& ctx, Index pos) {
- return ctx.makeI31New(pos);
+Result<typename Ctx::InstrT> makeRefI31(Ctx& ctx, Index pos) {
+ return ctx.makeRefI31(pos);
}
template<typename Ctx>
diff --git a/src/wasm2js.h b/src/wasm2js.h
index e12749836..2fbde5b65 100644
--- a/src/wasm2js.h
+++ b/src/wasm2js.h
@@ -2275,7 +2275,7 @@ Ref Wasm2JSBuilder::processFunctionBody(Module* m,
unimplemented(curr);
WASM_UNREACHABLE("unimp");
}
- Ref visitI31New(I31New* curr) {
+ Ref visitRefI31(RefI31* curr) {
unimplemented(curr);
WASM_UNREACHABLE("unimp");
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-06 13:10:26 +0000