Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Assumes ctx is not nil #2196

Merged
merged 1 commit into from
Apr 23, 2024
Merged

Assumes ctx is not nil #2196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 28 additions & 32 deletions internal/wasm/module_instance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,29 +84,27 @@ func TestModuleInstance_Close(t *testing.T) {
for _, tt := range tests {
tc := tt
t.Run(fmt.Sprintf("%s calls ns.CloseWithExitCode(module.name))", tc.name), func(t *testing.T) {
for _, ctx := range []context.Context{nil, testCtx} { // Ensure it doesn't crash on nil!
moduleName := t.Name()
m, err := s.Instantiate(ctx, &Module{}, moduleName, nil, nil)
require.NoError(t, err)
moduleName := t.Name()
m, err := s.Instantiate(testCtx, &Module{}, moduleName, nil, nil)
require.NoError(t, err)

// We use side effects to see if Close called ns.CloseWithExitCode (without repeating store_test.go).
// One side effect of ns.CloseWithExitCode is that the moduleName can no longer be looked up.
require.Equal(t, s.Module(moduleName), m)
// We use side effects to see if Close called ns.CloseWithExitCode (without repeating store_test.go).
// One side effect of ns.CloseWithExitCode is that the moduleName can no longer be looked up.
require.Equal(t, s.Module(moduleName), m)

// Closing should not err.
require.NoError(t, tc.closer(ctx, m))
// Closing should not err.
require.NoError(t, tc.closer(testCtx, m))

require.Equal(t, tc.expectedClosed, m.Closed.Load())
require.Equal(t, tc.expectedClosed, m.Closed.Load())

// Outside callers should be able to know it was closed.
require.True(t, m.IsClosed())
// Outside callers should be able to know it was closed.
require.True(t, m.IsClosed())

// Verify our intended side-effect
require.Nil(t, s.Module(moduleName))
// Verify our intended side-effect
require.Nil(t, s.Module(moduleName))

// Verify no error closing again.
require.NoError(t, tc.closer(ctx, m))
}
// Verify no error closing again.
require.NoError(t, tc.closer(testCtx, m))
})
}

Expand Down Expand Up @@ -192,26 +190,24 @@ func TestModuleInstance_CallDynamic(t *testing.T) {
for _, tt := range tests {
tc := tt
t.Run(fmt.Sprintf("%s calls ns.CloseWithExitCode(module.name))", tc.name), func(t *testing.T) {
for _, ctx := range []context.Context{nil, testCtx} { // Ensure it doesn't crash on nil!
moduleName := t.Name()
m, err := s.Instantiate(ctx, &Module{}, moduleName, nil, nil)
require.NoError(t, err)
moduleName := t.Name()
m, err := s.Instantiate(testCtx, &Module{}, moduleName, nil, nil)
require.NoError(t, err)

// We use side effects to see if Close called ns.CloseWithExitCode (without repeating store_test.go).
// One side effect of ns.CloseWithExitCode is that the moduleName can no longer be looked up.
require.Equal(t, s.Module(moduleName), m)
// We use side effects to see if Close called ns.CloseWithExitCode (without repeating store_test.go).
// One side effect of ns.CloseWithExitCode is that the moduleName can no longer be looked up.
require.Equal(t, s.Module(moduleName), m)

// Closing should not err.
require.NoError(t, tc.closer(ctx, m))
// Closing should not err.
require.NoError(t, tc.closer(testCtx, m))

require.Equal(t, tc.expectedClosed, m.Closed.Load())
require.Equal(t, tc.expectedClosed, m.Closed.Load())

// Verify our intended side-effect
require.Nil(t, s.Module(moduleName))
// Verify our intended side-effect
require.Nil(t, s.Module(moduleName))

// Verify no error closing again.
require.NoError(t, tc.closer(ctx, m))
}
// Verify no error closing again.
require.NoError(t, tc.closer(testCtx, m))
})
}

Expand Down
5 changes: 1 addition & 4 deletions internal/wasm/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,10 +363,7 @@ func (s *Store) instantiate(
return nil, err
}

var allocator experimental.MemoryAllocator
if ctx != nil {
allocator, _ = ctx.Value(expctxkeys.MemoryAllocatorKey{}).(experimental.MemoryAllocator)
}
allocator, _ := ctx.Value(expctxkeys.MemoryAllocatorKey{}).(experimental.MemoryAllocator)

m.buildGlobals(module, m.Engine.FunctionInstanceReference)
m.buildMemory(module, allocator)
Expand Down
Loading