Skip to content

Commit e3315ec

Browse files
krodakkrodak
committed
BridgeJS: Normalize wasm pointer offsets in JS
1 parent 73a125d commit e3315ec

60 files changed

Lines changed: 294 additions & 136 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ jobs:
5454
echo "SWIFT_SDK_ID=${{ steps.setup-swiftwasm.outputs.swift-sdk-id }}" >> $GITHUB_ENV
5555
echo "SWIFT_BIN_PATH=$(dirname $(which swiftc))" >> $GITHUB_ENV
5656
- run: make bootstrap
57+
- run: npm run test:runtime
5758
- run: make unittest
5859
# Skip unit tests with uwasi because its proc_exit throws
5960
# unhandled promise rejection.

‎Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ public struct BridgeJSLink {
107107
/// Represents a Swift heap object like a class instance or an actor instance.
108108
class SwiftHeapObject {
109109
static __wrap(pointer, deinit, prototype, identityCache) {
110+
pointer = pointer >>> 0;
110111
const makeFresh = (identityMap) => {
111112
const obj = Object.create(prototype);
112113
const state = { pointer, deinit, hasReleased: false, identityMap };
@@ -428,7 +429,7 @@ public struct BridgeJSLink {
428429
"\(JSGlueVariableScope.reservedSwift).\(JSGlueVariableScope.reservedMemory).release(sourceId);"
429430
)
430431
printer.write(
431-
"const bytes = new Uint8Array(\(JSGlueVariableScope.reservedMemory).buffer, bytesPtr);"
432+
"const bytes = new Uint8Array(\(JSGlueVariableScope.reservedMemory).buffer, bytesPtr >>> 0);"
432433
)
433434
printer.write("bytes.set(source);")
434435
}
@@ -443,7 +444,7 @@ public struct BridgeJSLink {
443444
printer.write("bjs[\"swift_js_init_memory_with_result\"] = function(ptr, len) {")
444445
printer.indent {
445446
printer.write(
446-
"const target = new Uint8Array(\(JSGlueVariableScope.reservedMemory).buffer, ptr, len);"
447+
"const target = new Uint8Array(\(JSGlueVariableScope.reservedMemory).buffer, ptr >>> 0, len >>> 0);"
447448
)
448449
printer.write("target.set(\(JSGlueVariableScope.reservedStorageToReturnBytes));")
449450
printer.write("\(JSGlueVariableScope.reservedStorageToReturnBytes) = undefined;")
@@ -789,7 +790,7 @@ public struct BridgeJSLink {
789790
helperPrinter.write("if (state.unregistered) {")
790791
helperPrinter.indent {
791792
helperPrinter.write(
792-
"const bytes = new Uint8Array(\(JSGlueVariableScope.reservedMemory).buffer, state.file);"
793+
"const bytes = new Uint8Array(\(JSGlueVariableScope.reservedMemory).buffer, state.file >>> 0);"
793794
)
794795
helperPrinter.write("let length = 0;")
795796
helperPrinter.write("while (bytes[length] !== 0) { length += 1; }")

‎Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,14 @@ export async function createInstantiator(options, swift) {
7070
bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
7171
const source = swift.memory.getObject(sourceId);
7272
swift.memory.release(sourceId);
73-
const bytes = new Uint8Array(memory.buffer, bytesPtr);
73+
const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
7474
bytes.set(source);
7575
}
7676
bjs["swift_js_make_js_string"] = function(ptr, len) {
7777
return swift.memory.retain(decodeString(ptr, len));
7878
}
7979
bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
80-
const target = new Uint8Array(memory.buffer, ptr, len);
80+
const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
8181
target.set(tmpRetBytes);
8282
tmpRetBytes = undefined;
8383
}
@@ -390,6 +390,7 @@ export async function createInstantiator(options, swift) {
390390
/// Represents a Swift heap object like a class instance or an actor instance.
391391
class SwiftHeapObject {
392392
static __wrap(pointer, deinit, prototype, identityCache) {
393+
pointer = pointer >>> 0;
393394
const makeFresh = (identityMap) => {
394395
const obj = Object.create(prototype);
395396
const state = { pointer, deinit, hasReleased: false, identityMap };

‎Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,14 +155,14 @@ export async function createInstantiator(options, swift) {
155155
bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
156156
const source = swift.memory.getObject(sourceId);
157157
swift.memory.release(sourceId);
158-
const bytes = new Uint8Array(memory.buffer, bytesPtr);
158+
const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
159159
bytes.set(source);
160160
}
161161
bjs["swift_js_make_js_string"] = function(ptr, len) {
162162
return swift.memory.retain(decodeString(ptr, len));
163163
}
164164
bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
165-
const target = new Uint8Array(memory.buffer, ptr, len);
165+
const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
166166
target.set(tmpRetBytes);
167167
tmpRetBytes = undefined;
168168
}

‎Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncAssociatedValueEnum.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,14 +178,14 @@ export async function createInstantiator(options, swift) {
178178
bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
179179
const source = swift.memory.getObject(sourceId);
180180
swift.memory.release(sourceId);
181-
const bytes = new Uint8Array(memory.buffer, bytesPtr);
181+
const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
182182
bytes.set(source);
183183
}
184184
bjs["swift_js_make_js_string"] = function(ptr, len) {
185185
return swift.memory.retain(decodeString(ptr, len));
186186
}
187187
bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
188-
const target = new Uint8Array(memory.buffer, ptr, len);
188+
const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
189189
target.set(tmpRetBytes);
190190
tmpRetBytes = undefined;
191191
}

‎Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncImport.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ export async function createInstantiator(options, swift) {
128128
const state = { pointer, file, line, unregistered: false };
129129
const real = (...args) => {
130130
if (state.unregistered) {
131-
const bytes = new Uint8Array(memory.buffer, state.file);
131+
const bytes = new Uint8Array(memory.buffer, state.file >>> 0);
132132
let length = 0;
133133
while (bytes[length] !== 0) { length += 1; }
134134
const fileID = decodeString(state.file, length);
@@ -160,14 +160,14 @@ export async function createInstantiator(options, swift) {
160160
bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
161161
const source = swift.memory.getObject(sourceId);
162162
swift.memory.release(sourceId);
163-
const bytes = new Uint8Array(memory.buffer, bytesPtr);
163+
const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
164164
bytes.set(source);
165165
}
166166
bjs["swift_js_make_js_string"] = function(ptr, len) {
167167
return swift.memory.retain(decodeString(ptr, len));
168168
}
169169
bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
170-
const target = new Uint8Array(memory.buffer, ptr, len);
170+
const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
171171
target.set(tmpRetBytes);
172172
tmpRetBytes = undefined;
173173
}

‎Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncStaticImport.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ export async function createInstantiator(options, swift) {
128128
const state = { pointer, file, line, unregistered: false };
129129
const real = (...args) => {
130130
if (state.unregistered) {
131-
const bytes = new Uint8Array(memory.buffer, state.file);
131+
const bytes = new Uint8Array(memory.buffer, state.file >>> 0);
132132
let length = 0;
133133
while (bytes[length] !== 0) { length += 1; }
134134
const fileID = decodeString(state.file, length);
@@ -159,14 +159,14 @@ export async function createInstantiator(options, swift) {
159159
bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
160160
const source = swift.memory.getObject(sourceId);
161161
swift.memory.release(sourceId);
162-
const bytes = new Uint8Array(memory.buffer, bytesPtr);
162+
const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
163163
bytes.set(source);
164164
}
165165
bjs["swift_js_make_js_string"] = function(ptr, len) {
166166
return swift.memory.retain(decodeString(ptr, len));
167167
}
168168
bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
169-
const target = new Uint8Array(memory.buffer, ptr, len);
169+
const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
170170
target.set(tmpRetBytes);
171171
tmpRetBytes = undefined;
172172
}

‎Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,14 +87,14 @@ export async function createInstantiator(options, swift) {
8787
bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
8888
const source = swift.memory.getObject(sourceId);
8989
swift.memory.release(sourceId);
90-
const bytes = new Uint8Array(memory.buffer, bytesPtr);
90+
const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
9191
bytes.set(source);
9292
}
9393
bjs["swift_js_make_js_string"] = function(ptr, len) {
9494
return swift.memory.retain(decodeString(ptr, len));
9595
}
9696
bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
97-
const target = new Uint8Array(memory.buffer, ptr, len);
97+
const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
9898
target.set(tmpRetBytes);
9999
tmpRetBytes = undefined;
100100
}
@@ -301,6 +301,7 @@ export async function createInstantiator(options, swift) {
301301
/// Represents a Swift heap object like a class instance or an actor instance.
302302
class SwiftHeapObject {
303303
static __wrap(pointer, deinit, prototype, identityCache) {
304+
pointer = pointer >>> 0;
304305
const makeFresh = (identityMap) => {
305306
const obj = Object.create(prototype);
306307
const state = { pointer, deinit, hasReleased: false, identityMap };

‎Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,14 @@ export async function createInstantiator(options, swift) {
8686
bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
8787
const source = swift.memory.getObject(sourceId);
8888
swift.memory.release(sourceId);
89-
const bytes = new Uint8Array(memory.buffer, bytesPtr);
89+
const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
9090
bytes.set(source);
9191
}
9292
bjs["swift_js_make_js_string"] = function(ptr, len) {
9393
return swift.memory.retain(decodeString(ptr, len));
9494
}
9595
bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
96-
const target = new Uint8Array(memory.buffer, ptr, len);
96+
const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
9797
target.set(tmpRetBytes);
9898
tmpRetBytes = undefined;
9999
}
@@ -310,6 +310,7 @@ export async function createInstantiator(options, swift) {
310310
/// Represents a Swift heap object like a class instance or an actor instance.
311311
class SwiftHeapObject {
312312
static __wrap(pointer, deinit, prototype, identityCache) {
313+
pointer = pointer >>> 0;
313314
const makeFresh = (identityMap) => {
314315
const obj = Object.create(prototype);
315316
const state = { pointer, deinit, hasReleased: false, identityMap };

‎Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -788,14 +788,14 @@ export async function createInstantiator(options, swift) {
788788
bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) {
789789
const source = swift.memory.getObject(sourceId);
790790
swift.memory.release(sourceId);
791-
const bytes = new Uint8Array(memory.buffer, bytesPtr);
791+
const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0);
792792
bytes.set(source);
793793
}
794794
bjs["swift_js_make_js_string"] = function(ptr, len) {
795795
return swift.memory.retain(decodeString(ptr, len));
796796
}
797797
bjs["swift_js_init_memory_with_result"] = function(ptr, len) {
798-
const target = new Uint8Array(memory.buffer, ptr, len);
798+
const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0);
799799
target.set(tmpRetBytes);
800800
tmpRetBytes = undefined;
801801
}
@@ -987,6 +987,7 @@ export async function createInstantiator(options, swift) {
987987
/// Represents a Swift heap object like a class instance or an actor instance.
988988
class SwiftHeapObject {
989989
static __wrap(pointer, deinit, prototype, identityCache) {
990+
pointer = pointer >>> 0;
990991
const makeFresh = (identityMap) => {
991992
const obj = Object.create(prototype);
992993
const state = { pointer, deinit, hasReleased: false, identityMap };

0 commit comments

Comments
 (0)