Skip to content

Commit cf1ae15

Browse files
stevenfontanellastevenfontanella
committed
Add validations for types of imports
1 parent 28e849b commit cf1ae15

File tree

6 files changed

+142
-35
lines changed

6 files changed

+142
-35
lines changed

‎scripts/test/shared.py‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -440,11 +440,10 @@ def get_tests(test_dir, extensions=[], recursive=False):
440440
'func.wast', # Duplicate parameter names not properly rejected
441441
'global.wast', # Fail to parse table
442442
'if.wast', # Requires more precise unreachable validation
443-
'imports.wast', # Missing validation of missing function on instantiation
443+
# 'imports.wast', # Missing validation of missing function on instantiation
444444
'proposals/threads/imports.wast', # Missing memory type validation on instantiation
445445
'linking.wast', # Missing function type validation on instantiation
446446
'proposals/threads/memory.wast', # Missing memory type validation on instantiation
447-
'memory64-imports.wast', # Missing validation on instantiation
448447
'annotations.wast', # String annotations IDs should be allowed
449448
'id.wast', # Empty IDs should be disallowed
450449
# Requires correct handling of tag imports from different instances of the same module,
@@ -473,12 +472,8 @@ def get_tests(test_dir, extensions=[], recursive=False):
473472
'type-rec.wast', # Missing function type validation on instantiation
474473
'type-subtyping.wast', # ShellExternalInterface::callTable does not handle subtyping
475474
'call_indirect.wast', # Bug with 64-bit inline element segment parsing
476-
'memory64.wast', # Requires validations for memory size
477-
'imports0.wast', # Missing memory type validation on instantiation
478-
'imports2.wast', # Missing memory type validation on instantiation
479-
'imports3.wast', # Missing memory type validation on instantiation
480-
'linking0.wast', # Missing memory type validation on instantiation
481-
'linking3.wast', # Fatal error on missing table.
475+
# 'memory64.wast', # Requires wast `module definition` support
476+
# 'linking0.wast', # Missing memory type validation on instantiation
482477
'i16x8_relaxed_q15mulr_s.wast', # Requires wast `either` support
483478
'i32x4_relaxed_trunc.wast', # Requires wast `either` support
484479
'i8x16_relaxed_swizzle.wast', # Requires wast `either` support

‎src/passes/Print.cpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3940,4 +3940,10 @@ std::ostream& operator<<(std::ostream& o, wasm::ModuleHeapType pair) {
39403940
return o << "(unnamed)";
39413941
}
39423942

3943+
std::ostream& operator<<(std::ostream& o, const wasm::Memory& memory) {
3944+
wasm::PrintSExpression printer(o);
3945+
printer.visitMemory(const_cast<wasm::Memory*>(&memory));
3946+
return o;
3947+
}
3948+
39433949
} // namespace std

‎src/shell-interface.h‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,9 @@ struct ShellExternalInterface : ModuleRunner::ExternalInterface {
134134
auto inst = getImportInstance(import);
135135
auto* exportedGlobal = inst->wasm.getExportOrNull(import->base);
136136
if (!exportedGlobal || exportedGlobal->kind != ExternalKind::Global) {
137-
Fatal() << "importGlobals: unknown import: " << import->module.str
138-
<< "." << import->name.str;
137+
trap((std::stringstream() << "unknown import: " << import->module.str
138+
<< "." << import->name.str)
139+
.str());
139140
}
140141
globals[import->name] = inst->globals[*exportedGlobal->getInternalName()];
141142
});
@@ -330,6 +331,11 @@ struct ShellExternalInterface : ModuleRunner::ExternalInterface {
330331
throw TrapException();
331332
}
332333

334+
void trap(std::string_view why) override {
335+
std::cout << "[trap " << why << "]\n";
336+
throw TrapException();
337+
}
338+
333339
void hostLimit(const char* why) override {
334340
std::cout << "[host limit " << why << "]\n";
335341
throw HostLimitException();

‎src/wasm-interpreter.h‎

Lines changed: 73 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ class Flow {
8686
}
8787

8888
Literals values;
89-
Name breakTo; // if non-null, a break is going on
89+
Name breakTo; // if non-null, a break is going on
9090
Tag* suspendTag = nullptr; // if non-null, breakTo must be SUSPEND_FLOW, and
9191
// this is the tag being suspended
9292

@@ -2658,6 +2658,8 @@ class ExpressionRunner : public OverriddenVisitor<SubType, Flow> {
26582658

26592659
virtual void trap(const char* why) { WASM_UNREACHABLE("unimp"); }
26602660

2661+
virtual void trap(std::string_view why) { WASM_UNREACHABLE("unimp"); }
2662+
26612663
virtual void hostLimit(const char* why) { WASM_UNREACHABLE("unimp"); }
26622664

26632665
virtual void throwException(const WasmException& exn) {
@@ -2937,6 +2939,7 @@ class ModuleRunnerBase : public ExpressionRunner<SubType> {
29372939
Index oldSize,
29382940
Index newSize) = 0;
29392941
virtual void trap(const char* why) = 0;
2942+
virtual void trap(std::string_view why) { trap(std::string(why).c_str()); }
29402943
virtual void hostLimit(const char* why) = 0;
29412944
virtual void throwException(const WasmException& exn) = 0;
29422945
// Get the Tag instance for a tag implemented in the host, that is, not
@@ -3178,6 +3181,8 @@ class ModuleRunnerBase : public ExpressionRunner<SubType> {
31783181
// initialize the rest of the external interface
31793182
externalInterface->init(wasm, *self());
31803183

3184+
validateImports();
3185+
31813186
initializeTableContents();
31823187
initializeMemoryContents();
31833188

@@ -3269,6 +3274,70 @@ class ModuleRunnerBase : public ExpressionRunner<SubType> {
32693274
Name name;
32703275
};
32713276

3277+
// Trap if types don't match between all imports and their corresponding
3278+
// exports. Imported memories and tables must also be a subtype of their
3279+
// export.
3280+
void validateImports() {
3281+
ModuleUtils::iterImportable(
3282+
wasm,
3283+
[this](ExternalKind kind,
3284+
std::variant<Function*, Memory*, Tag*, Global*, Table*> import) {
3285+
Importable* importable = std::visit(
3286+
[](const auto& import) -> Importable* { return import; }, import);
3287+
3288+
SubType* importedInstance =
3289+
linkedInstances.at(importable->module).get();
3290+
Export* export_ =
3291+
importedInstance->wasm.getExportOrNull(importable->base);
3292+
3293+
// In case functions are imported from the special "spectest" module,
3294+
// don't check them here, since they won't show up in exports.
3295+
if (!export_ && kind != ExternalKind::Function) {
3296+
std::cerr << "importedinstance " << importedInstance
3297+
<< ". Importable: " << importable->module << " "
3298+
<< importable->base << "\n";
3299+
trap((std::stringstream()
3300+
<< "Export " << importable->base << " doesn't exist.")
3301+
.str());
3302+
}
3303+
if (export_ && export_->kind != kind) {
3304+
trap("Exported kind doesn't match");
3305+
}
3306+
3307+
if (auto** memory = std::get_if<Memory*>(&import)) {
3308+
SubType* importedInstance =
3309+
linkedInstances.at((*memory)->module).get();
3310+
Export* export_ =
3311+
importedInstance->wasm.getExportOrNull((*memory)->base);
3312+
Memory exportedMemory =
3313+
*importedInstance->wasm.getMemory(*export_->getInternalName());
3314+
exportedMemory.initial =
3315+
importedInstance->getMemorySize(*export_->getInternalName());
3316+
3317+
// todo which way?
3318+
// if (!(*memory)->isSubType(exportedMemory)) {
3319+
if (!exportedMemory.isSubType(**memory)) {
3320+
trap((std::stringstream()
3321+
<< "Imported memory isn't compatible. Imported memory: "
3322+
<< **memory << ". Exported memory: " << exportedMemory)
3323+
.str());
3324+
}
3325+
}
3326+
3327+
if (auto** table = std::get_if<Table*>(&import)) {
3328+
SubType* importedInstance =
3329+
linkedInstances.at((*table)->module).get();
3330+
Export* export_ =
3331+
importedInstance->wasm.getExportOrNull((*table)->base);
3332+
Table* exportedTable =
3333+
importedInstance->wasm.getTable(*export_->getInternalName());
3334+
if (!(*table)->isSubType(*exportedTable)) {
3335+
trap("Imported table isn't compatible");
3336+
}
3337+
}
3338+
});
3339+
}
3340+
32723341
TableInstanceInfo getTableInstanceInfo(Name name) {
32733342
auto* table = wasm.getTable(name);
32743343
if (table->imported()) {
@@ -4682,12 +4751,13 @@ class ModuleRunnerBase : public ExpressionRunner<SubType> {
46824751
}
46834752
Flow visitStackSwitch(StackSwitch* curr) { return Flow(NONCONSTANT_FLOW); }
46844753

4685-
void trap(const char* why) override {
4686-
// Traps break all current continuations - they will never be resumable.
4754+
void trap(std::string_view why) override {
46874755
self()->clearContinuationStore();
46884756
externalInterface->trap(why);
46894757
}
46904758

4759+
void trap(const char* why) override { trap(std::string_view(why)); }
4760+
46914761
void hostLimit(const char* why) override {
46924762
self()->clearContinuationStore();
46934763
externalInterface->hostLimit(why);

‎src/wasm.h‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2435,6 +2435,28 @@ class Table : public Importable {
24352435
initial = 0;
24362436
max = kMaxSize;
24372437
}
2438+
2439+
static bool isSubType(const Table& a, const Table& b) {
2440+
if (a.addressType != b.addressType) {
2441+
return false;
2442+
}
2443+
2444+
if (!Type::isSubType(a.type, b.type)) {
2445+
return false;
2446+
}
2447+
2448+
if (a.initial > b.initial) {
2449+
return false;
2450+
}
2451+
2452+
if (a.max < b.max) {
2453+
return false;
2454+
}
2455+
2456+
return true;
2457+
}
2458+
2459+
bool isSubType(const Table& other) { return Table::isSubType(*this, other); }
24382460
};
24392461

24402462
class DataSegment : public Named {
@@ -2470,6 +2492,15 @@ class Memory : public Importable {
24702492
shared = false;
24712493
addressType = Type::i32;
24722494
}
2495+
2496+
static bool isSubType(const Memory& a, const Memory& b) {
2497+
return a.addressType == b.addressType && a.initial >= b.initial &&
2498+
a.max <= b.max;
2499+
}
2500+
2501+
bool isSubType(const Memory& other) {
2502+
return Memory::isSubType(*this, other);
2503+
}
24732504
};
24742505

24752506
class Global : public Importable {
@@ -2661,6 +2692,7 @@ std::ostream& operator<<(std::ostream& o, wasm::ModuleExpression pair);
26612692
std::ostream& operator<<(std::ostream& o, wasm::ShallowExpression expression);
26622693
std::ostream& operator<<(std::ostream& o, wasm::ModuleType pair);
26632694
std::ostream& operator<<(std::ostream& o, wasm::ModuleHeapType pair);
2695+
std::ostream& operator<<(std::ostream& o, const wasm::Memory& memory);
26642696

26652697
} // namespace std
26662698

‎test/spec/exact-func-import.wast‎

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,25 @@
1-
;; TODO: Use the upstream version from the custom descriptors proposal.
2-
3-
(module
1+
(module definition
42
(type $f (func))
53
(import "" "" (func $1 (exact (type 0))))
6-
(import "" "" (func $2 (exact (type $f) (param) (result))))
7-
(import "" "" (func $3 (exact (type $f))))
8-
(import "" "" (func $4 (exact (type 1)))) ;; Implicitly defined next
9-
(import "" "" (func $5 (exact (param i32) (result i64))))
4+
;; (import "" "" (func $2 (exact (type $f) (param) (result)))) ;; TODO: parser support
5+
(import "" "" (func $2 (exact (type $f))))
6+
(import "" "" (func $3 (exact (type 1)))) ;; Implicitly defined next
7+
(import "" "" (func $4 (exact (param i32) (result i64))))
108

11-
(func $6 (import "" "") (exact (type 0)))
12-
(func $7 (import "" "") (exact (type $f) (param) (result)))
13-
(func $8 (import "" "") (exact (type $f)))
14-
(func $9 (import "" "") (exact (type 2))) ;; Implicitly defined next
15-
(func $10 (import "" "") (exact (param i64) (result i32)))
9+
(func $5 (import "" "") (exact (type 0)))
10+
;; (func $6 (import "" "") (exact (type $f) (param) (result))) ;; TODO: parser support
11+
(func $6 (import "" "") (exact (type $f)))
12+
;; (func $7 (import "" "") (exact (type 2))) ;; Implicitly defined next
13+
;; (func $8 (import "" "") (exact (param i64) (result i32))) ;; TODO: parser support
1614

1715
(global (ref (exact $f)) (ref.func $1))
1816
(global (ref (exact $f)) (ref.func $2))
19-
(global (ref (exact $f)) (ref.func $3))
17+
(global (ref (exact 1)) (ref.func $3))
2018
(global (ref (exact 1)) (ref.func $4))
21-
(global (ref (exact 1)) (ref.func $5))
19+
(global (ref (exact $f)) (ref.func $5))
2220
(global (ref (exact $f)) (ref.func $6))
23-
(global (ref (exact $f)) (ref.func $7))
24-
(global (ref (exact $f)) (ref.func $8))
25-
(global (ref (exact 2)) (ref.func $9))
26-
(global (ref (exact 2)) (ref.func $10))
21+
;; (global (ref (exact 2)) (ref.func $7))
22+
;; (global (ref (exact 2)) (ref.func $8))
2723
)
2824

2925
;; References to inexact imports are not exact.
@@ -51,7 +47,7 @@
5147

5248
;; Inexact imports can still be referenced inexactly, though.
5349

54-
(module
50+
(module definition
5551
(type $f (func))
5652
(import "" "" (func $1 (type $f)))
5753
(global (ref $f) (ref.func $1))
@@ -70,7 +66,9 @@
7066
;; Import and re-export inexactly.
7167
(module $B
7268
(type $f (func))
73-
(func (export "f") (import "A" "f") (type $f))
69+
;; (func (import "A" "f") (export "f") (type $f))
70+
(func (import "A" "f") (type $f))
71+
(export "f" (func 0))
7472
)
7573
(register "B")
7674

@@ -220,7 +218,7 @@
220218
;; Test the binary format
221219

222220
;; Exact function imports use 0x20.
223-
(module binary
221+
(module definition binary
224222
"\00asm" "\01\00\00\00"
225223
"\01" ;; Type section id
226224
"\04" ;; Type section length
@@ -265,4 +263,4 @@
265263
"\0b" ;; End
266264
)
267265
"malformed export kind"
268-
)
266+
)

0 commit comments

Comments
 (0)