summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/shared-validator.cc65
-rw-r--r--src/shared-validator.h3
-rw-r--r--src/validator.cc2
3 files changed, 14 insertions, 56 deletions
diff --git a/src/shared-validator.cc b/src/shared-validator.cc
index 16acb7c6..e72a2a0b 100644
--- a/src/shared-validator.cc
+++ b/src/shared-validator.cc
@@ -210,16 +210,9 @@ Result SharedValidator::OnGlobalInitExpr_RefFunc(const Location& loc,
}
Result SharedValidator::OnGlobalInitExpr_Other(const Location& loc) {
- return PrintError(loc,
- "invalid global initializer expression, must be a constant "
- "expression; either *.const or "
- "global.get.");
-}
-
-// TODO: Remove; this is here only to match previous error output.
-Result SharedValidator::OnGlobalInitExpr_None(const Location& loc) {
- return CheckType(loc, Type::Void, globals_.back().type,
- "global initializer expression");
+ return PrintError(
+ loc,
+ "invalid global initializer expression, must be a constant expression");
}
Result SharedValidator::OnEvent(const Location& loc, Var sig_var) {
@@ -407,10 +400,9 @@ Result SharedValidator::EndModule() {
Result SharedValidator::CheckIndex(Var var, Index max_index, const char* desc) {
if (var.index() >= max_index) {
- // TODO: Don't use max_index - 1, since that may wrap around to 2**32-1.
return PrintError(
var.loc, "%s variable out of range: %" PRIindex " (max %" PRIindex ")",
- desc, var.index(), max_index - 1);
+ desc, var.index(), max_index);
}
return Result::Ok;
}
@@ -452,31 +444,10 @@ Result SharedValidator::CheckMemoryIndex(Var memory_var, MemoryType* out) {
return CheckIndexWithValue(memory_var, memories_, out, "memory");
}
-// TODO: Remove; this is only used to match previous error output.
-Result SharedValidator::CheckMemoryIndex(Var memory_var, Opcode opcode) {
- if (memory_var.index() >= memories_.size()) {
- return PrintError(memory_var.loc,
- "%s requires an imported or defined memory.",
- opcode.GetName());
- }
- return Result::Ok;
-}
-
Result SharedValidator::CheckTableIndex(Var table_var, TableType* out) {
return CheckIndexWithValue(table_var, tables_, out, "table");
}
-// TODO: Remove; this is only used to match previous error output.
-Result SharedValidator::CheckTableIndex(Var table_var, Opcode opcode) {
- if (table_var.index() >= tables_.size()) {
- return PrintError(
- table_var.loc,
- "%s requires table %u to be an imported or defined table.",
- opcode.GetName(), table_var.index());
- }
- return Result::Ok;
-}
-
Result SharedValidator::CheckGlobalIndex(Var global_var, GlobalType* out) {
return CheckIndexWithValue(global_var, globals_, out, "global");
}
@@ -543,10 +514,6 @@ Result SharedValidator::BeginFunctionBody(const Location& loc,
}
Result SharedValidator::EndFunctionBody(const Location& loc) {
- // TODO: Use this location.
-#if 0
- expr_loc_ = &loc;
-#endif
return typechecker_.EndFunction();
}
@@ -605,7 +572,7 @@ Result SharedValidator::OnAtomicLoad(const Location& loc,
Address alignment) {
Result result = Result::Ok;
expr_loc_ = &loc;
- result |= CheckMemoryIndex(Var(0, loc), opcode);
+ result |= CheckMemoryIndex(Var(0, loc));
result |= CheckAtomicAlign(loc, alignment, opcode.GetMemorySize());
result |= typechecker_.OnAtomicLoad(opcode);
return result;
@@ -616,7 +583,7 @@ Result SharedValidator::OnAtomicNotify(const Location& loc,
Address alignment) {
Result result = Result::Ok;
expr_loc_ = &loc;
- result |= CheckMemoryIndex(Var(0, loc), opcode);
+ result |= CheckMemoryIndex(Var(0, loc));
result |= CheckAtomicAlign(loc, alignment, opcode.GetMemorySize());
result |= typechecker_.OnAtomicNotify(opcode);
return result;
@@ -627,7 +594,7 @@ Result SharedValidator::OnAtomicRmwCmpxchg(const Location& loc,
Address alignment) {
Result result = Result::Ok;
expr_loc_ = &loc;
- result |= CheckMemoryIndex(Var(0, loc), opcode);
+ result |= CheckMemoryIndex(Var(0, loc));
result |= CheckAtomicAlign(loc, alignment, opcode.GetMemorySize());
result |= typechecker_.OnAtomicRmwCmpxchg(opcode);
return result;
@@ -638,7 +605,7 @@ Result SharedValidator::OnAtomicRmw(const Location& loc,
Address alignment) {
Result result = Result::Ok;
expr_loc_ = &loc;
- result |= CheckMemoryIndex(Var(0, loc), opcode);
+ result |= CheckMemoryIndex(Var(0, loc));
result |= CheckAtomicAlign(loc, alignment, opcode.GetMemorySize());
result |= typechecker_.OnAtomicRmw(opcode);
return result;
@@ -649,7 +616,7 @@ Result SharedValidator::OnAtomicStore(const Location& loc,
Address alignment) {
Result result = Result::Ok;
expr_loc_ = &loc;
- result |= CheckMemoryIndex(Var(0, loc), opcode);
+ result |= CheckMemoryIndex(Var(0, loc));
result |= CheckAtomicAlign(loc, alignment, opcode.GetMemorySize());
result |= typechecker_.OnAtomicStore(opcode);
return result;
@@ -660,7 +627,7 @@ Result SharedValidator::OnAtomicWait(const Location& loc,
Address alignment) {
Result result = Result::Ok;
expr_loc_ = &loc;
- result |= CheckMemoryIndex(Var(0, loc), opcode);
+ result |= CheckMemoryIndex(Var(0, loc));
result |= CheckAtomicAlign(loc, alignment, opcode.GetMemorySize());
result |= typechecker_.OnAtomicWait(opcode);
return result;
@@ -803,10 +770,6 @@ Result SharedValidator::OnElemDrop(const Location& loc, Var segment_var) {
Result SharedValidator::OnElse(const Location& loc) {
Result result = Result::Ok;
- // TODO: Re-enable; this is only used to match previous error output.
-#if 0
- expr_loc_ = &loc;
-#endif
result |= typechecker_.OnElse();
return result;
}
@@ -913,7 +876,7 @@ Result SharedValidator::OnLoop(const Location& loc, Type sig_type) {
Result SharedValidator::OnMemoryCopy(const Location& loc) {
Result result = Result::Ok;
expr_loc_ = &loc;
- result |= CheckMemoryIndex(Var(0, loc), Opcode::MemoryCopy);
+ result |= CheckMemoryIndex(Var(0, loc));
result |= typechecker_.OnMemoryCopy();
return result;
}
@@ -921,7 +884,7 @@ Result SharedValidator::OnMemoryCopy(const Location& loc) {
Result SharedValidator::OnMemoryFill(const Location& loc) {
Result result = Result::Ok;
expr_loc_ = &loc;
- result |= CheckMemoryIndex(Var(0, loc), Opcode::MemoryFill);
+ result |= CheckMemoryIndex(Var(0, loc));
result |= typechecker_.OnMemoryFill();
return result;
}
@@ -937,7 +900,7 @@ Result SharedValidator::OnMemoryGrow(const Location& loc) {
Result SharedValidator::OnMemoryInit(const Location& loc, Var segment_var) {
Result result = Result::Ok;
expr_loc_ = &loc;
- result |= CheckMemoryIndex(Var(0, loc), Opcode::MemoryInit);
+ result |= CheckMemoryIndex(Var(0, loc));
result |= CheckDataSegmentIndex(segment_var);
result |= typechecker_.OnMemoryInit(segment_var.index());
return result;
@@ -999,7 +962,7 @@ Result SharedValidator::OnReturnCallIndirect(const Location& loc,
Var table_var) {
Result result = Result::Ok;
expr_loc_ = &loc;
- result |= CheckTableIndex(table_var, Opcode::ReturnCallIndirect);
+ result |= CheckTableIndex(table_var);
FuncType func_type;
result |= CheckTypeIndex(sig_var, &func_type);
result |=
diff --git a/src/shared-validator.h b/src/shared-validator.h
index 3e2035e9..40bde5ba 100644
--- a/src/shared-validator.h
+++ b/src/shared-validator.h
@@ -74,7 +74,6 @@ class SharedValidator {
Result OnGlobalInitExpr_RefNull(const Location&);
Result OnGlobalInitExpr_RefFunc(const Location&, Var func_var);
Result OnGlobalInitExpr_Other(const Location&);
- Result OnGlobalInitExpr_None(const Location&);
Result OnEvent(const Location&, Var sig_var);
Result OnExport(const Location&,
@@ -235,9 +234,7 @@ class SharedValidator {
Result CheckTypeIndex(Var sig_var, FuncType* out = nullptr);
Result CheckFuncIndex(Var func_var, FuncType* out = nullptr);
Result CheckTableIndex(Var table_var, TableType* out = nullptr);
- Result CheckTableIndex(Var table_var, Opcode);
Result CheckMemoryIndex(Var memory_var, MemoryType* out = nullptr);
- Result CheckMemoryIndex(Var memory_var, Opcode);
Result CheckGlobalIndex(Var global_var, GlobalType* out = nullptr);
Result CheckEventIndex(Var event_var, EventType* out = nullptr);
Result CheckElemSegmentIndex(Var elem_segment_var, ElemType* out = nullptr);
diff --git a/src/validator.cc b/src/validator.cc
index c330b276..ef238292 100644
--- a/src/validator.cc
+++ b/src/validator.cc
@@ -697,8 +697,6 @@ Result Validator::CheckModule() {
result_ |= validator_.OnGlobalInitExpr_Other(field.loc);
break;
}
- } else if (f->global.init_expr.empty()) {
- result_ |= validator_.OnGlobalInitExpr_None(field.loc);
} else {
result_ |= validator_.OnGlobalInitExpr_Other(field.loc);
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-30 16:06:29 +0000