summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/binaryen-c.cpp4
-rw-r--r--src/ir/possible-contents.cpp4
-rw-r--r--src/ir/properties.h2
-rw-r--r--src/literal.h8
-rw-r--r--src/passes/Precompute.cpp2
-rw-r--r--src/wasm-interpreter.h13
-rw-r--r--src/wasm/literal.cpp6
7 files changed, 21 insertions, 18 deletions
diff --git a/src/binaryen-c.cpp b/src/binaryen-c.cpp
index 68158cdf7..6f771c49c 100644
--- a/src/binaryen-c.cpp
+++ b/src/binaryen-c.cpp
@@ -108,11 +108,11 @@ Literal fromBinaryenLiteral(BinaryenLiteral x) {
if (heapType.isBasic()) {
switch (heapType.getBasic()) {
case HeapType::func:
- return Literal::makeFunc(x.func);
case HeapType::any:
case HeapType::eq:
- case HeapType::i31:
case HeapType::data:
+ assert(false && "Literals must have concrete types");
+ case HeapType::i31:
case HeapType::string:
case HeapType::stringview_wtf8:
case HeapType::stringview_wtf16:
diff --git a/src/ir/possible-contents.cpp b/src/ir/possible-contents.cpp
index 67891f45f..ab0d379f6 100644
--- a/src/ir/possible-contents.cpp
+++ b/src/ir/possible-contents.cpp
@@ -360,7 +360,9 @@ struct InfoCollector
addRoot(curr);
}
void visitRefFunc(RefFunc* curr) {
- addRoot(curr, PossibleContents::literal(Literal(curr->func, curr->type)));
+ addRoot(
+ curr,
+ PossibleContents::literal(Literal(curr->func, curr->type.getHeapType())));
}
void visitRefEq(RefEq* curr) {
// TODO: optimize when possible (e.g. when both sides must contain the same
diff --git a/src/ir/properties.h b/src/ir/properties.h
index 3278d9e41..204b33e1e 100644
--- a/src/ir/properties.h
+++ b/src/ir/properties.h
@@ -106,7 +106,7 @@ inline Literal getLiteral(const Expression* curr) {
} else if (auto* n = curr->dynCast<RefNull>()) {
return Literal(n->type);
} else if (auto* r = curr->dynCast<RefFunc>()) {
- return Literal(r->func, r->type);
+ return Literal(r->func, r->type.getHeapType());
} else if (auto* i = curr->dynCast<I31New>()) {
if (auto* c = i->value->dynCast<Const>()) {
return Literal::makeI31(c->value.geti32());
diff --git a/src/literal.h b/src/literal.h
index 1151abd2c..6696103e3 100644
--- a/src/literal.h
+++ b/src/literal.h
@@ -94,8 +94,9 @@ public:
explicit Literal(const std::array<Literal, 8>&);
explicit Literal(const std::array<Literal, 4>&);
explicit Literal(const std::array<Literal, 2>&);
- explicit Literal(Name func, Type type) : func(func), type(type) {}
- explicit Literal(std::shared_ptr<GCData> gcData, Type type);
+ explicit Literal(Name func, HeapType type)
+ : func(func), type(type, NonNullable) {}
+ explicit Literal(std::shared_ptr<GCData> gcData, HeapType type);
explicit Literal(std::unique_ptr<RttSupers>&& rttSupers, Type type);
Literal(const Literal& other);
Literal& operator=(const Literal& other);
@@ -257,8 +258,7 @@ public:
static Literal makeNull(HeapType type) {
return Literal(Type(type, Nullable));
}
- static Literal makeFunc(Name func,
- Type type = Type(HeapType::func, Nullable)) {
+ static Literal makeFunc(Name func, HeapType type) {
return Literal(func, type);
}
static Literal makeI31(int32_t value) {
diff --git a/src/passes/Precompute.cpp b/src/passes/Precompute.cpp
index 156c33c3f..bbaa6d533 100644
--- a/src/passes/Precompute.cpp
+++ b/src/passes/Precompute.cpp
@@ -190,7 +190,7 @@ public:
} else {
*canonical = *newGCData;
}
- return Literal(canonical, curr->type);
+ return Literal(canonical, curr->type.getHeapType());
}
};
diff --git a/src/wasm-interpreter.h b/src/wasm-interpreter.h
index 65ffdbade..d00ccac43 100644
--- a/src/wasm-interpreter.h
+++ b/src/wasm-interpreter.h
@@ -1363,7 +1363,7 @@ public:
Flow visitRefFunc(RefFunc* curr) {
NOTE_ENTER("RefFunc");
NOTE_NAME(curr->func);
- return Literal::makeFunc(curr->func, curr->type);
+ return Literal::makeFunc(curr->func, curr->type.getHeapType());
}
Flow visitRefEq(RefEq* curr) {
NOTE_ENTER("RefEq");
@@ -1506,7 +1506,7 @@ public:
};
// We have the actual and intended RTTs, so perform the cast.
if (actualRtt.isSubRtt(intendedRtt)) {
- Type resultType(intendedRtt.type.getHeapType(), NonNullable);
+ HeapType resultType = intendedRtt.type.getHeapType();
if (original.isFunction()) {
return typename Cast::Success{Literal{original.getFunc(), resultType}};
} else {
@@ -1684,7 +1684,8 @@ public:
if (!curr->rtt) {
rttVal = Literal::makeCanonicalRtt(heapType);
}
- return Literal(std::make_shared<GCData>(rttVal, data), curr->type);
+ return Literal(std::make_shared<GCData>(rttVal, data),
+ curr->type.getHeapType());
}
Flow visitStructGet(StructGet* curr) {
NOTE_ENTER("StructGet");
@@ -1771,7 +1772,8 @@ public:
if (!curr->rtt) {
rttVal = Literal::makeCanonicalRtt(heapType);
}
- return Literal(std::make_shared<GCData>(rttVal, data), curr->type);
+ return Literal(std::make_shared<GCData>(rttVal, data),
+ curr->type.getHeapType());
}
Flow visitArrayInit(ArrayInit* curr) {
NOTE_ENTER("ArrayInit");
@@ -1811,7 +1813,8 @@ public:
if (!curr->rtt) {
rttVal = Literal::makeCanonicalRtt(heapType);
}
- return Literal(std::make_shared<GCData>(rttVal, data), curr->type);
+ return Literal(std::make_shared<GCData>(rttVal, data),
+ curr->type.getHeapType());
}
Flow visitArrayGet(ArrayGet* curr) {
NOTE_ENTER("ArrayGet");
diff --git a/src/wasm/literal.cpp b/src/wasm/literal.cpp
index 608018d8b..b8a6c7e7a 100644
--- a/src/wasm/literal.cpp
+++ b/src/wasm/literal.cpp
@@ -65,10 +65,8 @@ Literal::Literal(const uint8_t init[16]) : type(Type::v128) {
memcpy(&v128, init, 16);
}
-Literal::Literal(std::shared_ptr<GCData> gcData, Type type)
- : gcData(gcData), type(type) {
- // Null data is only allowed if nullable.
- assert(gcData || type.isNullable());
+Literal::Literal(std::shared_ptr<GCData> gcData, HeapType type)
+ : gcData(gcData), type(type, gcData ? NonNullable : Nullable) {
// The type must be a proper type for GC data.
assert(isData());
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-19 10:49:31 +0000