Merge branch 'main' of github.com:apple/swift-for-wasm-examples into MaxDesiatov-patch-1

MaxDesiatov · MaxDesiatov · commit 7cfd85d2002b · 2025-04-07T17:34:57.000+01:00
diff --git a/Guest/Sources/dlmalloc/src/dlmalloc.c b/Guest/Sources/dlmalloc/src/dlmalloc.c
@@ -12,7 +12,7 @@
 // WebAssembly doesn't support shrinking linear memory.
 #define MORECORE_CANNOT_TRIM 1
 
-// Disable sanity checks to reduce code size.
+// Disable checks to reduce code size.
 #define ABORT __builtin_unreachable()
 
 // If threads are enabled, enable support for threads.
diff --git a/Guest/Sources/dlmalloc/src/upstream_malloc.h b/Guest/Sources/dlmalloc/src/upstream_malloc.h
@@ -3131,8 +3131,7 @@ static int init_mparams(void) {
     }
 #endif /* WIN32 */
 
-    /* Sanity-check configuration:
-       size_t must be unsigned and as wide as pointer type.
+    /* size_t must be unsigned and as wide as pointer type.
        ints must be at least 4 bytes.
        alignment must be at least 8.
        Alignment, min chunk size, and page size must all be powers of 2.

Original file line number	Diff line number	Diff line change
`@@ -3131,8 +3131,7 @@ static int init_mparams(void) {`
`3131`	`3131`	`}`
`3132`	`3132`	`#endif /* WIN32 */`
`3133`	`3133`
`3134`		`- /* Sanity-check configuration:`
`3135`		`- size_t must be unsigned and as wide as pointer type.`
	`3134`	`+ /* size_t must be unsigned and as wide as pointer type.`
`3136`	`3135`	`ints must be at least 4 bytes.`
`3137`	`3136`	`alignment must be at least 8.`
`3138`	`3137`	`Alignment, min chunk size, and page size must all be powers of 2.`