Skip to content

Commit 21f7d51

Browse files
committed
rebase
1 parent 3feaf3a commit 21f7d51

File tree

8 files changed

+806
-905
lines changed

8 files changed

+806
-905
lines changed

src/mono/browser/runtime/diagnostics/common.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ export interface IDiagnosticClient {
9090
export type fnClientProvider = (scenarioName:string) => IDiagnosticClient;
9191

9292
export function downloadBlob (messages:Uint8Array[]) {
93-
const blob = new Blob(messages, { type: "application/octet-stream" });
93+
const blob = new Blob(messages as BlobPart[], { type: "application/octet-stream" });
9494
const blobUrl = URL.createObjectURL(blob);
9595
const link = document.createElement("a");
9696
link.download = "trace." + (new Date()).valueOf() + ".nettrace";

src/mono/browser/runtime/dotnet.d.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -776,4 +776,5 @@ declare global {
776776
}
777777
declare const createDotnetRuntime: CreateDotnetRuntimeType;
778778

779-
export { type AssetBehaviors, type AssetEntry, type CreateDotnetRuntimeType, type DotnetHostBuilder, type DotnetModuleConfig, type EmscriptenModule, GlobalizationMode, type IMemoryView, type ModuleAPI, type MonoConfig, type RuntimeAPI, createDotnetRuntime as default, dotnet, exit };
779+
export { GlobalizationMode, createDotnetRuntime as default, dotnet, exit };
780+
export type { AssetBehaviors, AssetEntry, CreateDotnetRuntimeType, DotnetHostBuilder, DotnetModuleConfig, EmscriptenModule, IMemoryView, ModuleAPI, MonoConfig, RuntimeAPI };

src/mono/browser/runtime/interp-pgo.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ export async function getCacheEntry (cacheKey: string): Promise<ArrayBuffer | un
130130
}
131131
}
132132

133-
export async function storeCacheEntry (cacheKey: string, memory: ArrayBuffer, mimeType: string): Promise<boolean> {
133+
export async function storeCacheEntry (cacheKey: string, memory: Uint8Array<ArrayBuffer>, mimeType: string): Promise<boolean> {
134134
try {
135135
const cache = await openCache();
136136
if (!cache) {

src/mono/browser/runtime/jiterpreter-interp-entry.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ function flush_wasm_entry_trampoline_jit_queue () {
405405
if (trace > 0)
406406
mono_log_info(`jit queue generated ${buffer.length} byte(s) of wasm`);
407407
modifyCounter(JiterpCounter.BytesGenerated, buffer.length);
408-
const traceModule = new WebAssembly.Module(buffer);
408+
const traceModule = new WebAssembly.Module(buffer as BufferSource);
409409
const wasmImports = builder.getWasmImports();
410410

411411
const traceInstance = new WebAssembly.Instance(traceModule, wasmImports);

src/mono/browser/runtime/jiterpreter-jit-call.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ export function mono_interp_flush_jitcall_queue (): void {
437437
if (trace > 0)
438438
mono_log_info(`do_jit_call queue flush generated ${buffer.length} byte(s) of wasm`);
439439
modifyCounter(JiterpCounter.BytesGenerated, buffer.length);
440-
const traceModule = new WebAssembly.Module(buffer);
440+
const traceModule = new WebAssembly.Module(buffer as BufferSource);
441441
const wasmImports = builder.getWasmImports();
442442

443443
const traceInstance = new WebAssembly.Instance(traceModule, wasmImports);

src/mono/browser/runtime/jiterpreter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -875,7 +875,7 @@ function generate_wasm (
875875
return 0;
876876
}
877877

878-
const traceModule = new WebAssembly.Module(buffer);
878+
const traceModule = new WebAssembly.Module(buffer as BufferSource);
879879
const wasmImports = builder.getWasmImports();
880880
const traceInstance = new WebAssembly.Instance(traceModule, wasmImports);
881881

0 commit comments

Comments
 (0)